From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3DD0C1581D3 for ; Wed, 29 May 2024 17:07:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D8C0E29E8; Wed, 29 May 2024 17:07:56 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43360E29E8 for ; Wed, 29 May 2024 17:07:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 46527342F94 for ; Wed, 29 May 2024 17:07:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98F3ED for ; Wed, 29 May 2024 17:07:51 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1717002457.4f8dbb6345ae081b5bb65af4ea20c0c8eb09e92e.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch media-gfx/freecad/freecad-0.21.2-r2.ebuild media-gfx/freecad/freecad-9999.ebuild X-VCS-Directories: media-gfx/freecad/ media-gfx/freecad/files/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 4f8dbb6345ae081b5bb65af4ea20c0c8eb09e92e X-VCS-Branch: master Date: Wed, 29 May 2024 17:07:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5ad297a1-602b-450f-8106-c3712e70bd82 X-Archives-Hash: dff17318d3208058ba4ce616f41e01bd commit: 4f8dbb6345ae081b5bb65af4ea20c0c8eb09e92e Author: Andrew Ammerlaan gentoo org> AuthorDate: Wed May 29 17:06:56 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Wed May 29 17:07:37 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8dbb63 media-gfx/freecad: fix build with boost 1.75 and properly pass through arguments in wrapper Closes: https://bugs.gentoo.org/932454 Closes: https://bugs.gentoo.org/932818 Signed-off-by: Andrew Ammerlaan gentoo.org> .../freecad/files/freecad-0.21.2-boost-175-1.patch | 22 +++++++++++++++++++ .../freecad/files/freecad-0.21.2-boost-175-2.patch | 22 +++++++++++++++++++ .../freecad/files/freecad-0.21.2-boost-175-3.patch | 25 ++++++++++++++++++++++ media-gfx/freecad/freecad-0.21.2-r2.ebuild | 5 ++++- media-gfx/freecad/freecad-9999.ebuild | 2 +- 5 files changed, 74 insertions(+), 2 deletions(-) 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 +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 +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 +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