extra/freecad to 0.21.2-12

extra/freecad/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = freecad
 	pkgdesc = Feature based parametric 3D CAD modeler
 	pkgver = 0.21.2
-	pkgrel = 8
+	pkgrel = 12
 	url = https://freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -53,9 +53,11 @@ pkgbase = freecad
 	source = freecad-vtk9.3.patch
 	source = pyside6.patch
 	source = 62c3836c.patch
-	b2sums = SKIP
+	source = https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch
+	b2sums = b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7
 	b2sums = f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5
-	b2sums = 34a9c80fd2413284a2e09c41e91ef5079edafde6177384bfe8cc28ab44c60a8a1dfbee00d99ede39841f9405d1bc1b2b0e7bd1abff3e6a9fc32d124b656c2a9e
+	b2sums = fb2dace322b82be706e7bbcb4e73c3ddb817264e5aeb5ec943638173b3fabbe4b0abae3e159f64c56fc570f05df71154bf07d6948fe90929764442e88a6bcef1
 	b2sums = eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f
+	b2sums = de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc
 
 pkgname = freecad

extra/freecad/PKGBUILD

@@ -18,7 +18,7 @@ highmem=1
 
 pkgname=freecad
 pkgver=0.21.2
-pkgrel=8
+pkgrel=12
 pkgdesc='Feature based parametric 3D CAD modeler'
 arch=(x86_64)
 url='https://freecadweb.org/'
@@ -36,16 +36,21 @@ optdepends=('graphviz: dependency graph support'
 source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver"
         freecad-vtk9.3.patch
         pyside6.patch
-        62c3836c.patch)
-b2sums=('SKIP'
+        62c3836c.patch
+        https://github.com/FreeCAD/FreeCAD/commit/6043c904.patch)
+b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7'
         'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5'
-        '34a9c80fd2413284a2e09c41e91ef5079edafde6177384bfe8cc28ab44c60a8a1dfbee00d99ede39841f9405d1bc1b2b0e7bd1abff3e6a9fc32d124b656c2a9e'
-        'eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f')
+        'fb2dace322b82be706e7bbcb4e73c3ddb817264e5aeb5ec943638173b3fabbe4b0abae3e159f64c56fc570f05df71154bf07d6948fe90929764442e88a6bcef1'
+        'eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f'
+        'de4b98c4b488045f9810dce124c271d6f4f629922e026f2d4f1efd6c9060b92309db41f8e0f6ebe5e7a27399911ac908cc8935c2501214326dbb1c4b739d46cc')
 
 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 ../6043c904.patch # Fix build with Python 3.12
+  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
 }
 
 build() {

extra/freecad/pyside6.patch

@@ -106,4 +106,29 @@ index cb8bb63d8a..7445173537 100644
                  # restart FreeCAD after a delay to give time to this dialog to close
                  QtCore.QTimer.singleShot(1000, utils.restart_freecad)
  
+diff --git a/src/Mod/Arch/importIFClegacy.py b/src/Mod/Arch/importIFClegacy.py
+index 8935233f09..20c395ed9d 100644
+--- a/src/Mod/Arch/importIFClegacy.py
++++ b/src/Mod/Arch/importIFClegacy.py
+@@ -1800,7 +1800,7 @@ def explorer(filename,schema="IFC2X3_TC1.exp"):
+     tree.headerItem().setText(1, "")
+     tree.headerItem().setText(2, "Item and Properties")
+     bold = QtGui.QFont()
+-    bold.setWeight(75)
++    bold.setWeight(QtGui.QFont.Weight(75))
+     bold.setBold(True)
+ 
+     #print(ifc.Entities)
+diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
+index b19101e9ca..b44425e012 100644
+--- a/src/Mod/Draft/DraftGui.py
++++ b/src/Mod/Draft/DraftGui.py
+@@ -406,7 +406,7 @@ class DraftToolBar:
+         self.promptlabel = self._label("promptlabel", self.layout, hide=task)
+         self.cmdlabel = self._label("cmdlabel", self.layout, hide=task)
+         boldtxt = QtGui.QFont()
+-        boldtxt.setWeight(75)
++        boldtxt.setWeight(QtGui.QFont.Weight(75))
+         boldtxt.setBold(True)
+         self.cmdlabel.setFont(boldtxt)