[bug#70181] [PATCH] gnu: gama: Update to 2.30

[bug#70181] [PATCH] gnu: gama: Update to 2.30

[Andy Tai]

* 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(-)

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

[bug#70181] [PATCH] gnu: gama: Update to 2.30

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 675 bytes --]

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
>
> 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:

  https://git.savannah.gnu.org/cgit/gama.git/tree/NEWS

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#70181] [PATCH] gnu: gama: Update to 2.30

[Andy Tai]

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:
>
> 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

[bug#70181] [PATCH v2] gnu: gama: Update to 2.30

[Andy Tai]

* 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(-)

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

bug#70181: [PATCH v2] gnu: gama: Update to 2.30

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 426 bytes --]

Andy Tai <atai@atai.org> writes:

> * 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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]