From patchwork Wed Apr 14 22:58:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ekaitz Zarraga X-Patchwork-Id: 28558 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2C64B27BC76; Thu, 15 Apr 2021 00:00:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 621A327BC75 for ; Thu, 15 Apr 2021 00:00:13 +0100 (BST) Received: from localhost ([::1]:33686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWoUW-0001BV-DU for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 19:00:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWoUM-0001A7-KW for guix-patches@gnu.org; Wed, 14 Apr 2021 19:00:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52709) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWoUM-0001jY-Ak for guix-patches@gnu.org; Wed, 14 Apr 2021 19:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWoUM-00083D-9H for guix-patches@gnu.org; Wed, 14 Apr 2021 19:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47778] [PATCH]: Update FreeCAD to 0.19.1 Resent-From: Ekaitz Zarraga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 23:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47778 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxime Devos Cc: "47778@debbugs.gnu.org" <47778@debbugs.gnu.org> Received: via spool by 47778-submit@debbugs.gnu.org id=B47778.161844116130874 (code B ref 47778); Wed, 14 Apr 2021 23:00:02 +0000 Received: (at 47778) by debbugs.gnu.org; 14 Apr 2021 22:59:21 +0000 Received: from localhost ([127.0.0.1]:36022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWoTd-00081o-4T for submit@debbugs.gnu.org; Wed, 14 Apr 2021 18:59:21 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:51004) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWoTW-00081T-KR for 47778@debbugs.gnu.org; Wed, 14 Apr 2021 18:59:16 -0400 Date: Wed, 14 Apr 2021 22:58:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=elenq.tech; s=protonmail3; t=1618441143; bh=ztFxcKmWc/V9aSX74e6Wvf6dAhkhhEl7tcLsytRKDhg=; h=Date:To:From:Cc:Reply-To:Subject:In-Reply-To:References:From; b=jz+5zPq74Ma3sheEL3bJSe2ce+g6HZ3cWpThrhAyUM6Zq9Rz3+BCNfVDd1JULKXvj u0/iCyDfqmgeKcNpn3er6+nx/GKa/fsceBY5RXZ6sE/n0VbKTGRRuoShT702nQr1Nw A6yqgmyDtBR9bc2r0/s0uctInZKwfMqjYjMf3RjMhrmNJZaCTLogh5YUrXFQrae5+C XqiMgFUIdodTKZGfSHQLlVCrC2Bq1V5Hqf8I1iO1NQW9Z5wM8lB389IPSBZHexatBG RZwbgECXgVr5pZ4zQjfOOwT6zaFc2W+YvORcmCq+0/8PyAXiMU8bsW6+X4eR2Wdcw1 ZRSqiOmfDeTmQ== From: Ekaitz Zarraga Message-ID: In-Reply-To: References: <4a8ff1b83b4d4580294833e421e34a52aa88a86e.camel@telenet.be> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Ekaitz Zarraga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hi, As they are not functional changes, I updated inside the same diff. Hope it's ok. Cheers, Ekaitz From 5308c3eeda66262cf5427cf040589bdaa0b85cab Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Wed, 14 Apr 2021 15:49:53 +0200 Subject: [PATCH 2/2] gnu: freecad: Update to 0.19.1 * gnu/packages/engineering.scm (freecad): Update to 0.19.1 [inputs]: Add new dependencies --- gnu/packages/engineering.scm | 215 +++++++++++++++++++---------------- 1 file changed, 115 insertions(+), 100 deletions(-) diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm index b5568b8563..e03cb71439 100644 --- a/gnu/packages/engineering.scm +++ b/gnu/packages/engineering.scm @@ -17,7 +17,7 @@ ;;; Copyright © 2020 Brice Waegeneire ;;; Copyright © 2020,2021 Vincent Legoll ;;; Copyright © 2020 Marius Bakke -;;; Copyright © 2020 Ekaitz Zarraga +;;; Copyright © 2020, 2021 Ekaitz Zarraga ;;; Copyright © 2020 B. Wilson ;;; Copyright © 2020, 2021 Vinicius Monego ;;; Copyright © 2020, 2021 Morgan Smith @@ -112,6 +112,8 @@ #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) #:use-module (gnu packages readline) + #:use-module (gnu packages serialization) + #:use-module (gnu packages sqlite) #:use-module (gnu packages swig) #:use-module (gnu packages tbb) #:use-module (gnu packages tcl) @@ -122,6 +124,7 @@ #:use-module (gnu packages web) #:use-module (gnu packages wxwidgets) #:use-module (gnu packages xml) + #:use-module (gnu packages xiph) #:use-module (gnu packages openkinect) #:use-module (gnu packages xorg)) @@ -2353,111 +2356,123 @@ full programmatic control over your models.") OpenSCAD code. It supports syntax highlighting, indenting and refilling of comments."))) + (define-public freecad - (let ((commit-ref "7616153b3c31ace006169cdc2fdafab484498858") - (revision "1")) - (package - (name "freecad") - (version (git-version "0.18.5" revision commit-ref)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/FreeCAD/FreeCAD") - (commit commit-ref))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "16965yxnp2pq7nm8z3p0pjkzjdyq62vfrj8j3nk26bwc898czyn2")))) - (build-system qt-build-system) - (native-inputs - `(("doxygen" ,doxygen) - ("graphviz" ,graphviz) - ("qttools" ,qttools) - ("pkg-config" ,pkg-config) - ("python-pyside-2-tools" ,python-pyside-2-tools) - ("swig" ,swig))) - (inputs - `(("boost" ,boost) - ("coin3D" ,coin3D) - ("eigen" ,eigen) - ("freetype" ,freetype) - ("glew" ,glew) - ("hdf5" ,hdf5-1.10) - ("libarea" ,libarea) - ("libmedfile" ,libmedfile) - ("libspnav" ,libspnav) - ("libxi" ,libxi) - ("libxmu" ,libxmu) - ("openmpi" ,openmpi) - ("opencascade-occt" ,opencascade-occt) - ("python-matplotlib" ,python-matplotlib) - ("python-pyside-2" ,python-pyside-2) - ("python-shiboken-2" ,python-shiboken-2) - ("python-pivy" ,python-pivy) - ("python-wrapper" ,python-wrapper) - ("qtbase" ,qtbase) - ("qtsvg" ,qtsvg) - ("qtx11extras" ,qtx11extras) - ("qtxmlpatterns" ,qtxmlpatterns) - ("qtwebkit" ,qtwebkit) - ("tbb" ,tbb) - ("vtk" ,vtk) - ("xerces-c" ,xerces-c) - ("zlib" ,zlib))) - (arguments - `(#:tests? #f - #:configure-flags - (list - "-DBUILD_QT5=ON" - (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib") - (string-append "-DPYSIDE2UICBINARY=" - (assoc-ref %build-inputs "python-pyside-2-tools") - "/bin/uic") - (string-append "-DPYSIDE2RCCBINARY=" - (assoc-ref %build-inputs "python-pyside-2-tools") - "/bin/rcc") - "-DPYSIDE_LIBRARY=PySide2::pyside2" - (string-append - "-DPYSIDE_INCLUDE_DIR=" - (assoc-ref %build-inputs "python-pyside-2") "/include;" - (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;" - (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;" - (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;" - (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;") - "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" - (string-append "-DSHIBOKEN_INCLUDE_DIR=" - (assoc-ref %build-inputs "python-shiboken-2") - "/include/shiboken2")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'restore-pythonpath - (lambda _ - (substitute* "src/Main/MainGui.cpp" - (("_?putenv\\(\"PYTHONPATH=\"\\);") "")) - #t)) - (add-after 'install 'wrap-pythonpath - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (wrap-program (string-append out "/bin/FreeCAD") - (list "PYTHONPATH" - 'prefix (list (getenv "PYTHONPATH"))))) - #t))))) - (home-page "https://www.freecadweb.org/") - (synopsis "Your Own 3D Parametric Modeler") - (description - "FreeCAD is a general purpose feature-based, parametric 3D modeler for + (package + (name "freecad") + (version "0.19.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/FreeCAD/FreeCAD") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0c53q2iawy4yfp11czyc7lbr9ivp3r7v24x4c20myh11wyplffc0")))) + (build-system qt-build-system) + (native-inputs + `(("doxygen" ,doxygen) + ("graphviz" ,graphviz) + ("qttools" ,qttools) + ("pkg-config" ,pkg-config) + ("python-pyside-2-tools" ,python-pyside-2-tools) + ("swig" ,swig))) + (inputs + `(("boost" ,boost) + ("coin3D" ,coin3D) + ("double-conversion" ,double-conversion) + ("eigen" ,eigen) + ("freetype" ,freetype) + ("gl2ps" ,gl2ps) + ("glew" ,glew) + ("hdf5" ,hdf5-1.10) + ("jsoncpp" ,jsoncpp) + ("libarea" ,libarea) + ("libjpeg-turbo" ,libjpeg-turbo) + ("libmedfile" ,libmedfile) + ("libspnav" ,libspnav) + ("libtheora" ,libtheora) + ("libtiff" ,libtiff) + ("libxi" ,libxi) + ("libxmlplusplus" ,libxmlplusplus) + ("libxmu" ,libxmu) + ("lz4" ,lz4) + ("netcdf" ,netcdf) + ("opencascade-occt" ,opencascade-occt) + ("openmpi" ,openmpi) + ("proj" ,proj) + ("python-gitpython" ,python-gitpython) + ("python-matplotlib" ,python-matplotlib) + ("python-pivy" ,python-pivy) + ("python-pyside-2" ,python-pyside-2) + ("python-pyyaml" ,python-pyyaml) + ("python-shiboken-2" ,python-shiboken-2) + ("python-wrapper" ,python-wrapper) + ("qtbase" ,qtbase) + ("qtsvg" ,qtsvg) + ("qtwebkit" ,qtwebkit) + ("qtx11extras" ,qtx11extras) + ("qtxmlpatterns" ,qtxmlpatterns) + ("sqlite" ,sqlite) + ("tbb" ,tbb) + ("vtk" ,vtk-8) + ("xerces-c" ,xerces-c) + ("zlib" ,zlib))) + (arguments + `(#:tests? #f ; Project has no tests + #:configure-flags + (list + "-DBUILD_QT5=ON" + "-DBUILD_FLAT_MESH:BOOL=ON" + (string-append "-DCMAKE_INSTALL_LIBDIR=" (assoc-ref %outputs "out") "/lib") + (string-append "-DPYSIDE2UICBINARY=" + (assoc-ref %build-inputs "python-pyside-2-tools") + "/bin/uic") + (string-append "-DPYSIDE2RCCBINARY=" + (assoc-ref %build-inputs "python-pyside-2-tools") + "/bin/rcc") + "-DPYSIDE_LIBRARY=PySide2::pyside2" + (string-append + "-DPYSIDE_INCLUDE_DIR=" + (assoc-ref %build-inputs "python-pyside-2") "/include;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtCore;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtWidgets;" + (assoc-ref %build-inputs "python-pyside-2") "/include/PySide2/QtGui;") + "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" + (string-append "-DSHIBOKEN_INCLUDE_DIR=" + (assoc-ref %build-inputs "python-shiboken-2") + "/include/shiboken2")) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'restore-pythonpath + (lambda _ + (substitute* "src/Main/MainGui.cpp" + (("_?putenv\\(\"PYTHONPATH=\"\\);") "")))) + (add-after 'install 'wrap-pythonpath + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (wrap-program (string-append out "/bin/FreeCAD") + (list "PYTHONPATH" + 'prefix (list (getenv "PYTHONPATH")))))))))) + (home-page "https://www.freecadweb.org/") + (synopsis "Your Own 3D Parametric Modeler") + (description + "FreeCAD is a general purpose feature-based, parametric 3D modeler for CAD, MCAD, CAx, CAE and PLM, aimed directly at mechanical engineering and product design but also fits a wider range of uses in engineering, such as architecture or other engineering specialties. It is 100% Open Source (LGPL2+ license) and extremely modular, allowing for very advanced extension and customization.") - (license - (list - license:lgpl2.1+ - license:lgpl2.0+ - license:gpl3+ - license:bsd-3))))) + (license + (list + license:lgpl2.1+ + license:lgpl2.0+ + license:gpl3+ + license:bsd-3)))) + (define-public libmedfile (package -- 2.31.0