gentoo auto-resync : 30:05:2024 - 00:07:18

6 files changed, 79 insertions, 4 deletions

diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index 78dd65e4ec8b..69bbfe3bcba1 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,10 +1,13 @@
 AUX freecad-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch 381 BLAKE2B 2fe05252a4e7846006c5f4e679eae5416ede589b9a6ad5fc30425933bedf933bf586b711c2c7d6a59c3881d454ea76ca39e0556a5a31c3769032694f0858e264 SHA512 731befc86267de4e5fa2caf619a8ae9692580d7025ebc26a80f6744a3104263622c38d87d0d8a263a1a15ef1c1d78c9ff3351aa463a9943941bd7d96d946e516
 AUX freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch 375 BLAKE2B 27fd88fe3f19ff49e1172f572e2f3f229b91295445190e2d7fd9f8c144c18195dbe853c7cbe79424897116eeedab638802afc438648d377dfcf6ac7f5d9f04bc SHA512 f0c04d302b53295dfacad5408c5de5c8203f673f9e13274b9a1a5787f5b1b649b44e10485416fe661a2ec11e51178c82dff419ab427f4317bc26ecc3d8469bd7
+AUX freecad-0.21.2-boost-175-1.patch 969 BLAKE2B 94e8efec851f0359a611bc95066b53d84a2489bcb45e7e77b1d5c167d033ce69a87853fe3fe56a3addff3305c53f556abb8f1f48727e6bc6a8bc43932ef475c2 SHA512 d012a219a6767449bd458a808dccb03d6b7332235ea7331c1c3178ef053e1c3e5898daed78e99ffc80504c7472c3fc34cfc275fab571b068f1955c3741f0eb65
+AUX freecad-0.21.2-boost-175-2.patch 973 BLAKE2B b9df6cb8d28c08a80387b9374e0eb663e747e4b07509af651c838c3b773242f3e129be07a307f5ed1fef7c4b633143636e1c40105e11d5c184cddfa08954f4f4 SHA512 2ad2137c328930ac9b786535502b16ec76d00b3af3b4c275a54cb00770d9a7ebad8e1a5c6126b6e6095fbac0e7c84c0b2436845bc16141d6f4c3164615a35a9b
+AUX freecad-0.21.2-boost-175-3.patch 1015 BLAKE2B 547338ced16847270e599a2f3111309f28fe52b57a09e0afaaf353336c0b935c6bb37ea26a2402cffd219e3a06ca412cae90d16bfc8a4c8f25b5f0b752249b0f SHA512 abc03f8ae63ce03ab3bdfa9e64b71c7bebe6bc1fd9b576ad06b9b00513b261df3265ed770cca5b017eb13e3d66504eabc6e24996b804de57ddf0cd7749a6fdbd
 AUX freecad-0.21.2-shiboken-6.7.0.patch 306 BLAKE2B 03ddf2bfe249856aec0624054eb9db68c1239e153bff91cab16d04b9dad4c341714eecd338ce90b2f5b4aedf26515dee6390fad1b104189fd3a8cf15556f04fa SHA512 cb7c4d699149b839a2b841d71a7bf2983635ed4e3f93ad25ab97c8dcd616c6e48b9fd4ce0e368ec516edb79794b7a98ebda645f09aada7e41228fc5bca1d8cc1
 AUX freecad-0.21.2-vtk9.3-fix.patch 1065 BLAKE2B d0fccb7c19dc9a5efedb5691a74c6ba62b76afe12ecd4876292478459a895409e9448ad319b05fdff2952e8f031e5e2d1cd08fd279f6c6d38d6136f6a8c7c2ab SHA512 aaf4729ac1623cd73405da82980603e5e4aaacf4fb34751dabaa8cc64e69f91d325c855bc2f23aeaa1f4052848af696e7edadeb144f06ce12775bc4c2333a137
 AUX freecad-9999-Gentoo-specific-don-t-check-vcs.patch 350 BLAKE2B e1b612ac81f73546a3a7ae93e447aba6e3f28dea1292f5d308f567307c8c6146b8dfdcc1cef946c64991d41c41fa9c8949f56e2e8573833bad2a3826bab960ba SHA512 f96678dbfe13668a9f65131996ddc5eb2cbe80296b7eb2cc7d248e3ee1d991bea95568b0241da8387106812aac5762c330afb1d8c38b2281c3ee2600db120627
 AUX freecad-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch 469 BLAKE2B 23e56fbc49b3c3d5ede85e6ec15d26c88c93590fce105e0b75e8b0bd3fee125c500cd59d8db0144c610edb371df318396e056333ec7a411f7647b38d18006efc SHA512 82737af95603ff1f667bf49ee43b85b411eeeb5fd9b577ad7fca6e02bcbfda5c3bbb6c70386e5f69d2181d6226574f82cb68b7e66dfe8f4bb14d946f594582cf
 DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5
