GNU bug report logs - #43761
[PATCH 0/1] gnu: gmsh: Update to 4.6.0.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 43761 in the body.
You can then email your comments to 43761 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: guix-patches <at> gnu.org
Cc: zimoun <zimon.toutoune <at> gmail.com>
Subject: [PATCH 0/1] gnu: gmsh: Update to 4.6.0.
Date: Fri,  2 Oct 2020 13:08:19 +0200

Dear,

This patch updates the package Gmsh from 2.16.0 (Jan. 2017) to 4.16.0 (last).
The main point point is the 'contrib/metis' code bundled with Gmsh.  Since
then, it had been updated from METIS 4 (non-free) to METIS 5 (free, AFAICT).

Moreover, the replacement from 'opencascade-oce' to 'opencascade-occt' does
not change "guix size".

All the best,
simon

zimoun (1):
  gnu: gmsh: Update to 4.6.0.

 gnu/packages/maths.scm | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)


base-commit: ac324be105977d531928ef7da79483ae7a461b68
-- 
2.28.0

Message #8 received at 43761 <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: 43761 <at> debbugs.gnu.org
Cc: zimoun <zimon.toutoune <at> gmail.com>
Subject: [PATCH 1/1] gnu: gmsh: Update to 4.6.0.
Date: Fri,  2 Oct 2020 13:11:57 +0200

Gmsh bundled METIS 5 released with Apache License 2.0 since upstream commit
eaff7f6477fe876991615cfa4b5832bd5f12994b.

* gnu/packages/maths.scm (gmsh): Update to 4.6.0.
(origin): Remove snippet about METIS.
(propagated-inputs): Replace 'opencascade-oce' by 'opencascade-occt'.
---
 gnu/packages/maths.scm | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ce393cba80..e04430f56a 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2156,7 +2156,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
 (define-public gmsh
   (package
     (name "gmsh")
-    (version "2.16.0")
+    (version "4.6.0")
     (source
      (origin
       (method git-fetch)
@@ -2168,13 +2168,8 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
                                         version)))))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "08rq4jajwmlpivnm9yifz2jhaivnz065lnk0h2zv773nwl9wf162"))
-      (modules '((guix build utils)))
-      (snippet
-       ;; Remove non-free METIS code
-       '(begin
-          (delete-file-recursively "contrib/Metis")
-          #t))))
+       (base32 "0m0pjxcy1bnr7a20i11lh0ih159pphq9wsvfjr3sfx4y3lginz5y"))
+      (modules '((guix build utils)))))
     (build-system cmake-build-system)
     (propagated-inputs
      `(("fltk" ,fltk)
@@ -2184,15 +2179,15 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
        ("lapack" ,lapack)
        ("mesa" ,mesa)
        ("glu" ,glu)
-       ("opencascade-oce" ,opencascade-oce)
+       ("opencascade-occt" ,opencascade-occt)
+       ("metis" ,metis)
        ("libx11" ,libx11)
        ("libxext" ,libxext)))
     (inputs
      `(("fontconfig" ,fontconfig)
        ("libxft" ,libxft)))
     (arguments
-     `(#:configure-flags `("-DENABLE_METIS:BOOL=OFF"
-                           "-DENABLE_BUILD_SHARED:BOOL=ON"
+     `(#:configure-flags `("-DENABLE_BUILD_SHARED:BOOL=ON"
                            "-DENABLE_BUILD_DYNAMIC:BOOL=ON")))
     (home-page "http://gmsh.info/")
     (synopsis "3D finite element grid generator")
-- 
2.28.0

Message #11 received at 43761 <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: 43761 <at> debbugs.gnu.org
Cc: zimoun <zimon.toutoune <at> gmail.com>
Subject: [PATCH v2] gnu: gmsh: Update to 4.6.0.
Date: Fri,  2 Oct 2020 13:15:35 +0200

Gmsh bundled METIS 5 released with Apache License 2.0 since upstream commit
eaff7f6477fe876991615cfa4b5832bd5f12994b.

* gnu/packages/maths.scm (gmsh): Update to 4.6.0.
(origin): Remove snippet about METIS.
(propagated-inputs): Replace 'opencascade-oce' by 'opencascade-occt'.
---
 gnu/packages/maths.scm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ce393cba80..853de2b098 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -2156,7 +2156,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
 (define-public gmsh
   (package
     (name "gmsh")
-    (version "2.16.0")
+    (version "4.6.0")
     (source
      (origin
       (method git-fetch)
@@ -2168,13 +2168,8 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
                                         version)))))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "08rq4jajwmlpivnm9yifz2jhaivnz065lnk0h2zv773nwl9wf162"))
