unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: zimoun <zimon.toutoune@gmail.com>
To: 43761@debbugs.gnu.org
Cc: zimoun <zimon.toutoune@gmail.com>
Subject: [bug#43761] [PATCH v3] gnu: gmsh: Update to 4.6.0.
Date: Sat,  3 Oct 2020 01:40:04 +0200	[thread overview]
Message-ID: <20201002234004.18393-1-zimon.toutoune@gmail.com> (raw)
In-Reply-To: <20201002110819.24724-1-zimon.toutoune@gmail.com>

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





  parent reply	other threads:[~2020-10-02 23:41 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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 [this message]
2020-10-05  8:05   ` [bug#43761] [PATCH v3] " 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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201002234004.18393-1-zimon.toutoune@gmail.com \
    --to=zimon.toutoune@gmail.com \
    --cc=43761@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).