-EBUILD freecad-0.21.2-r2.ebuild 12004 BLAKE2B 7e1aca04cdbcca67a8c97c01dc2ef8d403b290425ebbcc24e370e002d798632c0db4f17a0eea0397c436cdda5e19bd70aa54c4c3d46199feed852a5a850a40ab SHA512 5807cc63ce7c2a4093a56141f09eceafa51148a4064a0e9cc328843b15c9adc6de676c7fd0d34927d532109ea1e1e5ce8a2217cbe17b0b36131fb8be9e2867f7
-EBUILD freecad-9999.ebuild 11959 BLAKE2B 4cdbc244f96230ec1e5a75559d07759f22fe89423ea03201351c26527c02e783e15fcfa9b31ca74e0adaeb2857468df5d17e1545bd49ec5cf98e8dcdc7792882 SHA512 64fd48c2520088aa4d5d60b026d35e23344ab7337f5167c369f952cebe25a3505d93b1c5cea1800fac1addeb8e64ff303f3042f4762118db86f25cf375e2a57e
+EBUILD freecad-0.21.2-r2.ebuild 12148 BLAKE2B 9e732034980c3d5e1aad7b08956e9fbb3bb51c9fbd69be3c2c73d6aee3418fed8669ec878ac915d1667487939d6194466492952d7727c79ee28340ea4e3fe9e6 SHA512 85de5b676ed22f1534cf33379a7d973362425b3df1cfddbc0a83183493af5af82d11df6e16f5c7d71e36b56c3332a562428666a51c33ec67d759d97f7c263cc4
+EBUILD freecad-9999.ebuild 11965 BLAKE2B 5a7e8c7b1fc66c83a105cd6b7b5ac6428d1d5034f30a9c9aab0d9442c3fa26566cd6da1a71d8822bb126dd289c5158128ac096362cbc03dc330e093e94dc739b SHA512 cc841f24be77f3807e3ea29dd3d109ae0f0c21f63befc42ccd892e6036f222e68f415236dc4305efd202395ece5b96d19bbe495c395cfd67b34ec1610479bcf6
 MISC metadata.xml 3190 BLAKE2B 5f8776248055147c9b2a308913e1d3476ad27b5a3b7795b4fdf15b4d7f10451d6f5ce16ab1ef691daedd74f02fa12efb6341a7ec10456786c427d7707948fdbc SHA512 2163a91c7f7ec97acf81e7c4a2481667388fb43f60ee48d40a09c9bebfebffa8a807ff275385d8dcbefefe16c51bc9de3c07c84d92344f968985693117007042
diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch
new file mode 100644
index 000000000000..cbb78d5bdc94
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch
@@ -0,0 +1,22 @@
+From f555a25f9e67e628e8075fc8599d7c11807eaddd Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Sun, 21 Apr 2024 08:36:16 +0200
+Subject: [PATCH] Fixes #13549: smesh doesn't compile with boost 1.85
+
+---
+ src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp
+index d72ff2363f39..f108cbbcb2cf 100644
+--- a/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp
++++ b/src/3rdParty/salomesmesh/src/SMESH/DriverGMF.cpp
+@@ -55,7 +55,7 @@ namespace DriverGMF
+ 
+   bool isExtensionCorrect( const std::string& fileName )
+   {
+-    std::string ext  = boost::filesystem::extension(fileName);
++    std::string ext = boost::filesystem::path(fileName).extension().string();
+     switch ( ext.size() ) {
+     case 5: return ( ext == ".mesh" || ext == ".solb" );
+     case 6: return ( ext == ".meshb" );
diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch
new file mode 100644
index 000000000000..5f0807028859
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch
@@ -0,0 +1,22 @@
+From aa54ba73df4d42878130c99688be35acf10725a0 Mon Sep 17 00:00:00 2001
+From: ppphp <kevinniub@gmail.com>
+Date: Sat, 30 Mar 2024 13:52:32 +0800
+Subject: [PATCH] fix: c++20 deprecate copy_option
+
+---
+ src/Gui/PreferencePackManager.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp
+index e0e6184a3147..e1773a436852 100644
+--- a/src/Gui/PreferencePackManager.cpp
++++ b/src/Gui/PreferencePackManager.cpp
+@@ -224,7 +224,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();
+ }
+ 
diff --git a/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch b/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch
new file mode 100644
index 000000000000..c4c8039dab49
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch
@@ -0,0 +1,25 @@
+From 91457bbdee2422c7f0372688cf72d021cf222073 Mon Sep 17 00:00:00 2001
+From: ppphp <kevinniub@gmail.com>
+Date: Sat, 30 Mar 2024 19:17:56 +0800
+Subject: [PATCH] add version check macro for compatibility
+
+---
+ src/Gui/PreferencePackManager.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/Gui/PreferencePackManager.cpp b/src/Gui/PreferencePackManager.cpp
+index e1773a436852..dfc54240c00c 100644
+--- a/src/Gui/PreferencePackManager.cpp
++++ b/src/Gui/PreferencePackManager.cpp
+@@ -224,7 +224,11 @@ void Gui::PreferencePackManager::importConfig(const std::string& packName,
+     auto savedPreferencePacksDirectory =
+         fs::path(App::Application::getUserAppDataDir()) / "SavedPreferencePacks";
+     auto cfgFilename = savedPreferencePacksDirectory / packName / (packName + ".cfg");
++#if BOOST_VERSION >= 107400
+     fs::copy_file(path, cfgFilename, fs::copy_options::overwrite_existing);
++#else
++    fs::copy_file(path, cfgFilename, fs::copy_option::overwrite_if_exists);
++#endif
+     rescan();
+ }
+ 
diff --git a/media-gfx/freecad/freecad-0.21.2-r2.ebuild b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index b0f1d3fac470..b65ac07c0858 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -165,6 +165,9 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch
 	"${FILESDIR}"/${PN}-0.21.1-Gentoo-specific-don-t-check-vcs.patch
 	"${FILESDIR}"/${PN}-0.21.2-vtk9.3-fix.patch
+	"${FILESDIR}"/${PN}-0.21.2-boost-175-1.patch
+	"${FILESDIR}"/${PN}-0.21.2-boost-175-2.patch
+	"${FILESDIR}"/${PN}-0.21.2-boost-175-3.patch
 )
 
 DOCS=( CODE_OF_CONDUCT.md README.md )
@@ -336,7 +339,7 @@ src_install() {
 		# https://github.com/coin3d/coin/issues/451
 		: \${QT_QPA_PLATFORM:=xcb}
 		export QT_QPA_PLATFORM
-		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD
+		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@}
 		_EOF_
 		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
 	fi
diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild
index ad9a9580164b..f5778af821ff 100644
--- a/media-gfx/freecad/freecad-9999.ebuild
+++ b/media-gfx/freecad/freecad-9999.ebuild
@@ -333,7 +333,7 @@ src_install() {
 		# https://github.com/coin3d/coin/issues/451
 		: \${QT_QPA_PLATFORM:=xcb}
 		export QT_QPA_PLATFORM
-		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD
+		exec /usr/$(get_libdir)/${PN}/bin/FreeCAD \${@}
 		_EOF_
 		mv "${ED}"/usr/$(get_libdir)/${PN}/share/* "${ED}"/usr/share || die "failed to move shared resources"
 	fi