-      (modules '((guix build utils)))
-      (snippet
-       ;; Remove non-free METIS code
-       '(begin
-          (delete-file-recursively "contrib/Metis")
-          #t))))
+       (base32 "0m0pjxcy1bnr7a20i11lh0ih159pphq9wsvfjr3sfx4y3lginz5y"))
+      (modules '((guix build utils)))))
     (build-system cmake-build-system)
     (propagated-inputs
      `(("fltk" ,fltk)
@@ -2184,15 +2179,14 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
        ("lapack" ,lapack)
        ("mesa" ,mesa)
        ("glu" ,glu)
-       ("opencascade-oce" ,opencascade-oce)
+       ("opencascade-occt" ,opencascade-occt)
        ("libx11" ,libx11)
        ("libxext" ,libxext)))
     (inputs
      `(("fontconfig" ,fontconfig)
        ("libxft" ,libxft)))
     (arguments
-     `(#:configure-flags `("-DENABLE_METIS:BOOL=OFF"
-                           "-DENABLE_BUILD_SHARED:BOOL=ON"
+     `(#:configure-flags `("-DENABLE_BUILD_SHARED:BOOL=ON"
                            "-DENABLE_BUILD_DYNAMIC:BOOL=ON")))
     (home-page "http://gmsh.info/")
     (synopsis "3D finite element grid generator")
-- 
2.28.0

Message #14 received at 43761 <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: 43761 <at> debbugs.gnu.org
Cc: zimoun <zimon.toutoune <at> gmail.com>
Subject: [PATCH v3] gnu: gmsh: Update to 4.6.0.
Date: Sat,  3 Oct 2020 01:40:04 +0200

Gmsh bundled METIS 5 released with Apache License 2.0 since upstream commit
eaff7f6477fe876991615cfa4b5832bd5f12994b.

* gnu/packages/maths.scm (gmsh): Update to 4.6.0.
(origin): Remove snippet about METIS.
(propagated-inputs): Replace 'opencascade-oce' by 'opencascade-occt'.
---
 gnu/packages/maths.scm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index ce393cba80..89a33d1f4b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo <at> nixo.xyz>
 ;;; Copyright © 2020 B. Wilson <elaexuotee <at> wilsonb.com>
 ;;; Copyright © 2020 Vinicius Monego <monego <at> posteo.net>
+;;; Copyright © 2020 Simon Tournier <zimon.toutoune <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2156,7 +2157,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
 (define-public gmsh
   (package
     (name "gmsh")
-    (version "2.16.0")
+    (version "4.6.0")
     (source
      (origin
       (method git-fetch)
@@ -2168,13 +2169,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
                                         version)))))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "08rq4jajwmlpivnm9yifz2jhaivnz065lnk0h2zv773nwl9wf162"))
-      (modules '((guix build utils)))
-      (snippet
-       ;; Remove non-free METIS code
-       '(begin
-          (delete-file-recursively "contrib/Metis")
-          #t))))
+       (base32 "0m0pjxcy1bnr7a20i11lh0ih159pphq9wsvfjr3sfx4y3lginz5y"))))
     (build-system cmake-build-system)
     (propagated-inputs
      `(("fltk" ,fltk)
@@ -2184,15 +2179,14 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
        ("lapack" ,lapack)
        ("mesa" ,mesa)
        ("glu" ,glu)
-       ("opencascade-oce" ,opencascade-oce)
+       ("opencascade-occt" ,opencascade-occt)
        ("libx11" ,libx11)
        ("libxext" ,libxext)))
     (inputs
      `(("fontconfig" ,fontconfig)
        ("libxft" ,libxft)))
     (arguments
-     `(#:configure-flags `("-DENABLE_METIS:BOOL=OFF"
-                           "-DENABLE_BUILD_SHARED:BOOL=ON"
+     `(#:configure-flags `("-DENABLE_BUILD_SHARED:BOOL=ON"
                            "-DENABLE_BUILD_DYNAMIC:BOOL=ON")))
     (home-page "http://gmsh.info/")
     (synopsis "3D finite element grid generator")
-- 
2.28.0

