[PATCH] gnu: guile-smc: Update to 0.6.0 and update the related projects

  • Done
  • quality assurance status badge
Details
2 participants
  • Ludovic Courtès
  • Artyom V. Poptsov
Owner
unassigned
Submitted by
Artyom V. Poptsov
Severity
normal

Debbugs page

Artyom V. Poptsov wrote 2 years ago
(address . guix-patches@gnu.org)
87ttww6nco.fsf@gmail.com
Hello Guixers,

this patch series updates Guile-SMC along with the related projects.
While I was on it I also fixed cross-building for the updated projects.

- avp
From 3bef9669db2030867b9d8a1b18feb1888a0232f4 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Mon, 1 May 2023 18:44:31 +0300
Subject: [PATCH 1/7] gnu: guile-smc: Update to 0.6.0.

* gnu/packages/guile-xyz.scm (guile-smc): Update to 0.6.0.
---
gnu/packages/guile-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 5c169dca08..979c9bae21 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5300,7 +5300,7 @@ (define-public guile-gitlab
(define-public guile-smc
(package
(name "guile-smc")
- (version "0.5.2")
+ (version "0.6.0")
(source
(origin
(method git-fetch)
@@ -5310,7 +5310,7 @@ (define-public guile-smc
(file-name (string-append name "-" version))
(sha256
(base32
- "05q20vi59whjs7jb8bgcxnnfy6c3wx26m5ps2fwlsz52nggarxzb"))))
+ "15b8m30kjl46p44xjd65vv1bv60hy130zfskkcsrj10fzahyk9zd"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
--
2.34.1
From fd0c670d3f34d4fc838f9f51391cec57a7aadd68 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Mon, 1 May 2023 18:47:48 +0300
Subject: [PATCH 2/7] gnu: guile-smc: Fix cross-building.

* gnu/packages/guile-xyz.scm (guile-smc)[native-inputs]: Add guile-3.0 and
guile-lib.
---
gnu/packages/guile-xyz.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 979c9bae21..e29bd2418c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5340,7 +5340,15 @@ (define-public guile-smc
(,(string-append out go)
,(string-append guile-lib go))))))))))
(native-inputs
- (list autoconf automake pkg-config texinfo help2man which))
+ (list autoconf
+ automake
+ pkg-config
+ texinfo
+ help2man
+ which
+ ;; needed when cross-compiling.
+ guile-3.0
+ guile-lib))
(inputs
(list bash-minimal guile-3.0 guile-lib inetutils))
(home-page "https://github.com/artyom-poptsov/guile-smc")
--
2.34.1
From 9b0ac118bcdb16f897ee2adf80a1559a03d5ad3b Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Mon, 1 May 2023 18:50:54 +0300
Subject: [PATCH 3/7] gnu: guile-ini: Update to 0.5.3.

