extra/freecad to 0.21.2-25

extra/freecad/.SRCINFO

@@ -1,7 +1,7 @@
 pkgbase = freecad
 	pkgdesc = Feature based parametric 3D CAD modeler
 	pkgver = 0.21.2
-	pkgrel = 24
+	pkgrel = 25
 	url = https://freecadweb.org/
 	arch = x86_64
 	license = LGPL
@@ -61,7 +61,8 @@ pkgbase = freecad
 	source = https://github.com/FreeCAD/FreeCAD/commit/72fc04bf.patch
 	source = desktop-icon-under-wayland.patch
 	source = fixups-with-qt6-enums.patch
-	b2sums = b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7
+	source = boost-1.86.patch
+	b2sums = SKIP
 	b2sums = f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5
 	b2sums = eceb2d1b580fafaeec35de31fb3f4ec947ad32afe96734aa86d338364c97bbe5218506627957063c35ea2f360b7f7f916c9b7a1c0ef674c35d1f7972c070210e
 	b2sums = eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f
@@ -71,5 +72,6 @@ pkgbase = freecad
 	b2sums = 96298a048569e6c4d5864504eeb908cdcbe1e22d7485969a7858bd08e66d1d9c050b5d4393e42801afdf3e31e48f56ec21bf1f1f2b1e19c02f54cc4d32d115f3
 	b2sums = 8af23999e48d3ac4c80a259e12ba9e25f750c3ee1da047131ddc60228ad9c73434405949acbee89e82981be55ebfac4aec8c7d00e421bbee864cde199a07267f
 	b2sums = 9cb72c3df3f1c8e49b4242b1e05f51c68e6df98891a0c485488433bb9eef1e814fe712761b62ef09cb37551643819a48cbf704df2121bf33401e410a05dce722
+	b2sums = 6aa942c0977d5e1eb0c30c7da892faabcdd0973519bdee59037eaf08db02126802cfe951b943ff04a7ba57ad082f6c3a71db6f2c879888056042adbcc6b89764
 
 pkgname = freecad

extra/freecad/PKGBUILD

@@ -20,7 +20,7 @@ highmem=1
 
 pkgname=freecad
 pkgver=0.21.2
-pkgrel=24
+pkgrel=25
 pkgdesc='Feature based parametric 3D CAD modeler'
 arch=(x86_64)
 url='https://freecadweb.org/'
@@ -44,8 +44,9 @@ source=("git+https://github.com/$pkgname/$pkgname#tag=$pkgver"
         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)