Message #17 received at 43761 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludovic.courtes <at> inria.fr>
To: zimoun <zimon.toutoune <at> gmail.com>
Cc: 43761 <at> debbugs.gnu.org
Subject: Re: [bug#43761] [PATCH v3] gnu: gmsh: Update to 4.6.0.
Date: Mon, 05 Oct 2020 10:05:34 +0200

Hi!

zimoun <zimon.toutoune <at> gmail.com> skribis:

> Gmsh bundled METIS 5 released with Apache License 2.0 since upstream commit
> eaff7f6477fe876991615cfa4b5832bd5f12994b.
>
> * gnu/packages/maths.scm (gmsh): Update to 4.6.0.
> (origin): Remove snippet about METIS.
> (propagated-inputs): Replace 'opencascade-oce' by 'opencascade-occt'.

[...]

> -      (snippet
> -       ;; Remove non-free METIS code
> -       '(begin
> -          (delete-file-recursively "contrib/Metis")
> -          #t))))

Can we keep this snippet (without the now-obsolete comment), add our
‘metis’ package as an input, and have gmsh use it?

Thanks!

Ludo’.

Message #20 received at 43761 <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: 43761 <at> debbugs.gnu.org
Cc: ludo <at> gnu.org, pgarlick <at> tourbillion-technology.com,
 zimoun <zimon.toutoune <at> gmail.com>
Subject: [PATCH v4] gnu: gmsh: Update to 4.6.0.
Date: Mon,  5 Oct 2020 15:58:01 +0200

Gmsh bundles METIS 5 released with Apache License 2.0 since upstream commit
eaff7f6477fe876991615cfa4b5832bd5f12994b.  Instead, Gmsh is linked with the
package 'metis'.

* gnu/packages/maths.scm (gmsh): Update to 4.6.0.
(propagated-inputs): Replace 'opencascade-oce' by 'opencascade-occt', add
'metis'.
---
 gnu/packages/maths.scm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 232ef40b9c..2a909ec1d4 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -40,6 +40,7 @@
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo <at> nixo.xyz>
 ;;; Copyright © 2020 B. Wilson <elaexuotee <at> wilsonb.com>
 ;;; Copyright © 2020 Vinicius Monego <monego <at> posteo.net>
+;;; Copyright © 2020 Simon Tournier <zimon.toutoune <at> gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -2156,7 +2157,7 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
 (define-public gmsh
   (package
     (name "gmsh")
-    (version "2.16.0")
+    (version "4.6.0")
     (source
      (origin
       (method git-fetch)
@@ -2168,12 +2169,11 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
                                         version)))))
       (file-name (git-file-name name version))
       (sha256
-       (base32 "08rq4jajwmlpivnm9yifz2jhaivnz065lnk0h2zv773nwl9wf162"))
+       (base32 "0m0pjxcy1bnr7a20i11lh0ih159pphq9wsvfjr3sfx4y3lginz5y"))
       (modules '((guix build utils)))
       (snippet
-       ;; Remove non-free METIS code
        '(begin
-          (delete-file-recursively "contrib/Metis")
+          (delete-file-recursively "contrib/metis")
           #t))))
     (build-system cmake-build-system)
     (propagated-inputs
@@ -2184,14 +2184,15 @@ This is the certified version of the Open Cascade Technology (OCCT) library.")
        ("lapack" ,lapack)
        ("mesa" ,mesa)
        ("glu" ,glu)
-       ("opencascade-oce" ,opencascade-oce)
+       ("metis" ,metis)
+       ("opencascade-occt" ,opencascade-occt)
        ("libx11" ,libx11)
        ("libxext" ,libxext)))
     (inputs
      `(("fontconfig" ,fontconfig)
        ("libxft" ,libxft)))
     (arguments
-     `(#:configure-flags `("-DENABLE_METIS:BOOL=OFF"
+     `(#:configure-flags `("-DENABLE_SYSTEM_CONTRIB:BOOL=ON"
                            "-DENABLE_BUILD_SHARED:BOOL=ON"
                            "-DENABLE_BUILD_DYNAMIC:BOOL=ON")))
     (home-page "http://gmsh.info/")
-- 
2.28.0

Message #23 received at 43761 <at> debbugs.gnu.org (full text, mbox):

From: zimoun <zimon.toutoune <at> gmail.com>
To: Ludovic Courtès <ludovic.courtes <at> inria.fr>
Cc: 43761 <at> debbugs.gnu.org
Subject: Re: [bug#43761] [PATCH v3] gnu: gmsh: Update to 4.6.0.
Date: Mon, 5 Oct 2020 15:59:37 +0200

Hi,

On Mon, 5 Oct 2020 at 10:05, Ludovic Courtès <ludovic.courtes <at> inria.fr> wrote:
> zimoun <zimon.toutoune <at> gmail.com> skribis:
>
> > Gmsh bundled METIS 5 released with Apache License 2.0 since upstream commit
> > eaff7f6477fe876991615cfa4b5832bd5f12994b.
> >
> > * gnu/packages/maths.scm (gmsh): Update to 4.6.0.
> > (origin): Remove snippet about METIS.
> > (propagated-inputs): Replace 'opencascade-oce' by 'opencascade-occt'.
>
> [...]
>
> > -      (snippet
> > -       ;; Remove non-free METIS code
> > -       '(begin
> > -          (delete-file-recursively "contrib/Metis")
> > -          #t))))
>
> Can we keep this snippet (without the now-obsolete comment), add our
> ‘metis’ package as an input, and have gmsh use it?

Done in v4.

Thanks,
simon

Message #28 received at 43761-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludovic.courtes <at> inria.fr>
To: zimoun <zimon.toutoune <at> gmail.com>
Cc: pgarlick <at> tourbillion-technology.com, 43761-done <at> debbugs.gnu.org
Subject: Re: [bug#43761] [PATCH v4] gnu: gmsh: Update to 4.6.0.
Date: Thu, 08 Oct 2020 09:49:08 +0200

Hi,

zimoun <zimon.toutoune <at> gmail.com> skribis:

> Gmsh bundles METIS 5 released with Apache License 2.0 since upstream commit
> eaff7f6477fe876991615cfa4b5832bd5f12994b.  Instead, Gmsh is linked with the
> package 'metis'.
>
> * gnu/packages/maths.scm (gmsh): Update to 4.6.0.
> (propagated-inputs): Replace 'opencascade-oce' by 'opencascade-occt', add
> 'metis'.

Applied, thank you!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.