* gnu/packages/guile-xyz.scm (guile-ini): Update to 0.5.3.
---
gnu/packages/guile-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e29bd2418c..8d220bb786 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5379,7 +5379,7 @@ (define-public guile2.2-smc
(define-public guile-ini
(package
(name "guile-ini")
- (version "0.5.2")
+ (version "0.5.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -5388,7 +5388,7 @@ (define-public guile-ini
(file-name (string-append name "-" version))
(sha256
(base32
- "17fbys3gsfyx4f77a2fswirx76dlr57il2z27z77wljaz777jk36"))))
+ "03pdbas7f6r2q3jbcn68xpm57hika3byb4rhsf0544kw6yk3bm8q"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
--
2.34.1
From 2e9c830ebbe7583f9b86028aa5494d507c363e85 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Mon, 1 May 2023 18:52:45 +0300
Subject: [PATCH 4/7] gnu: guile-ini: Fix cross-building.

* gnu/packages/guile-xyz.scm (guile-ini)[native-inputs]: Add guile-3.0,
guile-lib and guile-smc.
---
gnu/packages/guile-xyz.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

Toggle diff (22 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 8d220bb786..324d6de4a0 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5394,7 +5394,14 @@ (define-public guile-ini
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
#:phases (modify-phases %standard-phases
(delete 'strip))))
- (native-inputs (list autoconf automake pkg-config texinfo))
+ (native-inputs (list autoconf
+ automake
+ pkg-config
+ texinfo
+ ;; needed when cross-compiling.
+ guile-3.0
+ guile-lib
+ guile-smc))
(inputs (list bash-minimal guile-3.0 guile-lib))
(propagated-inputs (list guile-smc))
(home-page "https://github.com/artyom-poptsov/guile-ini")
--
2.34.1
From b5962bfa39aa78dc1d21ca66ac6046e577bd8881 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Mon, 1 May 2023 18:58:09 +0300
Subject: [PATCH 5/7] gnu: guile-ics: Update to 0.5.0.

* gnu/packages/guile-xyz.scm (guile-ics): Update to 0.5.0.
---
gnu/packages/guile-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 324d6de4a0..7dcc52a1c2 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2036,7 +2036,7 @@ (define-public guile2.2-hall
(define-public guile-ics
(package
(name "guile-ics")
- (version "0.4.0")
+ (version "0.5.0")
(source
(origin
(method git-fetch)
@@ -2046,7 +2046,7 @@ (define-public guile-ics
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "1wjkba135iipwqrp14c3q6wpbjhglp9d12is16lj8l81xyv8gjn3"))))
+ "1ipryn69ad4viqai9pnwhkqqpf9wgw0m2qxrwkfrpm1bfdyilw9w"))))
(build-system gnu-build-system)
(arguments
(list #:phases #~(modify-phases %standard-phases
--
2.34.1
From 99d22303195dc9074ae771aa9c12e0e1e876a999 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Mon, 1 May 2023 19:05:21 +0300
Subject: [PATCH 6/7] gnu: guile-png: Update to 0.4.0.

* gnu/packages/guile-xyz.scm (guile-png): Update to 0.4.0.
---
gnu/packages/guile-xyz.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 7dcc52a1c2..461e700fb6 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3845,7 +3845,7 @@ (define-public guile-jtd
(define-public guile-png
(package
(name "guile-png")
- (version "0.3.0")
+ (version "0.4.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3854,7 +3854,7 @@ (define-public guile-png
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "1lv2cjzgrr0yshqng96l6bnn8pjmljv8qcn4w3wldh97ns7qigds"))))
+ "0x5wynd5q3prhzic1s9vys80vga5dnqzyk7d7q6kx9hvyyi551qr"))))
(build-system gnu-build-system)
(arguments
`(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
--
2.34.1
From 0323d4b88daf6ebae4c962a658dd8d8f5a0827a8 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Mon, 1 May 2023 19:08:24 +0300
Subject: [PATCH 7/7] gnu: guile-png: Fix cross-building.

* gnu/packages/guile-xyz.scm (guile-png)[native-inputs]: Add guile-3.0,
guile-lib, guile-zlib and guile-smc.
---
gnu/packages/guile-xyz.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 461e700fb6..241672f377 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3869,7 +3869,15 @@ (define-public guile-png
(string-append " (png graphics)\n"
" (png fsm context))\n"
"(log-clear-handlers!)"))))))))
- (native-inputs (list autoconf automake pkg-config texinfo))
+ (native-inputs (list autoconf
+ automake
+ pkg-config
+ texinfo
+ ;; needed when cross-compiling.
+ guile-3.0
+ guile-lib
+ guile-zlib
+ guile-smc))
(inputs (list bash-minimal guile-3.0 guile-lib guile-zlib))
(propagated-inputs (list guile-smc))
(home-page "https://github.com/artyom-poptsov/guile-png")
--
2.34.1
--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
-----BEGIN PGP SIGNATURE-----

iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmRP5UcZHHBvcHRzb3Yu
YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigLxC2B/4xoLmdbl0CHdId2z92tadv
vxTa+zOw5lj+9fxugINCb/EuQrizAp1B9GX/K5kBCHx2IdkREoTKESzm9TXrVnhz
CjT0j2TDwoHL6KrGt3PWNg9z9S+UK9KMzRAmFdydbfgQXfrVjm57plXsdncux9uH
5ucVjySB+EsJOV37VW3q6kp2AvKgDs+8grGzUeguoNYJNCMLhY6M5iX+AQ1lk79f
H+ck07jylvpTPX0lXQwzT9KZQpHXp2Mg1v50Dz0jJGlIdwV4X4xaqELWyzrvdAWZ
LdHMBpDN/dtiykVxixhqXQvVhiAFps3JxnQRrCAnRrOE1fqs299/hZDNf37ulr02
=0/Ev
-----END PGP SIGNATURE-----

Artyom V. Poptsov wrote 2 years ago
(address . guix-patches@gnu.org)
87a5yg4tkt.fsf@gmail.com
Hello,

I've updated Guile-PNG to 0.4.1.
From fe7d7d20dcdc53ec01d4afbac846a4281e309fd8 Mon Sep 17 00:00:00 2001
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Sun, 7 May 2023 08:04:57 +0300
Subject: [PATCH] gnu: guile-png: Update to 0.4.1.

* gnu/packages/guile-xyz.scm (guile-png): Update to 0.4.1.
[arguments]: Remove extra phases.
---
gnu/packages/guile-xyz.scm | 17 +++--------------
1 file changed, 3 insertions(+), 14 deletions(-)

Toggle diff (41 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 241672f377..deff13797c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -3845,7 +3845,7 @@ (define-public guile-jtd
(define-public guile-png
(package
(name "guile-png")
- (version "0.4.0")
+ (version "0.4.1")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3854,21 +3854,10 @@ (define-public guile-png
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0x5wynd5q3prhzic1s9vys80vga5dnqzyk7d7q6kx9hvyyi551qr"))))
+ "1vkhv0dip0na6d9g478i587n5y6046vn5rsjmfnbibi9yx4rkrf8"))))
(build-system gnu-build-system)
(arguments
- `(#:make-flags '("GUILE_AUTO_COMPILE=0") ;to prevent guild warnings
- #:phases
- (modify-phases %standard-phases
- ;; Guile-PNG tries to log parser messages to the syslog which is not
- ;; available during the build.
- (add-after 'unpack 'fix-tests
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (substitute* "tests/graphics.scm"
- ((" \\(png graphics\\)\\)")
- (string-append " (png graphics)\n"
- " (png fsm context))\n"
- "(log-clear-handlers!)"))))))))
+ `(#:make-flags '("GUILE_AUTO_COMPILE=0"))) ;to prevent guild warnings
(native-inputs (list autoconf
automake
pkg-config

base-commit: 0323d4b88daf6ebae4c962a658dd8d8f5a0827a8
--
2.34.1
- Artyom

--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
-----BEGIN PGP SIGNATURE-----

iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmRXMkIZHHBvcHRzb3Yu
YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigL1rIB/wIvGiz4BqgyiwFIjOvvWOi
f9DVTdjkhIZWcNboIvQqn5u02NuCUl/g8ICg+9xEi5FsWzHulv1r8aZpMGSuKGCu
MlnnD8kaY0vvAw/6v+SVMbOSopEAMJWdYJU1DdEvDnOGfRBv7Yay5u3GObzDUh/9
bitnGM99QD8s+lQDJK2HVGz8p3VwwwtWs5HjLhlzqVaDLuvkydjijcArORm7HDTb
F9ywPCFEQv5rv2MQLfoTF7BXlwlMhiIG3Wf9621905T3KsJ7NmTLSTO/OfFjHLkR
rFPzwfJ6fdCoQbrDmFB+Q/kPahaaz3Un/eOMxOf1u6uXyLbofBYaGdvlCqvjqavz
=y0GL
-----END PGP SIGNATURE-----

Ludovic Courtès wrote 2 years ago
Re: bug#63207: [PATCH] gnu: guile-smc: Update to 0.6.0 and update the related projects
(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)(address . 63207-done@debbugs.gnu.org)
87sfblopc4.fsf@gnu.org
Hi Artyom,

"Artyom V. Poptsov" <poptsov.artyom@gmail.com> skribis:

Toggle quote (3 lines)
> this patch series updates Guile-SMC along with the related projects.
> While I was on it I also fixed cross-building for the updated projects.

Applied the whole series, including the latest guile-png update.

Thanks!

Ludo’.
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 63207@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 63207
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch
You may also tag this issue. See list of standard tags. For example, to set the confirmed and easy tags
mumi command -t +confirmed -t +easy
Or, remove the moreinfo tag and set the help tag
mumi command -t -moreinfo -t +help