guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 90bed383135eb4946fd8b7e7b8acf4ce590a17eb
Author: Vinicius Monego <[email protected]>
AuthorDate: Mon Jun 2 21:12:30 2025 -0300
gnu: freecad: Build with Qt6.
* gnu/packages/engineering.scm (freecad)[native-inputs]: Remove
qttools-5, python-pyside-2-tools. Add qttools.
[inputs]: Remove python-pyside-2, python-shiboken-2, qtbase-5,
qtdeclarative-5, qtsvg-5, qtwebchannel-5, qtwebengine-5,
qtwayland-5. Add python-pyside-6, python-shiboken-6, qtbase,
qtdeclarative, qtsvg, qtwebchannel, qtwebengine, qtwayland.
[arguments]<#:configure-flags>: Remove "-DBUILD_QT5=ON". Pass
"-DFREECAD_QT_VERSION=6".
Change-Id: Ic11d869347ebc7f909e9ffb75b50350ea00cfad4
---
gnu/packages/engineering.scm | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 566db57b26..e49290133f 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -3429,9 +3429,8 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly
workbench.")
(list c++-gsl
doxygen
graphviz
- qttools-5
+ qttools
pkg-config
- python-pyside-2-tools
swig))
(inputs
(list bash-minimal
@@ -3465,16 +3464,16 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly
workbench.")
python-matplotlib
python-pivy
python-ply
- python-pyside-2
+ python-pyside-6
python-pyyaml
- python-shiboken-2
+ python-shiboken-6
python-wrapper
- qtbase-5
- qtdeclarative-5
- qtsvg-5
- qtwebchannel-5
- qtwebengine-5
- qtwayland-5
+ qtbase
+ qtdeclarative
+ qtsvg
+ qtwebchannel
+ qtwebengine
+ qtwayland
qtx11extras
qtxmlpatterns
sqlite
@@ -3487,10 +3486,10 @@ dynamics is used by FreeCAD 1.0.0 for its new Assembly
workbench.")
`(#:tests? #f ;; Project has tests, but they are a pain to build
#:configure-flags
,#~(list
- "-DBUILD_QT5=ON"
"-DBUILD_FLAT_MESH:BOOL=ON"
"-DBUILD_ENABLE_CXX_STD:STRING=C++17"
"-DENABLE_DEVELOPER_TESTS=OFF" ;; see the above: #:tests? comment
+ "-DFREECAD_QT_VERSION=6" ;; Build with Qt6
"-DFREECAD_USE_EXTERNAL_ONDSELSOLVER=ON" ;; unbundle ondsel-solver
;; Do not try to install modules into system python
"-DINSTALL_TO_SITEPACKAGES=OFF"
