extra/freecad to 0.21.2-24

extra/freecad/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = freecad
 	pkgdesc = Feature based parametric 3D CAD modeler
 	pkgver = 0.21.2
-	pkgrel = 23
+	pkgrel = 24
 	url = https://freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -20,7 +20,6 @@ pkgbase = freecad
 	makedepends = pdal
 	makedepends = postgresql-libs
 	makedepends = python-mpi4py
-	makedepends = setconf
 	makedepends = shiboken6
 	makedepends = swig
 	makedepends = utf8cpp
@@ -47,8 +46,8 @@ pkgbase = freecad
 	depends = qt6-svg
 	depends = qt6-tools
 	depends = qt6-webengine
-	depends = xerces-c
 	depends = verdict
+	depends = xerces-c
 	optdepends = graphviz: dependency graph support
 	optdepends = openscad: OpenSCAD support
 	options = !lto
@@ -59,6 +58,7 @@ pkgbase = freecad
 	source = https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch
 	source = https://github.com/FreeCAD/FreeCAD/commit/ac9a88c2.patch
 	source = https://github.com/FreeCAD/FreeCAD/commit/ccaee189.patch
+	source = https://github.com/FreeCAD/FreeCAD/commit/72fc04bf.patch
 	source = desktop-icon-under-wayland.patch
 	source = fixups-with-qt6-enums.patch
 	b2sums = b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7
@@ -68,7 +68,8 @@ pkgbase = freecad
 	b2sums = de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc
 	b2sums = 02284db1b17dc88d0522eb3a726076b9f1ded740fdab1a185e48534c3606c77e51a12690b02bf5e0d9d1f72d1d8389ba84a54cba274200e69b6b10a431bbfdfe
 	b2sums = 96eae9bf5af8c041876cf6afd09f2b0dbc12369469ceb6d5c4607fccee8914dfd9b3eef8291ccdc6aded0369a6bcf0fb159dbfb8172b0f7b95324c22310e21f5
-	b2sums = 6ef009021e507b9291f60c9479148a9697f1da4d9965e26575d74c612162431a0fc61de2e3856d8ed51ca10d9b7f6c9d25a24ad86e9acadd30c0176646c682a3
+	b2sums = 96298a048569e6c4d5864504eeb908cdcbe1e22d7485969a7858bd08e66d1d9c050b5d4393e42801afdf3e31e48f56ec21bf1f1f2b1e19c02f54cc4d32d115f3
+	b2sums = 8af23999e48d3ac4c80a259e12ba9e25f750c3ee1da047131ddc60228ad9c73434405949acbee89e82981be55ebfac4aec8c7d00e421bbee864cde199a07267f
 	b2sums = 9cb72c3df3f1c8e49b4242b1e05f51c68e6df98891a0c485488433bb9eef1e814fe712761b62ef09cb37551643819a48cbf704df2121bf33401e410a05dce722
 
 pkgname = freecad

extra/freecad/.nvchecker.toml

@@ -0,0 +1,3 @@
+[freecad]
+source = "git"
+git = "https://github.com/freecad/freecad.git"

extra/freecad/PKGBUILD

@@ -9,6 +9,8 @@
 # Contributor: bricem13
 # Contributor: gborzi
 # Contributor: Adrian Insaurralde
+# Contributor: Martin Rodriguez Reboredo
+# Contributor: Jamin Collins
 
 # ALARM: Kevin Mihelich <kevin@archlinuxarm.org>
 #  - remove makedepends on ospray
@@ -18,19 +20,18 @@ highmem=1
 
 pkgname=freecad
 pkgver=0.21.2
-pkgrel=23
+pkgrel=24
 pkgdesc='Feature based parametric 3D CAD modeler'
 arch=(x86_64)
 url='https://freecadweb.org/'
 license=(LGPL)
-depends=(asciidoctor boost-libs coin fmt glew jsoncpp libspnav med-openmpi netcdf
+depends=(asciidoctor boost-libs coin fmt glew jsoncpp libspnav med-openmpi
-         opencascade openmpi pugixml pyside6 python-gitpython
+         netcdf opencascade openmpi pugixml pyside6 python-gitpython
          python-markdown python-matplotlib python-pip python-pivy python-ply
-         python-yaml qt6-svg qt6-tools qt6-webengine
+         python-yaml qt6-svg qt6-tools qt6-webengine verdict xerces-c)
-         xerces-c verdict)
+makedepends=(boost cgns cmake eigen git libharu liblas ninja nlohmann-json
-makedepends=(boost cgns cmake eigen git libharu liblas ninja nlohmann-json openvdb
+             openvdb openvr pdal postgresql-libs python-mpi4py shiboken6
-             openvr pdal postgresql-libs python-mpi4py setconf shiboken6 swig
+             swig utf8cpp)
-             utf8cpp)
 optdepends=('graphviz: dependency graph support'
             'openscad: OpenSCAD support')
 options=(!lto)