+        fixups-with-qt6-enums.patch
-b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23aebc68ca5bbdee2da22c959004c7b595e19b542b1ec06a7275c0f5ea7'
+        boost-1.86.patch)
+b2sums=('SKIP'
         'f0b5a4648eb4befabb2339bae4e42044e436aa50ad1c2a25b243c965272a217b2c1c69c34d0d20bd01c573008de10f733b74857ffecac502b8558a7095e305e5'
         'eceb2d1b580fafaeec35de31fb3f4ec947ad32afe96734aa86d338364c97bbe5218506627957063c35ea2f360b7f7f916c9b7a1c0ef674c35d1f7972c070210e'
         'eb474708c3611293cfe3dfc287418b606f7735f6eb306f44f7394cd7e65256daddcee35984211982f25064e7ec81cc038d4eeb8d34af7399058ecfb6e8e99e9f'
@@ -54,7 +55,8 @@ b2sums=('b20da85de907a41b14581583f9d69cab8fe79b1bdd50c24fc299c649ef0bfd7723c0b23
         '96eae9bf5af8c041876cf6afd09f2b0dbc12369469ceb6d5c4607fccee8914dfd9b3eef8291ccdc6aded0369a6bcf0fb159dbfb8172b0f7b95324c22310e21f5'
         '96298a048569e6c4d5864504eeb908cdcbe1e22d7485969a7858bd08e66d1d9c050b5d4393e42801afdf3e31e48f56ec21bf1f1f2b1e19c02f54cc4d32d115f3'
         '8af23999e48d3ac4c80a259e12ba9e25f750c3ee1da047131ddc60228ad9c73434405949acbee89e82981be55ebfac4aec8c7d00e421bbee864cde199a07267f'
-        '9cb72c3df3f1c8e49b4242b1e05f51c68e6df98891a0c485488433bb9eef1e814fe712761b62ef09cb37551643819a48cbf704df2121bf33401e410a05dce722')
+        '9cb72c3df3f1c8e49b4242b1e05f51c68e6df98891a0c485488433bb9eef1e814fe712761b62ef09cb37551643819a48cbf704df2121bf33401e410a05dce722'
+        '6aa942c0977d5e1eb0c30c7da892faabcdd0973519bdee59037eaf08db02126802cfe951b943ff04a7ba57ad082f6c3a71db6f2c879888056042adbcc6b89764')
 
 prepare() {
   patch -d freecad -Np1 -i "$srcdir"/freecad-vtk9.3.patch
@@ -68,6 +70,9 @@ prepare() {
   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
+  cd freecad
+  git cherry-pick -n f555a25f9e67e628e8075fc8599d7c11807eaddd # Fix build with boost 1.85
+  patch -p1 -i ../boost-1.86.patch
 }
 
 build() {

extra/freecad/boost-1.86.patch

@@ -0,0 +1,156 @@
+diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp
+index 50c02eafc3..18b6ba1f2e 100644
+--- a/src/Mod/Part/App/Geometry.cpp
++++ b/src/Mod/Part/App/Geometry.cpp
+@@ -385,14 +385,14 @@ void Geometry::deleteExtension(const std::string & name)
+ void Geometry::createNewTag()
+ {
+     // Initialize a random number generator, to avoid Valgrind false positives.
+-    static boost::mt19937 ran;
++    static std::mt19937 ran;
+     static bool seeded = false;
+ 
+     if (!seeded) {
+         ran.seed(static_cast<unsigned int>(std::time(nullptr)));
+         seeded = true;
+     }
+-    static boost::uuids::basic_random_generator<boost::mt19937> gen(&ran);
++    static boost::uuids::basic_random_generator<std::mt19937> gen(&ran);
+ 
+     tag = gen();
+ }
+diff --git a/src/Mod/Sketcher/App/Constraint.cpp b/src/Mod/Sketcher/App/Constraint.cpp
+index 9e4bfd9cd2..a18720169f 100644
+--- a/src/Mod/Sketcher/App/Constraint.cpp
++++ b/src/Mod/Sketcher/App/Constraint.cpp
+@@ -58,14 +58,14 @@ Constraint::Constraint()
+       isActive(true)
+ {
+     // Initialize a random number generator, to avoid Valgrind false positives.
+-    static boost::mt19937 ran;
++    static std::mt19937 ran;
+     static bool seeded = false;
+ 
+     if (!seeded) {
+         ran.seed(QDateTime::currentMSecsSinceEpoch() & 0xffffffff);
+         seeded = true;
+     }
+-    static boost::uuids::basic_random_generator<boost::mt19937> gen(&ran);
++    static boost::uuids::basic_random_generator<std::mt19937> gen(&ran);
+ 
+     tag = gen();
+ }
+diff --git a/src/Mod/TechDraw/App/CenterLine.cpp b/src/Mod/TechDraw/App/CenterLine.cpp
+index c03fd66a11..540d6485f7 100644
+--- a/src/Mod/TechDraw/App/CenterLine.cpp
++++ b/src/Mod/TechDraw/App/CenterLine.cpp
+@@ -915,14 +915,14 @@ std::string CenterLine::getTagAsString() const
+ void CenterLine::createNewTag()
+ {
+     // Initialize a random number generator, to avoid Valgrind false positives.
+-    static boost::mt19937 ran;
++    static std::mt19937 ran;
+     static bool seeded = false;
+ 
+     if (!seeded) {
+         ran.seed(static_cast<unsigned int>(std::time(nullptr)));
+         seeded = true;
+     }
+-    static boost::uuids::basic_random_generator<boost::mt19937> gen(&ran);
++    static boost::uuids::basic_random_generator<std::mt19937> gen(&ran);
+ 
+ 
+     tag = gen();
+diff --git a/src/Mod/TechDraw/App/Cosmetic.cpp b/src/Mod/TechDraw/App/Cosmetic.cpp
+index f0ce813227..9167f17286 100644
+--- a/src/Mod/TechDraw/App/Cosmetic.cpp
++++ b/src/Mod/TechDraw/App/Cosmetic.cpp
+@@ -301,14 +301,14 @@ std::string CosmeticEdge::getTagAsString() const
+ void CosmeticEdge::createNewTag()
+ {
+     // Initialize a random number generator, to avoid Valgrind false positives.
+-    static boost::mt19937 ran;
++    static std::mt19937 ran;
+     static bool seeded = false;
+ 
+     if (!seeded) {
+         ran.seed(static_cast<unsigned int>(std::time(nullptr)));
+         seeded = true;
+     }
+-    static boost::uuids::basic_random_generator<boost::mt19937> gen(&ran);
++    static boost::uuids::basic_random_generator<std::mt19937> gen(&ran);
+ 
+     tag = gen();
+ }
+@@ -454,14 +454,14 @@ std::string GeomFormat::getTagAsString() const
+ void GeomFormat::createNewTag()
+ {
+     // Initialize a random number generator, to avoid Valgrind false positives.
+-    static boost::mt19937 ran;
++    static std::mt19937 ran;
+     static bool seeded = false;
+ 
+     if (!seeded) {
+         ran.seed(static_cast<unsigned int>(std::time(nullptr)));
+         seeded = true;
+     }
+-    static boost::uuids::basic_random_generator<boost::mt19937> gen(&ran);
++    static boost::uuids::basic_random_generator<std::mt19937> gen(&ran);
+ 
+     tag = gen();
+ }
+diff --git a/src/Mod/TechDraw/App/CosmeticVertex.cpp b/src/Mod/TechDraw/App/CosmeticVertex.cpp
+index 7e02cc5518..281386597f 100644
+--- a/src/Mod/TechDraw/App/CosmeticVertex.cpp
++++ b/src/Mod/TechDraw/App/CosmeticVertex.cpp
+@@ -190,14 +190,14 @@ std::string CosmeticVertex::getTagAsString() const
+ void CosmeticVertex::createNewTag()
+ {
+     // Initialize a random number generator, to avoid Valgrind false positives.
+-    static boost::mt19937 ran;
++    static std::mt19937 ran;
+     static bool seeded = false;
+ 
+     if (!seeded) {
+         ran.seed(static_cast<unsigned int>(std::time(nullptr)));
+         seeded = true;
+     }
+-    static boost::uuids::basic_random_generator<boost::mt19937> gen(&ran);
++    static boost::uuids::basic_random_generator<std::mt19937> gen(&ran);
+ 
+     tag = gen();
+ }
+diff --git a/src/Mod/TechDraw/App/Geometry.cpp b/src/Mod/TechDraw/App/Geometry.cpp
+index 9786f2245d..12a78deb9d 100644
+--- a/src/Mod/TechDraw/App/Geometry.cpp
++++ b/src/Mod/TechDraw/App/Geometry.cpp
+@@ -1448,14 +1448,14 @@ void Vertex::Restore(Base::XMLReader &reader)
+ void Vertex::createNewTag()
+ {
+     // Initialize a random number generator, to avoid Valgrind false positives.
+-    static boost::mt19937 ran;
++    static std::mt19937 ran;
+     static bool seeded = false;
+ 
+     if (!seeded) {
+         ran.seed(static_cast<unsigned int>(std::time(nullptr)));
+         seeded = true;
+     }
+-    static boost::uuids::basic_random_generator<boost::mt19937> gen(&ran);
++    static boost::uuids::basic_random_generator<std::mt19937> gen(&ran);
+ 
+     tag = gen();
+ }
+diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp
+index ed6f75d464..bce3887b44 100644
+--- a/src/Gui/PreferencePackManager.cpp
++++ b/src/Gui/PreferencePackManager.cpp
+@@ -221,7 +221,7 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName,
+     auto savedPreferencePacksDirectory =
+         fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
+     auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + ".cfg");
+-    fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists);
++    fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing);
+     rescan();
+ }
+