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

unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed

* [bug#43761] [PATCH 0/1] gnu: gmsh: Update to 4.6.0.
@ 2020-10-02 11:08 zimoun
  2020-10-02 11:11 ` [bug#43761] [PATCH 1/1] " zimoun
                   ` (3 more replies)
  0 siblings, 4 replies; 8+ messages in thread
From: zimoun @ 2020-10-02 11:08 UTC (permalink / raw)
  To: 43761; +Cc: zimoun

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

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#43761] [PATCH 1/1] gnu: gmsh: Update to 4.6.0.
  2020-10-02 11:08 [bug#43761] [PATCH 0/1] gnu: gmsh: Update to 4.6.0 zimoun
@ 2020-10-02 11:11 ` zimoun
  2020-10-02 11:15 ` [bug#43761] [PATCH v2] " zimoun
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 8+ messages in thread
From: zimoun @ 2020-10-02 11:11 UTC (permalink / raw)
  To: 43761; +Cc: zimoun

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





^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#43761] [PATCH v2] gnu: gmsh: Update to 4.6.0.
  2020-10-02 11:08 [bug#43761] [PATCH 0/1] gnu: gmsh: Update to 4.6.0 zimoun
  2020-10-02 11:11 ` [bug#43761] [PATCH 1/1] " zimoun
@ 2020-10-02 11:15 ` zimoun
  2020-10-02 23:40 ` [bug#43761] [PATCH v3] " zimoun
  2020-10-05 13:58 ` [bug#43761] [PATCH v4] " zimoun
  3 siblings, 0 replies; 8+ messages in thread
From: zimoun @ 2020-10-02 11:15 UTC (permalink / raw)
  To: 43761; +Cc: zimoun

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





^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#43761] [PATCH v3] gnu: gmsh: Update to 4.6.0.
  2020-10-02 11:08 [bug#43761] [PATCH 0/1] gnu: gmsh: Update to 4.6.0 zimoun
  2020-10-02 11:11 ` [bug#43761] [PATCH 1/1] " zimoun
  2020-10-02 11:15 ` [bug#43761] [PATCH v2] " zimoun
@ 2020-10-02 23:40 ` zimoun
  2020-10-05  8:05   ` Ludovic Courtès
  2020-10-05 13:58 ` [bug#43761] [PATCH v4] " zimoun
  3 siblings, 1 reply; 8+ messages in thread
From: zimoun @ 2020-10-02 23:40 UTC (permalink / raw)
  To: 43761; +Cc: zimoun

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@nixo.xyz>
 ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2020 Simon Tournier <zimon.toutoune@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





^ permalink raw reply related	[flat|nested] 8+ messages in thread

* [bug#43761] [PATCH v3] gnu: gmsh: Update to 4.6.0.
  2020-10-02 23:40 ` [bug#43761] [PATCH v3] " zimoun
@ 2020-10-05  8:05   ` Ludovic Courtès
  2020-10-05 13:59     ` zimoun
  0 siblings, 1 reply; 8+ messages in thread
From: Ludovic Courtès @ 2020-10-05  8:05 UTC (permalink / raw)
  To: zimoun; +Cc: 43761

Hi!

zimoun <zimon.toutoune@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’.




^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#43761] [PATCH v3] gnu: gmsh: Update to 4.6.0.
  2020-10-05  8:05   ` Ludovic Courtès
@ 2020-10-05 13:59     ` zimoun
  0 siblings, 0 replies; 8+ messages in thread
From: zimoun @ 2020-10-05 13:59 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 43761

Hi,

On Mon, 5 Oct 2020 at 10:05, Ludovic Courtès <ludovic.courtes@inria.fr> wrote:
> zimoun <zimon.toutoune@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




^ permalink raw reply	[flat|nested] 8+ messages in thread

* [bug#43761] [PATCH v4] gnu: gmsh: Update to 4.6.0.
  2020-10-02 11:08 [bug#43761] [PATCH 0/1] gnu: gmsh: Update to 4.6.0 zimoun
                   ` (2 preceding siblings ...)
  2020-10-02 23:40 ` [bug#43761] [PATCH v3] " zimoun
@ 2020-10-05 13:58 ` zimoun
  2020-10-08  7:49   ` bug#43761: " Ludovic Courtès
  3 siblings, 1 reply; 8+ messages in thread
From: zimoun @ 2020-10-05 13:58 UTC (permalink / raw)
  To: 43761; +Cc: ludo, pgarlick, zimoun

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@nixo.xyz>
 ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
 ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
+;;; Copyright © 2020 Simon Tournier <zimon.toutoune@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





^ permalink raw reply related	[flat|nested] 8+ messages in thread

* bug#43761: [PATCH v4] gnu: gmsh: Update to 4.6.0.
  2020-10-05 13:58 ` [bug#43761] [PATCH v4] " zimoun
@ 2020-10-08  7:49   ` Ludovic Courtès
  0 siblings, 0 replies; 8+ messages in thread
From: Ludovic Courtès @ 2020-10-08  7:49 UTC (permalink / raw)
  To: zimoun; +Cc: pgarlick, 43761-done

Hi,

zimoun <zimon.toutoune@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’.




^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-10-08  7:50 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-02 11:08 [bug#43761] [PATCH 0/1] gnu: gmsh: Update to 4.6.0 zimoun
2020-10-02 11:11 ` [bug#43761] [PATCH 1/1] " zimoun
2020-10-02 11:15 ` [bug#43761] [PATCH v2] " zimoun
2020-10-02 23:40 ` [bug#43761] [PATCH v3] " zimoun
2020-10-05  8:05   ` Ludovic Courtès
2020-10-05 13:59     ` zimoun
2020-10-05 13:58 ` [bug#43761] [PATCH v4] " zimoun
2020-10-08  7:49   ` bug#43761: " Ludovic Courtès

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).