[PATCH] gnu: gama: Update to 2.30

  • Done
  • quality assurance status badge
Details
2 participants
  • Andy Tai
  • Christopher Baines
Owner
unassigned
Submitted by
Andy Tai
Severity
normal

Debbugs page

A
A
Andy Tai wrote on 4 Apr 00:15 -0700
(address . guix-patches@gnu.org)(name . Andy Tai)(address . atai@atai.org)
5096f79456d222fa39a705e0c09f85bcbe26096c.1712214920.git.atai@atai.org
* gnu/packages/gps.scm (gama): Update to 2.30
[source]: Remove deletion of embedded expat as expat
distributed in guix, 2.5, does not build for this version
of gama, which uses expat 1.2

Change-Id: I5ce4e291da1d56a660c1e3546ef8d9daf008b140
---
gnu/packages/gps.scm | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)

Toggle diff (32 lines)
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 75197ad23c..565b05b211 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -141,7 +141,7 @@ (define-public gpscorrelate
(define-public gama
(package
(name "gama")
- (version "2.29")
+ (version "2.30")
(source
(origin
(method url-fetch)
@@ -149,12 +149,8 @@ (define-public gama
version ".tar.gz"))
(sha256
(base32
- "04dlh1pdaiq059ssrxa4yn24iqgjrzy2mq7s9n1pgrzlzz3a63y0"))
- (modules '((guix build utils)))
- (snippet
- '(begin
- (delete-file-recursively "lib/expat")
- (for-each delete-file (find-files "doc/fig" "\\.pdf$"))))))
+ "0yph6q7a0dy2r2vsrkjg26q8v988pcvnaay5lk6q7k06plpr2x1m"))
+ (modules '((guix build utils)))))
(build-system gnu-build-system)
(arguments '(#:parallel-tests? #f)) ; race condition
(native-inputs

base-commit: 188d18fc47f0d38edfe06e3e5834fa8587bd300b
--
2.34.1
C
C
Christopher Baines wrote on 15 Apr 01:44 -0700
(name . Andy Tai)(address . atai@atai.org)(address . 70181@debbugs.gnu.org)
8734rn2ewk.fsf@cbaines.net
Andy Tai <atai@atai.org> writes:

Toggle quote (10 lines)
> * gnu/packages/gps.scm (gama): Update to 2.30
> [source]: Remove deletion of embedded expat as expat
> distributed in guix, 2.5, does not build for this version
> of gama, which uses expat 1.2
>
> Change-Id: I5ce4e291da1d56a660c1e3546ef8d9daf008b140
> ---
> gnu/packages/gps.scm | 10 +++-------
> 1 file changed, 3 insertions(+), 7 deletions(-)

I think it's better to stick with the older version of gama if that
builds with the version of expat that we package.

Looking at the NEWS file, I'm a bit confused why this release doesn't
work, when the previous one seemed to:

-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYc6QtfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9Xeupg/+MFDyzYafzwCjGbF8qHPAZ46X3BaaIRd8
helL1aENsuEEZ0bVokb/nQpO2GH6H5YCyJU9RNdWaMsI0hG7ZlPhIcO0Vm/ZpYZg
sbg7k1yV97g4fJsWitz0Ixbo8Uju9XLkBs+Z5+mGsOtVC+MLhz2psttxVp8t36iQ
aGABTj90lQVqR1Ap3sNXFsgn7TsZaYUFohg8GAy33QFaP0XzFbXv2jhc2uy0mGoo
m9tbWtyvvVcTMj8lkalusv8x60O4qUk8fSG+TdfcpJEw3GVfq3CtLP47osoNgLuh
DaCBFXbsCHDNgRSWhQD0zxc8ceGiWwF9L6lidJj+XdTL7tJ4b6MAw+QCI+du81i4
QI8xXylpIHkCXVbocYLamQDMbUWMdhma8Zx5icJdqZ6ktO99srCP8/uVbR+mSxLU
cWQ2O4x5Tta7QcFZEA8vWKegqH9tooo25zQY3bZOqyBvKjVH0SeIsp+RcXcJgNCM
/GJudxnmTfxrMfhLYDTswwcxr942hcjdoe5u64cnAG4vPlLZ41WtBbuc5fZbtHcx
SXCW29ZnHIDGmxqpyTwrTLQuZHph4TXB1pR1I5LTxWisEdvho7ksaY1jxJ5L7Odd
J9IM8su23TtX1uMZTumWBQe5l9VGHnsMBYp9qRb7CW+9R98kEcIDHXl0EjVcB09m
BLlL0bQGfj4=
=IXPg
-----END PGP SIGNATURE-----

A
A
Andy Tai wrote on 15 Apr 12:47 -0700
(name . Christopher Baines)(address . mail@cbaines.net)(address . 70181@debbugs.gnu.org)
CAJsg1E_ANpP=9x5VqLDGFuHR-Lk-JXeB5t9cEq4CAhPiBkmtDw@mail.gmail.com
I will check again and possibly file a bug upstream on this.

On Mon, Apr 15, 2024 at 1:45 AM Christopher Baines <mail@cbaines.net> wrote:
Toggle quote (15 lines)
>
> Andy Tai <atai@atai.org> writes:
>
> > * gnu/packages/gps.scm (gama): Update to 2.30
> > [source]: Remove deletion of embedded expat as expat
> > distributed in guix, 2.5, does not build for this version
> > of gama, which uses expat 1.2
>
> I think it's better to stick with the older version of gama if that
> builds with the version of expat that we package.
>
> Looking at the NEWS file, I'm a bit confused why this release doesn't
> work, when the previous one seemed to:
>
> https://git.savannah.gnu.org/cgit/gama.git/tree/NEWS
A
A
Andy Tai wrote on 16 Apr 00:11 -0700
[PATCH v2] gnu: gama: Update to 2.30
(address . 70181@debbugs.gnu.org)(name . Andy Tai)(address . atai@atai.org)
9c263430136ce9e9736d8f68a096c936cf9635f1.1713251422.git.atai@atai.org
* gnu/packages/gps.scm (gama): Update to 2.30
[arguments](configure-flags): add option to force not
to use local copy of expat

Change-Id: I41f3f037b60b3dd89c8ccb990a800edb041cbc62
---
gnu/packages/gps.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)

Toggle diff (47 lines)
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 75197ad23c..d342785ca4 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -27,6 +27,7 @@
(define-module (gnu packages gps)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix gexp)
#:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system scons)
@@ -141,7 +142,7 @@ (define-public gpscorrelate
(define-public gama
(package
(name "gama")
- (version "2.29")
+ (version "2.30")
(source
(origin
(method url-fetch)
@@ -149,14 +150,19 @@ (define-public gama
version ".tar.gz"))
(sha256
(base32
- "04dlh1pdaiq059ssrxa4yn24iqgjrzy2mq7s9n1pgrzlzz3a63y0"))
+ "0yph6q7a0dy2r2vsrkjg26q8v988pcvnaay5lk6q7k06plpr2x1m"))
(modules '((guix build utils)))
(snippet
'(begin
(delete-file-recursively "lib/expat")
(for-each delete-file (find-files "doc/fig" "\\.pdf$"))))))
(build-system gnu-build-system)
- (arguments '(#:parallel-tests? #f)) ; race condition
+ (arguments
+ (list
+ #:configure-flags
+ #~(list "--enable-expat_1_1=no") ;force not to use of local copy of expat
+
+ #:parallel-tests? #f)) ; race condition
(native-inputs
(list libxml2 yaml-cpp))
(inputs

base-commit: 4d67912265aa921084040d633238ca30c7dc4199
--
2.34.1
C
C
Christopher Baines wrote on 17 Apr 10:10 -0700
(name . Andy Tai)(address . atai@atai.org)(address . 70181-done@debbugs.gnu.org)
87frvjsyo4.fsf@cbaines.net
Andy Tai <atai@atai.org> writes:

Toggle quote (9 lines)
> * gnu/packages/gps.scm (gama): Update to 2.30
> [arguments](configure-flags): add option to force not
> to use local copy of expat
>
> Change-Id: I41f3f037b60b3dd89c8ccb990a800edb041cbc62
> ---
> gnu/packages/gps.scm | 12 +++++++++---
> 1 file changed, 9 insertions(+), 3 deletions(-)

That looks better, I've pushed this to master as
46e54988057ece26b81cad20d33f39d383287e18.

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmYgAntfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XeYUA/+KTJEOxNkUL9K/eB+KLrN3pYtA5mkjjXE
jHZEuGo7kt+oLVz+M4ohEH4M6pDXQpkczKbVaSmQTgt9Rx6JKPVnZ6jwF0bPWk2Q
2pltI6frzCQ+CDPhs5q+JChpqKNTP40wQG0AuH2eRwDJ8Y/vP67ktDTAbt0w4GCR
fxtnD14MM5j+UEJFCEf+hwrXNjxQwNab5FpzC0aObK7VEtF3kp2YN+BZVR50enwc
c+IVHVzAzXqQ49Phhc9wQ0BaErkySyqFkN/vHtGYxIVPGiFo/RLJo5xRjN53mqeN
dJbcNYEyiSKd0PBTou/Eh1KdTyIeZLLmrR8zWsotdHcJ0yvki1zyoAVl0uWDkhaw
J3m0FF5PwInIwKoxDTxpdqz/AIiKY+pmuYTJ4Z5LiMJi3UnpjsAFOPYmfg+r1rdt
yYAhYhg8CWCp4YQObT46iiwxvq4XqTZOEmjwln3I3gwejhvWb91fjQqxsOLVW6Ka
WR4vPO2hBXVvbIadVHbJUs3HcSFrts9fO1cCeV5fObcLpiO1hPwSaJkJFER47/Hp
MEVStXE+z4Tf8itmyi115ArE8jn+hqzVyrCvYMuAuIUlmNnXtvyMQRfTaTjW0rqF
4WG3GiE91Xl/vEhGsmX70EgJHpFdAPu3YHUEpwxObAKixHDoxtOIvhUjGNmdkrZU
jwikcA/Jk7U=
=tlOx
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 70181@patchwise.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70181
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