@@ -41,6 +42,7 @@ source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver"
         https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch
         https://github.com/FreeCAD/FreeCAD/commit/ac9a88c2.patch
         https://github.com/FreeCAD/FreeCAD/commit/ccaee189.patch
+        https://github.com/FreeCAD/FreeCAD/commit/72fc04bf.patch
         desktop-icon-under-wayland.patch
         fixups-with-qt6-enums.patch)
 b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7'
@@ -50,21 +52,22 @@ b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23
         'de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc'
         '02284db1b17dc88d0522eb3a726076b9f1ded740fdab1a185e48534c3606c77e51a12690b02bf5e0d9d1f72d1d8389ba84a54cba274200e69b6b10a431bbfdfe'
         '96eae9bf5af8c041876cf6afd09f2b0dbc12369469ceb6d5c4607fccee8914dfd9b3eef8291ccdc6aded0369a6bcf0fb159dbfb8172b0f7b95324c22310e21f5'
-        '6ef009021e507b9291f60c9479148a9697f1da4d9965e26575d74c612162431a0fc61de2e3856d8ed51ca10d9b7f6c9d25a24ad86e9acadd30c0176646c682a3'
+        '96298a048569e6c4d5864504eeb908cdcbe1e22d7485969a7858bd08e66d1d9c050b5d4393e42801afdf3e31e48f56ec21bf1f1f2b1e19c02f54cc4d32d115f3'
+        '8af23999e48d3ac4c80a259e12ba9e25f750c3ee1da047131ddc60228ad9c73434405949acbee89e82981be55ebfac4aec8c7d00e421bbee864cde199a07267f'
         '9cb72c3df3f1c8e49b4242b1e05f51c68e6df98891a0c485488433bb9eef1e814fe712761b62ef09cb37551643819a48cbf704df2121bf33401e410a05dce722')
 
 prepare() {
   patch -d freecad -Np1 -i "$srcdir"/freecad-vtk9.3.patch
   patch -d freecad -Np1 -i ../62c3836c.patch # Fix Qt6 issues in addons manager
-  patch -d freecad -Np1 -i ../pyside6.patch
+  patch -d freecad -Np1 -i ../pyside6.patch  # Fix PySide 6 issues
   patch -d freecad -Np1 -i ../ac9a88c2.patch # Fix more pyside6 issues
   patch -d freecad -Np1 -i ../6043c904.patch # Fix build with Python 3.12
   patch -d freecad -Np1 -i ../ccaee189.patch # Fix NaviCube drawing and interaction with Qt6
+  patch -d freecad -Np1 -i ../72fc04bf.patch # Fix Python import
   patch -d freecad -Np1 -i ../desktop-icon-under-wayland.patch # Install desktop file and icon with the proper name
   patch -d freecad -Np1 -i ../fixups-with-qt6-enums.patch # Discard int conversions in WBs Python sources
   sed -e 's|Shiboken::Module::getTypes(requiredModule)|reinterpret_cast<PyTypeObject **>(Shiboken::Module::getTypes(requiredModule))|' \
     -i freecad/src/Gui/PythonWrapper.cpp # Fix build with PySide 6.7
-  setconf freecad/src/XDGData/org.freecad.FreeCAD.desktop Icon=org.freecad.FreeCAD
 }
 
 build() {

extra/freecad/desktop-icon-under-wayland.patch

@@ -31,9 +31,21 @@ index 9c70207f59..8c4cb7c74e 100644
  )
  
 diff --git a/src/XDGData/org.freecadweb.FreeCAD.desktop b/src/XDGData/org.freecad.FreeCAD.desktop
-similarity index 100%
+similarity index 97%
 rename from src/XDGData/org.freecadweb.FreeCAD.desktop
 rename to src/XDGData/org.freecad.FreeCAD.desktop
+index df82a16063..1326f37ca7 100644
+--- a/src/XDGData/org.freecadweb.FreeCAD.desktop
++++ b/src/XDGData/org.freecad.FreeCAD.desktop
+@@ -17,7 +17,7 @@ GenericName[ru]=Система автоматизированного проек
+ Exec=FreeCAD %F
+ Terminal=false
+ Type=Application
+-Icon=org.freecadweb.FreeCAD
++Icon=org.freecad.FreeCAD
+ Categories=Graphics;Science;Education;Engineering;
+ StartupNotify=true
+ MimeType=application/x-extension-fcstd;model/obj;model/iges;image/vnd.dwg;image/vnd.dxf;model/vnd.collada+xml;application/iges;model/iges;model/step;model/step+zip;model/stl;application/vnd.shp;model/vrml;
 diff --git a/src/XDGData/org.freecadweb.FreeCAD.svg b/src/XDGData/org.freecad.FreeCAD.svg
 similarity index 100%
 rename from src/XDGData/org.freecadweb.FreeCAD.svg