extra/freecad to 0.21.2-7

extra/freecad/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = freecad
 	pkgdesc = Feature based parametric 3D CAD modeler
 	pkgver = 0.21.2
-	pkgrel = 6
+	pkgrel = 7
 	url = https://freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -20,8 +20,7 @@ pkgbase = freecad
 	makedepends = postgresql-libs
 	makedepends = python-mpi4py
 	makedepends = python-shiboken2
-	makedepends = qt5-webengine
-	makedepends = shiboken2
+	makedepends = shiboken6
 	makedepends = swig
 	makedepends = utf8cpp
 	makedepends = nlohmann-json
@@ -36,8 +35,7 @@ pkgbase = freecad
 	depends = opencascade
 	depends = openmpi
 	depends = pugixml
-	depends = pyside2
-	depends = pyside2-tools
+	depends = pyside6
 	depends = python-gitpython
 	depends = python-markdown
 	depends = python-matplotlib
@@ -45,18 +43,18 @@ pkgbase = freecad
 	depends = python-pivy
 	depends = python-ply
 	depends = python-yaml
-	depends = qt5-svg
-	depends = qt5-tools
-	depends = qt5-webengine
-	depends = qt5-x11extras
-	depends = qt5-xmlpatterns
+	depends = qt6-svg
+	depends = qt6-tools
+	depends = qt6-webengine
 	depends = xerces-c
 	depends = verdict
 	optdepends = graphviz: dependency graph support
 	optdepends = openscad: OpenSCAD support
 	source = git+https://github.com/freecad/freecad#tag=0.21.2
 	source = freecad-vtk9.3.patch
+	source = pyside6.patch
 	b2sums = SKIP
 	b2sums = f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5
+	b2sums = 81f39b2180adb435d3a1cff58b566d106e04fe1099adb1530c9a905b696e73cd7ed55d8616db7e080bb6f6716e9d2f207c3b2e6f6e0618a97b41de499e23d3b0
 
 pkgname = freecad

extra/freecad/PKGBUILD

@@ -18,28 +18,31 @@ highmem=1
 
 pkgname=freecad
 pkgver=0.21.2
-pkgrel=6
+pkgrel=7
 pkgdesc='Feature based parametric 3D CAD modeler'
 arch=(x86_64)
 url='https://freecadweb.org/'
 license=(LGPL)
 depends=(boost-libs coin fmt glew jsoncpp libspnav med-openmpi netcdf
-         opencascade openmpi pugixml pyside2 pyside2-tools python-gitpython
+         opencascade openmpi pugixml pyside6 python-gitpython
          python-markdown python-matplotlib python-pip python-pivy python-ply
-         python-yaml qt5-svg qt5-tools qt5-webengine qt5-x11extras
-         qt5-xmlpatterns xerces-c verdict)
+         python-yaml qt6-svg qt6-tools qt6-webengine
+         xerces-c verdict)
 makedepends=(boost cgns cmake eigen git libharu liblas ninja openvdb openvr
              pdal postgresql-libs python-mpi4py python-shiboken2
-             qt5-webengine shiboken2 swig utf8cpp nlohmann-json)
+             shiboken6 swig utf8cpp nlohmann-json)
 optdepends=('graphviz: dependency graph support'
             'openscad: OpenSCAD support')
 source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver"
-        freecad-vtk9.3.patch) # tag: 0.21.1
+        freecad-vtk9.3.patch
+        pyside6.patch) # tag: 0.21.1
 b2sums=('SKIP'
-        'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5')
+        'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5'
+        '81f39b2180adb435d3a1cff58b566d106e04fe1099adb1530c9a905b696e73cd7ed55d8616db7e080bb6f6716e9d2f207c3b2e6f6e0618a97b41de499e23d3b0')
 
 prepare() {
   patch -d freecad -Np1 -i "$srcdir"/freecad-vtk9.3.patch
+  patch -d freecad -Np1 -i ../pyside6.patch
 }
 
 build() {
@@ -47,7 +50,7 @@ build() {
     -B build \
     -D BUILD_ENABLE_CXX_STD=C++17 \
     -D BUILD_FLAT_MESH=ON \
-    -D BUILD_QT5=ON \
+    -D FREECAD_QT_VERSION=6 \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
     -D CMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -w" \

extra/freecad/pyside6.patch

@@ -0,0 +1,13 @@
+diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
+index 0569c1fde9..f5e3d0931f 100644
+--- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
++++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
+@@ -165,6 +165,8 @@ macro(SetupShibokenAndPyside)
+         message(STATUS "PySide ${PySide_VERSION} Python module found at ${PRINT_OUTPUT}.\n")
+     endif()
+ 
++    set_target_properties(Shiboken6::libshiboken PROPERTIES INTERFACE_COMPILE_DEFINITIONS "")
++
+ endmacro(SetupShibokenAndPyside)
+ 
+ # Locate the include directory for a pip-installed package -- uses pip show to find the base pip