* [bug#47778] [PATCH]: Update FreeCAD to 0.19.1
@ 2021-04-14 15:59 Ekaitz Zarraga
2021-04-14 21:39 ` Maxime Devos
0 siblings, 1 reply; 5+ messages in thread
From: Ekaitz Zarraga @ 2021-04-14 15:59 UTC (permalink / raw)
To: 47778
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
Hi,
This set of patches update freecad from unstable to the 0.19.1 release.
More information in this help-guix thread:
https://lists.gnu.org/archive/html/help-guix/2021-04/msg00118.html
Thanks!
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-vtk-8.patch --]
[-- Type: text/x-patch; name=0001-gnu-Add-vtk-8.patch, Size: 1762 bytes --]
From 48fc072af9b595c7e71f0f06d9963685e7d3a796 Mon Sep 17 00:00:00 2001
From: Ekaitz Zarraga <ekaitz@elenq.tech>
Date: Wed, 14 Apr 2021 15:48:06 +0200
Subject: [PATCH 1/2] gnu: Add vtk-8.
gnu/packages/image-processing (vtk-8): New variable.
---
gnu/packages/image-processing.scm | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm
index ce2242a658..16c9887741 100644
--- a/gnu/packages/image-processing.scm
+++ b/gnu/packages/image-processing.scm
@@ -15,6 +15,7 @@
;;; Copyright © 2021 Oleh Malyi <astroclubzp@gmail.com>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Andy Tai <atai@atai.org>
+;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -349,6 +350,22 @@ a suite of 3D interaction widgets, supports parallel processing, and
integrates with various databases on GUI toolkits such as Qt and Tk.")
(license license:bsd-3)))
+;; freecad needs an old version of VTK, because VTK's API changed from 8 to 9
+(define-public vtk-8
+ (package (inherit vtk)
+ (version "8.2.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://vtk.org/files/release/"
+ (version-major+minor version)
+ "/VTK-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1fspgp8k0myr6p2a6wkc21ldcswb4bvmb484m12mxgk1a9vxrhrl"))))
+ (inputs
+ `(("jsoncpp" ,jsoncpp-for-tensorflow)
+ ,@(alist-delete "jsoncpp" (package-inputs vtk))))))
+
;; itksnap needs an older variant of VTK.
(define-public vtk-6
(package (inherit vtk)
--
2.31.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-freecad-Update-to-0.19.1.patch --]
[-- Type: text/x-patch; name=0002-gnu-freecad-Update-to-0.19.1.patch, Size: 10373 bytes --]
From 199116be8ece6f2aaff2f277ece2cdbfcc487c63 Mon Sep 17 00:00:00 2001
From: Ekaitz Zarraga <ekaitz@elenq.tech>
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 | 217 +++++++++++++++++++----------------
1 file changed, 117 insertions(+), 100 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index b5568b8563..4274a59f5f 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -17,7 +17,7 @@
;;; Copyright © 2020 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2020,2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
+;;; Copyright © 2020, 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
@@ -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,125 @@ 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
+ #: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=\"\\);") ""))
+ #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
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#47778] [PATCH]: Update FreeCAD to 0.19.1
2021-04-14 15:59 [bug#47778] [PATCH]: Update FreeCAD to 0.19.1 Ekaitz Zarraga
@ 2021-04-14 21:39 ` Maxime Devos
2021-04-14 21:44 ` Ekaitz Zarraga
0 siblings, 1 reply; 5+ messages in thread
From: Maxime Devos @ 2021-04-14 21:39 UTC (permalink / raw)
To: Ekaitz Zarraga, 47778
[-- Attachment #1: Type: text/plain, Size: 965 bytes --]
On Wed, 2021-04-14 at 15:59 +0000, Ekaitz Zarraga wrote:
> Hi,
>
> This set of patches update freecad from unstable to the 0.19.1 release.
>
> More information in this help-guix thread:
>
> https://lists.gnu.org/archive/html/help-guix/2021-04/msg00118.html
>
> Thanks!
+ `(#:tests? #f
Why's that? ‘We’ prefer to have tests enabled when possible.
Please document why tests are disabled here (with a comment
#:tests? #f ; no tests / tests require dependency X, which is not packaged ...).
+ (add-before 'configure 'restore-pythonpath
+ (lambda _
+ (substitute* "src/Main/MainGui.cpp"
+ (("_?putenv\\(\"PYTHONPATH=\"\\);") ""))
+ #t))
The #t can be removed. The warning that results when #t is absent
has been removed on the core-updates branch; we might as well stop
introducing these silly #t now such that we don't have to remove them
later.
Greetings,
Maxme.
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#47778] [PATCH]: Update FreeCAD to 0.19.1
2021-04-14 21:39 ` Maxime Devos
@ 2021-04-14 21:44 ` Ekaitz Zarraga
2021-04-14 22:58 ` Ekaitz Zarraga
0 siblings, 1 reply; 5+ messages in thread
From: Ekaitz Zarraga @ 2021-04-14 21:44 UTC (permalink / raw)
To: Maxime Devos; +Cc: 47778@debbugs.gnu.org
Hi,
>
> - `(#:tests? #f
>
> Why's that? ‘We’ prefer to have tests enabled when possible.
> Please document why tests are disabled here (with a comment
> #:tests? #f ; no tests / tests require dependency X, which is not packaged ...).
I'll try to test the package with the tests, but they were
disabled before too, so I didn't change that.
>
> - (add-before 'configure 'restore-pythonpath
>
>
> - (lambda _
>
>
> - (substitute* "src/Main/MainGui.cpp"
>
>
> - (("_?putenv\\\\(\\"PYTHONPATH=\\"\\\\);") ""))
>
>
> - #t))
>
>
>
> The #t can be removed. The warning that results when #t is absent
> has been removed on the core-updates branch; we might as well stop
> introducing these silly #t now such that we don't have to remove them
> later.
>
> Greetings,
> Maxme.
Ok, I'll remove that and update the patch.
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#47778] [PATCH]: Update FreeCAD to 0.19.1
2021-04-14 21:44 ` Ekaitz Zarraga
@ 2021-04-14 22:58 ` Ekaitz Zarraga
2021-04-16 2:26 ` bug#47778: " Leo Famulari
0 siblings, 1 reply; 5+ messages in thread
From: Ekaitz Zarraga @ 2021-04-14 22:58 UTC (permalink / raw)
To: Maxime Devos; +Cc: 47778@debbugs.gnu.org
[-- Attachment #1: Type: text/plain, Size: 113 bytes --]
Hi,
As they are not functional changes, I updated inside
the same diff.
Hope it's ok.
Cheers,
Ekaitz
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-freecad-Update-to-0.19.1.patch --]
[-- Type: text/x-patch; name=0002-gnu-freecad-Update-to-0.19.1.patch, Size: 10371 bytes --]
From 5308c3eeda66262cf5427cf040589bdaa0b85cab Mon Sep 17 00:00:00 2001
From: Ekaitz Zarraga <ekaitz@elenq.tech>
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 <brice@waegenei.re>
;;; Copyright © 2020,2021 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2020 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2020 Ekaitz Zarraga <ekaitz@elenq.tech>
+;;; Copyright © 2020, 2021 Ekaitz Zarraga <ekaitz@elenq.tech>
;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
;;; Copyright © 2020, 2021 Vinicius Monego <monego@posteo.net>
;;; Copyright © 2020, 2021 Morgan Smith <Morgan.J.Smith@outlook.com>
@@ -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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#47778: [PATCH]: Update FreeCAD to 0.19.1
2021-04-14 22:58 ` Ekaitz Zarraga
@ 2021-04-16 2:26 ` Leo Famulari
0 siblings, 0 replies; 5+ messages in thread
From: Leo Famulari @ 2021-04-16 2:26 UTC (permalink / raw)
To: Ekaitz Zarraga; +Cc: 47778-done@debbugs.gnu.org, Maxime Devos
On Wed, Apr 14, 2021 at 10:58:57PM +0000, Ekaitz Zarraga wrote:
> 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 <ekaitz@elenq.tech>
> 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
Thanks! I filled out the commit message and pushed the patches as
ce2fe8bf34199e2b9788a7f77c0ad0bbdfa713bd.
Thanks for reviewing Maxime! I wanted to make sure this made it into the
upcoming release :)
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-04-16 2:27 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-14 15:59 [bug#47778] [PATCH]: Update FreeCAD to 0.19.1 Ekaitz Zarraga
2021-04-14 21:39 ` Maxime Devos
2021-04-14 21:44 ` Ekaitz Zarraga
2021-04-14 22:58 ` Ekaitz Zarraga
2021-04-16 2:26 ` bug#47778: " Leo Famulari
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).