From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1693380-garchives=archives.gentoo.org@lists.gentoo.org>
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 (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id CA6311581EC
for <garchives@archives.gentoo.org>; Sat, 23 Nov 2024 19:40:51 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A5102E0869;
Sat, 23 Nov 2024 19:40:50 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(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 6C095E0869
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Nov 2024 19:40:50 +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 2640F342F9A
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Nov 2024 19:40:49 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4288CAE7
for <gentoo-commits@lists.gentoo.org>; Sat, 23 Nov 2024 19:40:47 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1732390736.27bcb7d574b6e63c431643efc35226d09ba02da4.asturm@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/Manifest media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch 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/files/freecad-0.21.2-navcube-qt6.patch media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch media-gfx/freecad/freecad-0.21.2-r3.ebuild
X-VCS-Directories: media-gfx/freecad/ media-gfx/freecad/files/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 27bcb7d574b6e63c431643efc35226d09ba02da4
X-VCS-Branch: master
Date: Sat, 23 Nov 2024 19:40:47 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0e1d5276-cadd-4055-905c-ce538cea8674
X-Archives-Hash: 4f0d644df162e19ad8623fef370f5814
commit: 27bcb7d574b6e63c431643efc35226d09ba02da4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 23 17:34:47 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov 23 19:38:56 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27bcb7d5
media-gfx/freecad: drop 0.21.2-r3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-gfx/freecad/Manifest | 1 -
...ad-0.21.1-Gentoo-specific-don-t-check-vcs.patch | 16 -
.../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 --
.../freecad/files/freecad-0.21.2-navcube-qt6.patch | 29 --
.../freecad/files/freecad-0.21.2-py312-qt6.patch | 186 ----------
.../freecad/files/freecad-0.21.2-qtsvg-qt6.patch | 148 --------
.../files/freecad-0.21.2-shiboken-6.7.0.patch | 8 -
.../freecad/files/freecad-0.21.2-vtk9.3-fix.patch | 33 --
media-gfx/freecad/freecad-0.21.2-r3.ebuild | 398 ---------------------
11 files changed, 888 deletions(-)
diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest
index a624f400f434..6c17cf764fe5 100644
--- a/media-gfx/freecad/Manifest
+++ b/media-gfx/freecad/Manifest
@@ -1,2 +1 @@
-DIST freecad-0.21.2.tar.gz 66124278 BLAKE2B 84a4f8008192cd1a2ee1737b537b2668a8c028aa8c8645e6e412ab9ef79bf3bdd2cb73d96fcfd2dbcff613cdcc59cbab95821406acdc9cd7d4eb4636c081be78 SHA512 bd7e9029b24d49ac0955797bcdbea1fd0826bdf9ab246135366dfc35b427004f103acccfc66d008e3ab3928f99e04200e335908a03166545554e2d3e969ae0f5
DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db
diff --git a/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch b/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch
deleted file mode 100644
index 3d851c341e2e..000000000000
--- a/media-gfx/freecad/files/freecad-0.21.1-Gentoo-specific-don-t-check-vcs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Signed-off-by: Jörg Habenicht <j.habenicht@gmx.de>
---- a/src/Tools/SubWCRev.py
-+++ b/src/Tools/SubWCRev.py
-@@ -509,12 +509,6 @@
- bindir = a
-
- vcs = [
-- GitControl(),
-- DebianGitHub(),
-- BazaarControl(),
-- Subversion(),
-- MercurialControl(),
-- DebianChangelog(),
- UnknownControl(),
- ]
- for i in vcs:
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
deleted file mode 100644
index cbb78d5bdc94..000000000000
--- a/media-gfx/freecad/files/freecad-0.21.2-boost-175-1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index 5f0807028859..000000000000
--- a/media-gfx/freecad/files/freecad-0.21.2-boost-175-2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
deleted file mode 100644
index c4c8039dab49..000000000000
--- a/media-gfx/freecad/files/freecad-0.21.2-boost-175-3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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/files/freecad-0.21.2-navcube-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch
deleted file mode 100644
index 0ab999771068..000000000000
--- a/media-gfx/freecad/files/freecad-0.21.2-navcube-qt6.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ccaee18917432fd02e4371a7847bdfaf0692edd1 Mon Sep 17 00:00:00 2001
-From: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
-Date: Sun, 19 May 2024 23:23:45 -0300
-Subject: [PATCH] Gui: Fix NaviCube for Qt6
-
----
- src/Gui/NaviCube.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/Gui/NaviCube.cpp b/src/Gui/NaviCube.cpp
-index 2d164f196b3c..9e3a62d66c81 100644
---- a/src/Gui/NaviCube.cpp
-+++ b/src/Gui/NaviCube.cpp
-@@ -926,6 +926,7 @@ NaviCubeImplementation::PickId NaviCubeImplementation::pickFace(short x, short y
- GLubyte pixels[4] = {0};
- if (m_PickingFramebuffer && std::abs(x) <= m_CubeWidgetSize / 2 &&
- std::abs(y) <= m_CubeWidgetSize / 2) {
-+ static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport())->makeCurrent();
- m_PickingFramebuffer->bind();
-
- glViewport(0, 0, m_CubeWidgetSize * 2, m_CubeWidgetSize * 2);
-@@ -936,6 +937,7 @@ NaviCubeImplementation::PickId NaviCubeImplementation::pickFace(short x, short y
- glReadPixels(2 * x + m_CubeWidgetSize, 2 * y + m_CubeWidgetSize, 1, 1,
- GL_RGBA, GL_UNSIGNED_BYTE, &pixels);
- m_PickingFramebuffer->release();
-+ static_cast<QtGLWidget*>(m_View3DInventorViewer->viewport())->doneCurrent();
- }
- return pixels[3] == 255 ? static_cast<PickId>(pixels[0]) : PickId::None;
- }
diff --git a/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch
deleted file mode 100644
index c1fe31ab05ad..000000000000
--- a/media-gfx/freecad/files/freecad-0.21.2-py312-qt6.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-From 6043c90462e85fbf15e30ea4c7da7d9a22d570f2 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer@users.sourceforge.net>
-Date: Wed, 7 Feb 2024 15:25:13 +0100
-Subject: [PATCH] Py3.12: harmonize with upstream of PyCXX
-
----
- src/CXX/IndirectPythonInterface.cxx | 36 +++++++++++++++------
- src/CXX/Python3/IndirectPythonInterface.hxx | 6 ++--
- src/CXX/Python3/cxx_extensions.cxx | 2 +-
- src/CXX/Python3/cxxextensions.c | 10 ++++++
- src/CXX/Version.hxx | 2 +-
- 5 files changed, 42 insertions(+), 14 deletions(-)
-
-diff --git a/src/CXX/IndirectPythonInterface.cxx b/src/CXX/IndirectPythonInterface.cxx
-index 3d810cea88a5..fc9e45cbd64f 100644
---- a/src/CXX/IndirectPythonInterface.cxx
-+++ b/src/CXX/IndirectPythonInterface.cxx
-@@ -122,17 +122,21 @@ static PyTypeObject *ptr__Bytes_Type = NULL;
- # endif
-
- # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
-+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11)
- static int *ptr_Py_DebugFlag = NULL;
- static int *ptr_Py_InteractiveFlag = NULL;
- static int *ptr_Py_OptimizeFlag = NULL;
- static int *ptr_Py_NoSiteFlag = NULL;
- static int *ptr_Py_VerboseFlag = NULL;
-+# endif
-
--# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
- static const char **ptr__Py_PackageContext = NULL;
--# else
-+# else
- static char **ptr__Py_PackageContext = NULL;
--# endif
-+# endif
-+# endif
- # endif
-
- # ifdef Py_REF_DEBUG
-@@ -242,17 +246,21 @@ bool InitialisePythonIndirectInterface()
- ptr_Py_RefTotal = GetInt_as_IntPointer( "_Py_RefTotal" );
- # endif
- # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
-+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11)
- ptr_Py_DebugFlag = GetInt_as_IntPointer( "Py_DebugFlag" );
- ptr_Py_InteractiveFlag = GetInt_as_IntPointer( "Py_InteractiveFlag" );
- ptr_Py_OptimizeFlag = GetInt_as_IntPointer( "Py_OptimizeFlag" );
- ptr_Py_NoSiteFlag = GetInt_as_IntPointer( "Py_NoSiteFlag" );
- ptr_Py_VerboseFlag = GetInt_as_IntPointer( "Py_VerboseFlag" );
-+# endif
-
--# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
- ptr__Py_PackageContext = GetConstCharPointer_as_ConstCharPointerPointer( "_Py_PackageContext" );
--# else
-+# else
- ptr__Py_PackageContext = GetCharPointer_as_CharPointerPointer( "_Py_PackageContext" );
--# endif
-+# endif
-+# endif
- # endif
-
- # define PYCXX_STANDARD_EXCEPTION( eclass, bclass )
-@@ -397,17 +405,21 @@ PYCXX_EXPORT PyTypeObject *_Bytes_Type() { return ptr__Bytes_Type; }
- // wrap the Python Flag variables
- //
- # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
-+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11)
- PYCXX_EXPORT int &_Py_DebugFlag() { return *ptr_Py_DebugFlag; }
- PYCXX_EXPORT int &_Py_InteractiveFlag() { return *ptr_Py_InteractiveFlag; }
- PYCXX_EXPORT int &_Py_OptimizeFlag() { return *ptr_Py_OptimizeFlag; }
- PYCXX_EXPORT int &_Py_NoSiteFlag() { return *ptr_Py_NoSiteFlag; }
- PYCXX_EXPORT int &_Py_VerboseFlag() { return *ptr_Py_VerboseFlag; }
-+# endif
- # endif
-
--# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
- PYCXX_EXPORT const char *__Py_PackageContext() { return *ptr__Py_PackageContext; }
--# else
-+# else
- PYCXX_EXPORT char *__Py_PackageContext() { return *ptr__Py_PackageContext; }
-+# endif
- # endif
-
- # if 0
-@@ -518,15 +530,19 @@ PYCXX_EXPORT PyTypeObject *_Bytes_Type() { return &PyBytes_Type; }
- // wrap flags
- //
- # if PY_MAJOR_VERSION == 2 || !defined( Py_LIMITED_API )
-+# if PY_MAJOR_VERSION == 2 || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11)
- PYCXX_EXPORT int &_Py_DebugFlag() { return Py_DebugFlag; }
- PYCXX_EXPORT int &_Py_InteractiveFlag() { return Py_InteractiveFlag; }
- PYCXX_EXPORT int &_Py_OptimizeFlag() { return Py_OptimizeFlag; }
- PYCXX_EXPORT int &_Py_NoSiteFlag() { return Py_NoSiteFlag; }
- PYCXX_EXPORT int &_Py_VerboseFlag() { return Py_VerboseFlag; }
--# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
-+# endif
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
- PYCXX_EXPORT const char *__Py_PackageContext() { return _Py_PackageContext; }
--# else
-+# else
- PYCXX_EXPORT char *__Py_PackageContext() { return _Py_PackageContext; }
-+# endif
- # endif
- # endif
-
-diff --git a/src/CXX/Python3/IndirectPythonInterface.hxx b/src/CXX/Python3/IndirectPythonInterface.hxx
-index bf2c15c53f9a..eb4ae4fe63b9 100644
---- a/src/CXX/Python3/IndirectPythonInterface.hxx
-+++ b/src/CXX/Python3/IndirectPythonInterface.hxx
-@@ -149,10 +149,12 @@ PYCXX_EXPORT int &_Py_NoSiteFlag();
- PYCXX_EXPORT int &_Py_TabcheckFlag();
- PYCXX_EXPORT int &_Py_VerboseFlag();
-
--# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION <= 11
-+# if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 7
- PYCXX_EXPORT const char *__Py_PackageContext();
--# else
-+# else
- PYCXX_EXPORT char *__Py_PackageContext();
-+# endif
- # endif
- # endif
-
-diff --git a/src/CXX/Python3/cxx_extensions.cxx b/src/CXX/Python3/cxx_extensions.cxx
-index 7371810be4a9..e6eefdafea17 100644
---- a/src/CXX/Python3/cxx_extensions.cxx
-+++ b/src/CXX/Python3/cxx_extensions.cxx
-@@ -152,7 +152,7 @@ PyMethodDef *MethodTable::table()
- //================================================================================
- ExtensionModuleBase::ExtensionModuleBase( const char *name )
- : m_module_name( name )
--#if defined( Py_LIMITED_API )
-+#if defined( Py_LIMITED_API ) || (PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 12)
- , m_full_module_name( m_module_name )
- #else
- , m_full_module_name( __Py_PackageContext() != NULL ? std::string( __Py_PackageContext() ) : m_module_name )
-diff --git a/src/CXX/Python3/cxxextensions.c b/src/CXX/Python3/cxxextensions.c
-index 3b0f8ef7c588..afb9313ad0a8 100644
---- a/src/CXX/Python3/cxxextensions.c
-+++ b/src/CXX/Python3/cxxextensions.c
-@@ -42,6 +42,14 @@ extern "C"
- {
- #endif
-
-+#if PY_MAJOR_VERSION == 3 && PY_MINOR_VERSION >= 13
-+PyObject py_object_initializer =
-+ {
-+ { 1 },
-+ NULL // type must be init'ed by user
-+ };
-+
-+#else
- PyObject py_object_initializer =
- {
- _PyObject_EXTRA_INIT
-@@ -49,6 +57,8 @@ PyObject py_object_initializer =
- NULL // type must be init'ed by user
- };
-
-+#endif
-+
- #ifdef __cplusplus
- }
- #endif
-diff --git a/src/CXX/Version.hxx b/src/CXX/Version.hxx
-index e6069aad335e..59fe3c203b86 100644
---- a/src/CXX/Version.hxx
-+++ b/src/CXX/Version.hxx
-@@ -40,7 +40,7 @@
-
- #define PYCXX_VERSION_MAJOR 7
- #define PYCXX_VERSION_MINOR 1
--#define PYCXX_VERSION_PATCH 7
-+#define PYCXX_VERSION_PATCH 9
- #define PYCXX_MAKEVERSION( major, minor, patch ) ((major<<16)|(minor<<8)|(patch))
- #define PYCXX_VERSION PYCXX_MAKEVERSION( PYCXX_VERSION_MAJOR, PYCXX_VERSION_MINOR, PYCXX_VERSION_PATCH )
- #endif
diff --git a/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch b/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch
deleted file mode 100644
index 505862aa2bf1..000000000000
--- a/media-gfx/freecad/files/freecad-0.21.2-qtsvg-qt6.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From ac9a88c2c59a2d2002a7740a1597a05c819220e0 Mon Sep 17 00:00:00 2001
-From: wmayer <wmayer@users.sourceforge.net>
-Date: Sat, 20 Apr 2024 14:02:38 +0200
-Subject: [PATCH] PySide6: Fixes #13533: QSvgWidget is not a child of QtSvg in
- PySide6
-
-* Create a compatibility module QtSvgWidgets.py to handle PySide2 & PySide6
-* In the Arch and Material modules use the QtSvgWidgets module
-* Since Qt6 the method QFont.setWeight() doesn't accept an int any more but requires an enum. Since the call of QFont.setBold(True) sets
- a weight of 75 the extra calls of QFont.setWeight(75) can be safely removed
----
- cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake | 3 +++
- src/Mod/Arch/ArchPrecast.py | 8 ++++----
- src/Mod/Arch/ArchWindow.py | 4 ++--
- src/Mod/Arch/importIFClegacy.py | 1 -
- src/Mod/Draft/DraftGui.py | 1 -
- src/Mod/Material/MaterialEditor.py | 6 +++---
- 6 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
-index 0569c1fde9f2..fa872e287b59 100644
---- a/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
-+++ b/cMake/FreeCAD_Helpers/SetupShibokenAndPyside.cmake
-@@ -91,9 +91,12 @@ macro(SetupShibokenAndPyside)
- file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWidgets import *\n")
- if(PYSIDE_MAJOR_VERSION LESS 6)
- file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n")
-+ file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QGraphicsSvgItem\n"
-+ "from PySide${PYSIDE_MAJOR_VERSION}.QtSvg import QSvgWidget\n")
- else()
- file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtWebEngineWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineWidgets import *\n"
- "from PySide${PYSIDE_MAJOR_VERSION}.QtWebEngineCore import QWebEnginePage\n")
-+ file(WRITE ${CMAKE_BINARY_DIR}/Ext/PySide/QtSvgWidgets.py "from PySide${PYSIDE_MAJOR_VERSION}.QtSvgWidgets import *\n")
- endif()
- endif()
-
-diff --git a/src/Mod/Arch/ArchPrecast.py b/src/Mod/Arch/ArchPrecast.py
-index 7bb929b10e34..2f482902c1ce 100644
---- a/src/Mod/Arch/ArchPrecast.py
-+++ b/src/Mod/Arch/ArchPrecast.py
-@@ -777,14 +777,14 @@ class _PrecastTaskPanel:
- def __init__(self):
-
- import FreeCADGui
-- from PySide import QtCore,QtGui,QtSvg
-+ from PySide import QtCore,QtGui,QtSvgWidgets
- self.form = QtGui.QWidget()
- self.grid = QtGui.QGridLayout(self.form)
- self.PrecastTypes = ["Beam","I-Beam","Pillar","Panel","Slab","Stairs"]
- self.SlabTypes = ["Champagne","Hat"]
-
- # image display
-- self.preview = QtSvg.QSvgWidget(":/ui/ParametersBeam.svg")
-+ self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersBeam.svg")
- self.preview.setMaximumWidth(200)
- self.preview.setMinimumHeight(120)
- self.grid.addWidget(self.preview,0,0,1,2)
-@@ -1263,7 +1263,7 @@ class _DentsTaskPanel:
- def __init__(self):
-
- import FreeCADGui
-- from PySide import QtCore,QtGui,QtSvg
-+ from PySide import QtCore,QtGui,QtSvgWidgets
- self.form = QtGui.QWidget()
- self.grid = QtGui.QGridLayout(self.form)
- self.Rotations = ["N","S","E","O"]
-@@ -1282,7 +1282,7 @@ def __init__(self):
- self.grid.addWidget(self.buttonRemove,2,1,1,1)
-
- # image display
-- self.preview = QtSvg.QSvgWidget(":/ui/ParametersDent.svg")
-+ self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersDent.svg")
- self.preview.setMaximumWidth(200)
- self.preview.setMinimumHeight(120)
- self.grid.addWidget(self.preview,3,0,1,2)
-diff --git a/src/Mod/Arch/ArchWindow.py b/src/Mod/Arch/ArchWindow.py
-index f3c11c5e9c7a..dc9c84f9a8bf 100644
---- a/src/Mod/Arch/ArchWindow.py
-+++ b/src/Mod/Arch/ArchWindow.py
-@@ -34,7 +34,7 @@
-
- if FreeCAD.GuiUp:
- import FreeCADGui
-- from PySide import QtCore, QtGui, QtSvg
-+ from PySide import QtCore, QtGui, QtSvgWidgets
- from draftutils.translate import translate
- from PySide.QtCore import QT_TRANSLATE_NOOP
- import draftguitools.gui_trackers as DraftTrackers
-@@ -426,7 +426,7 @@ def taskbox(self):
- self.pic.hide()
-
- # SVG display
-- self.im = QtSvg.QSvgWidget(":/ui/ParametersWindowFixed.svg")
-+ self.im = QtSvgWidgets.QSvgWidget(":/ui/ParametersWindowFixed.svg")
- self.im.setMaximumWidth(200)
- self.im.setMinimumHeight(120)
- grid.addWidget(self.im,4,0,1,2)
-diff --git a/src/Mod/Arch/importIFClegacy.py b/src/Mod/Arch/importIFClegacy.py
-index 037e889ce5b9..256b29056b33 100644
---- a/src/Mod/Arch/importIFClegacy.py
-+++ b/src/Mod/Arch/importIFClegacy.py
-@@ -1795,7 +1795,6 @@ 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.setBold(True)
-
- #print(ifc.Entities)
-diff --git a/src/Mod/Draft/DraftGui.py b/src/Mod/Draft/DraftGui.py
-index c6e8584f4a71..2471bb66c61a 100644
---- a/src/Mod/Draft/DraftGui.py
-+++ b/src/Mod/Draft/DraftGui.py
-@@ -312,7 +312,6 @@ def setupToolBar(self,task=False):
- 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.setBold(True)
- self.cmdlabel.setFont(boldtxt)
-
-diff --git a/src/Mod/Material/MaterialEditor.py b/src/Mod/Material/MaterialEditor.py
-index cbcbde924609..28dbe83bc026 100644
---- a/src/Mod/Material/MaterialEditor.py
-+++ b/src/Mod/Material/MaterialEditor.py
-@@ -27,7 +27,7 @@
- import os
- from pathlib import PurePath
- import sys
--from PySide import QtCore, QtGui, QtSvg
-+from PySide import QtCore, QtGui, QtSvgWidgets
-
- import FreeCAD
- import FreeCADGui
-@@ -92,11 +92,11 @@ def __init__(self, obj=None, prop=None, material=None, card_path="", category="S
- treeView = widget.treeView
-
- # create preview svg slots
-- self.widget.PreviewRender = QtSvg.QSvgWidget(self.iconPath + "preview-rendered.svg")
-+ self.widget.PreviewRender = QtSvgWidgets.QSvgWidget(self.iconPath + "preview-rendered.svg")
- self.widget.PreviewRender.setMaximumWidth(64)
- self.widget.PreviewRender.setMinimumHeight(64)
- self.widget.topLayout.addWidget(self.widget.PreviewRender)
-- self.widget.PreviewVector = QtSvg.QSvgWidget(self.iconPath + "preview-vector.svg")
-+ self.widget.PreviewVector = QtSvgWidgets.QSvgWidget(self.iconPath + "preview-vector.svg")
- self.widget.PreviewVector.setMaximumWidth(64)
- self.widget.PreviewVector.setMinimumHeight(64)
- self.widget.topLayout.addWidget(self.widget.PreviewVector)
diff --git a/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch b/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch
deleted file mode 100644
index 8efd55121ee7..000000000000
--- a/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-https://bugs.gentoo.org/929973
---- a/src/Gui/PythonWrapper.cpp
-+++ b/src/Gui/PythonWrapper.cpp
-@@ -480,3 +480,3 @@
- return false;
-- types = Shiboken::Module::getTypes(requiredModule);
-+ types = reinterpret_cast<PyTypeObject **>(Shiboken::Module::getTypes(requiredModule));
- }
diff --git a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch b/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch
deleted file mode 100644
index b41e3618f55f..000000000000
--- a/media-gfx/freecad/files/freecad-0.21.2-vtk9.3-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-# fix for compiling with VTK 9.3
-https://github.com/FreeCAD/FreeCAD/pull/11496/commits/68d380a64e033c40fcb9a6dc322d9e0178de52ee
-Bug: https://forum.freecad.org/viewtopic.php?t=82814
-patch by adrianinsaval (commited in 68d380a64e033c40fcb9a6dc322d9e0178de52ee)
-
---- a/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
-+++ b/src/3rdParty/salomesmesh/inc/SMESH_SMDS.hxx
-@@ -39,10 +39,6 @@
- #define SMDS_EXPORT
- #endif
-
--#ifdef VTK_HAS_MTIME_TYPE
- #define VTK_MTIME_TYPE vtkMTimeType
--#else
--#define VTK_MTIME_TYPE unsigned long
--#endif
-
- #endif
---- a/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-+++ b/src/3rdParty/salomesmesh/src/SMDS/SMDS_UnstructuredGrid.cpp
-@@ -1026,7 +1026,12 @@ void SMDS_UnstructuredGrid::BuildLinks()
- GetLinks()->Allocate(this->GetNumberOfPoints());
- GetLinks()->Register(this);
- //FIXME: vtk9
-+#if VTK_VERSION_NUMBER < VTK_VERSION_CHECK(9,3,0)
- GetLinks()->BuildLinks(this);
-+#else
-+ GetLinks()->SetDataSet(this);
-+ GetLinks()->BuildLinks();
-+#endif
- GetLinks()->Delete();
- #else
- this->links = smds_celllinks::new();
diff --git a/media-gfx/freecad/freecad-0.21.2-r3.ebuild b/media-gfx/freecad/freecad-0.21.2-r3.ebuild
deleted file mode 100644
index 43dfed9aa139..000000000000
--- a/media-gfx/freecad/freecad-0.21.2-r3.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg
-
-DESCRIPTION="QT based Computer Aided Design application"
-HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"
-
-MY_PN=FreeCAD
-
-if [[ ${PV} = *9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
- S="${WORKDIR}/freecad-${PV}"
-else
- SRC_URI="https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64"
- S="${WORKDIR}/FreeCAD-${PV}"
-fi
-
-# code is licensed LGPL-2
-# examples are licensed CC-BY-SA (without note of specific version)
-LICENSE="LGPL-2 CC-BY-SA-4.0"
-SLOT="0"
-IUSE="debug designer +gui qt6 test"
-
-FREECAD_EXPERIMENTAL_MODULES="cloud netgen pcl"
-FREECAD_STABLE_MODULES="addonmgr fem idf image inspection material
- openscad part-design path points raytracing robot show surface
- techdraw tux"
-
-for module in ${FREECAD_STABLE_MODULES}; do
- IUSE="${IUSE} +${module}"
-done
-for module in ${FREECAD_EXPERIMENTAL_MODULES}; do
- IUSE="${IUSE} ${module}"
-done
-unset module
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ${PYTHON_DEPS}
- dev-libs/OpenNI2[opengl(+)]
- dev-libs/boost:=
- dev-libs/libfmt:=
- dev-libs/libspnav[X]
- dev-libs/xerces-c[icu]
- !qt6? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtnetwork:5
- dev-qt/qtxml:5
- dev-qt/qtxmlpatterns:5
- )
- qt6? (
- dev-qt/qtbase:6[concurrent,network,xml]
- )
- media-libs/freetype
- media-libs/qhull:=
- sci-libs/hdf5:=[fortran,zlib]
- >=sci-libs/med-4.0.0-r1
- <sci-libs/opencascade-7.8.0:=[json,vtk]
- sci-libs/orocos_kdl:=
- sys-libs/zlib
- virtual/libusb:1
- cloud? (
- dev-libs/openssl:=
- net-misc/curl
- )
- fem? (
- !qt6? ( sci-libs/vtk:=[qt5,rendering] )
- qt6? ( sci-libs/vtk:=[-qt5,qt6,rendering] )
- )
- gui? (
- >=media-libs/coin-4.0.0
- virtual/glu
- virtual/opengl
- !qt6? (
- dev-qt/designer:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtprintsupport:5
- dev-qt/qtsvg:5
- dev-qt/qtwebengine:5[widgets]
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- pcl? ( sci-libs/pcl[qt5] )
- $(python_gen_cond_dep '
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
- dev-python/pyside2:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
- dev-python/shiboken2:=[${PYTHON_USEDEP}]
- ' python3_{10..11} )
- )
- qt6? (
- sci-libs/opencascade[-inspector(-)]
- designer? ( dev-qt/qttools:6[designer] )
- dev-qt/qt5compat:6
- dev-qt/qttools:6[widgets]
- dev-qt/qtbase:6[gui,opengl,widgets]
- dev-qt/qtsvg:6
- dev-qt/qtwebengine:6[widgets]
- pcl? ( sci-libs/pcl[-qt5,qt6(-)] )
- $(python_gen_cond_dep '
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}]
- dev-python/pyside6:=[gui,svg,webchannel,webengine,${PYTHON_USEDEP}]
- dev-python/shiboken6:=[${PYTHON_USEDEP}]
- ' )
- )
- )
- netgen? ( media-gfx/netgen[opencascade] )
- openscad? ( media-gfx/openscad )
- pcl? ( sci-libs/pcl:=[opengl,openni2,vtk] )
- $(python_gen_cond_dep '
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- addonmgr? ( dev-python/gitpython[${PYTHON_USEDEP}] )
- fem? ( dev-python/ply[${PYTHON_USEDEP}] )
- ')
-"
-DEPEND="
- ${RDEPEND}
- >=dev-cpp/eigen-3.3.1:3
- test? (
- $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- !qt6? ( dev-qt/qttest:5 )
- )
-"
-BDEPEND="
- app-text/dos2unix
- dev-lang/swig
- test? (
- $(python_gen_cond_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
- !qt6? ( dev-qt/qttest:5 )
- )
-"
-
-# To get required dependencies:
-# 'grep REQUIRES_MODS cMake/FreeCAD_Helpers/CheckInterModuleDependencies.cmake'
-# We set the following requirements by default:
-# arch, draft, drawing, import, mesh, part, qt5, sketcher, spreadsheet, start, web.
-#
-# Additionally, we auto-enable mesh_part, flat_mesh and smesh
-# Fem actually needs smesh, but as long as we don't have a smesh package, we enable
-# smesh through the mesh USE flag. Note however, the fem<-smesh dependency isn't
-# reflected by the REQUIRES_MODS macro, but at
-# cMake/FreeCAD_Helpers/InitializeFreeCADBuildOptions.cmake:187.
-#
-# The increase in auto-enabled workbenches is due to their need in parts of the
-# test suite when compiled with a minimal set of USE flags.
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- designer? ( gui )
- inspection? ( points )
- path? ( robot )
- python_single_target_python3_12? ( gui? ( qt6 ) )
-"
-# There is no py3.12 support planned for pyside2
-
-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 )
-
-CHECKREQS_DISK_BUILD="2G"
-
-pkg_setup() {
- check-reqs_pkg_setup
- python-single-r1_pkg_setup
- [[ -z ${CASROOT} ]] && die "\${CASROOT} not set, please run eselect opencascade"
-}
-
-src_prepare() {
- # Fix desktop file
- sed -e 's/Exec=FreeCAD/Exec=freecad/' -i src/XDGData/org.freecadweb.FreeCAD.desktop || die
-
- find "${S}" -type f -exec dos2unix -q {} \; || die "failed to convert to unix line endings"
-
- if has_version ">=dev-python/shiboken6-6.7.0"; then
- # https://bugs.gentoo.org/929973
- eapply "${FILESDIR}/${PN}-0.21.2-shiboken-6.7.0.patch"
- fi
-
- if use qt6; then
- eapply "${FILESDIR}/${PN}-0.21.2-navcube-qt6.patch"
- eapply "${FILESDIR}/${PN}-0.21.2-qtsvg-qt6.patch"
- eapply "${FILESDIR}/${PN}-0.21.2-py312-qt6.patch"
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- # -Werror=odr, -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/875221
- # https://github.com/FreeCAD/FreeCAD/issues/13173
- filter-lto
-
- local mycmakeargs=(
- -DBUILD_ADDONMGR=$(usex addonmgr)
- -DBUILD_ARCH=ON
- -DBUILD_ASSEMBLY=OFF # deprecated
- -DBUILD_CLOUD=$(usex cloud)
- -DBUILD_COMPLETE=OFF # deprecated
- -DBUILD_DRAFT=ON
- -DBUILD_DESIGNER_PLUGIN=$(usex designer)
- -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for >=boost-1.77.0
- -DBUILD_FEM=$(usex fem)
- -DBUILD_FEM_NETGEN=$(usex netgen)
- -DBUILD_FLAT_MESH=ON
- -DBUILD_FORCE_DIRECTORY=ON # force building in a dedicated directory
- -DBUILD_FREETYPE=ON # automagic dep
- -DBUILD_GUI=$(usex gui)
- -DBUILD_IDF=$(usex idf)
- -DBUILD_IMAGE=$(usex image)
- -DBUILD_IMPORT=ON # import module for various file formats
- -DBUILD_INSPECTION=$(usex inspection)
- -DBUILD_JTREADER=OFF # code has been removed upstream, but option is still there
- -DBUILD_MATERIAL=$(usex material)
- -DBUILD_MESH=ON
- -DBUILD_MESH_PART=ON
- -DBUILD_OPENSCAD=$(usex openscad)
- -DBUILD_PART=ON
- -DBUILD_PART_DESIGN=$(usex part-design)
- -DBUILD_PATH=$(usex path)
- -DBUILD_POINTS=$(usex points)
- -DBUILD_RAYTRACING=$(usex raytracing)
- -DBUILD_REVERSEENGINEERING=OFF # currently only an empty sandbox
- -DBUILD_ROBOT=$(usex robot)
- -DBUILD_SHOW=$(usex show)
- -DBUILD_SKETCHER=ON # needed by draft workspace
- -DBUILD_SMESH=ON
- -DBUILD_SPREADSHEET=ON
- -DBUILD_START=ON
- -DBUILD_SURFACE=$(usex surface)
- -DBUILD_TECHDRAW=$(usex techdraw)
- -DBUILD_TEST=ON # always build test workbench for run-time testing
- -DBUILD_TUX=$(usex tux)
- -DBUILD_VR=OFF
- -DBUILD_WEB=ON # needed by start workspace
- -DBUILD_WITH_CONDA=OFF
-
- -DCMAKE_INSTALL_DATADIR=/usr/share/${PN}/data
- -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/${PF}
- -DCMAKE_INSTALL_INCLUDEDIR=/usr/include/${PN}
- -DCMAKE_INSTALL_PREFIX=/usr/$(get_libdir)/${PN}
-
- -DFREECAD_BUILD_DEBIAN=OFF
-
- -DFREECAD_USE_EXTERNAL_KDL=ON
- -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo
- -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree
- -DFREECAD_USE_FREETYPE=ON
- -DFREECAD_USE_OCC_VARIANT:STRING="Official Version"
- -DFREECAD_USE_PCL=$(usex pcl)
- -DFREECAD_USE_PYBIND11=ON
- -DFREECAD_USE_QT_FILEDIALOG=ON
- -DFREECAD_USE_QTWEBMODULE:STRING="Qt WebEngine"
-
- # install python modules to site-packages' dir. True only for the main package,
- # sub-packages will still be installed inside /usr/lib64/freecad
- -DINSTALL_TO_SITEPACKAGES=ON
-
- # Use the version of shiboken2 that matches the selected python version
- -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
- -DPython3_EXECUTABLE=${PYTHON}
- )
-
- if use debug; then
- # BUILD_SANDBOX currently broken, see
- # https://forum.freecadweb.org/viewtopic.php?f=4&t=36071&start=30#p504595
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=ON
- )
- else
- mycmakeargs+=(
- -DBUILD_SANDBOX=OFF
- -DBUILD_TEMPLATE=OFF
- )
- fi
-
- if use qt6; then
- mycmakeargs+=(
- -DFREECAD_QT_MAJOR_VERSION=6
- -DFREECAD_QT_VERSION=6
- -DQT_DEFAULT_MAJOR_VERSION=6
- -DQt6Core_MOC_EXECUTABLE="$(qt6_get_bindir)/moc"
- -DQt6Core_RCC_EXECUTABLE="$(qt6_get_bindir)/rcc"
- -DBUILD_QT5=OFF
- # Drawing module unmaintained and not ported to qt6
- -DBUILD_DRAWING=OFF
- )
- else
- mycmakeargs+=(
- -DFREECAD_QT_MAJOR_VERSION=5
- -DFREECAD_QT_VERSION=5
- -DQT_DEFAULT_MAJOR_VERSION=5
- -DQt5Core_MOC_EXECUTABLE="$(qt5_get_bindir)/moc"
- -DQt5Core_RCC_EXECUTABLE="$(qt5_get_bindir)/rcc"
- -DBUILD_QT5=ON
- # Drawing module unmaintained and not ported to qt6
- -DBUILD_DRAWING=ON
- )
- fi
-
- cmake_src_configure
-}
-
-# We use the FreeCADCmd binary instead of the FreeCAD binary here
-# for two reasons:
-# 1. It works out of the box with USE=-gui as well, not needing a guard
-# 2. We don't need virtualx.eclass and it's dependencies
-# The exported environment variables are needed, so freecad does know
-# where to save it's temporary files, and where to look and write it's
-# configuration. Without those, there are sandbox violation, when it
-# tries to create /var/lib/portage/home/.FreeCAD directory.
-src_test() {
- pushd "${BUILD_DIR}" > /dev/null || die
- export FREECAD_USER_HOME="${HOME}"
- export FREECAD_USER_DATA="${T}"
- export FREECAD_USER_TEMP="${T}"
- nonfatal ./bin/FreeCADCmd --run-test 0
- popd > /dev/null || die
-}
-
-src_install() {
- cmake_src_install
-
- dobin src/Tools/freecad-thumbnailer
-
- if use gui; then
- newbin - freecad <<- _EOF_
- #!/bin/sh
- # https://github.com/coin3d/coin/issues/451
- : \${QT_QPA_PLATFORM:=xcb}
- export QT_QPA_PLATFORM
- 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
- dosym -r /usr/$(get_libdir)/${PN}/bin/FreeCADCmd /usr/bin/freecadcmd
-
- rm -r "${ED}"/usr/$(get_libdir)/${PN}/include/E57Format || die "failed to drop unneeded include directory E57Format"
- use test && (rm -r "${ED}"/usr/include/${PN}/{gmock,gtest} || die)
-
- python_optimize "${ED}"/usr/share/${PN}/data/Mod/Start/StartPage "${ED}"/usr/$(get_libdir)/${PN}{/Ext,/Mod}/
- # compile main package in python site-packages as well
- python_optimize
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- einfo "You can load a lot of additional workbenches using the integrated"
- einfo "AddonManager."
-
- # ToDo: check opencv, pysolar (::science), elmerfem (::science)
- # ifc++, ifcopenshell, z88 (no pkgs), calculix-ccx (::waebbl)
- einfo "There are a lot of additional tools, for which FreeCAD has builtin"
- einfo "support. Some of them are available in Gentoo. Take a look at"
- einfo "https://wiki.freecadweb.org/Installing#External_software_supported_by_FreeCAD"
- optfeature_header "Computational utilities"
- optfeature "BLAS library" sci-libs/openblas
- optfeature "Statistical computation with Python" dev-python/pandas
- optfeature "Use scientific computation with Python" dev-python/scipy
- optfeature "Use symbolic math with Python" dev-python/sympy
- optfeature_header "Imaging, Plotting and Rendering utilities"
- optfeature "Dependency graphs" media-gfx/graphviz
- optfeature "PBR Rendering" media-gfx/povray
- optfeature_header "Import / Export"
- optfeature "Interact with git repositories" dev-python/gitpython
- optfeature "Work with COLLADA documents" dev-python/pycollada
- optfeature "YAML importer and emitter" dev-python/pyyaml
- optfeature "Importing and exporting 2D AutoCAD DWG files" media-gfx/libredwg
- optfeature "Importing and exporting geospatial data formats" sci-libs/gdal
- optfeature "Working with projection data" sci-libs/proj
- optfeature_header "Meshing and FEM"
- optfeature "FEM mesh generator" sci-libs/gmsh
- optfeature "Triangulating meshes" sci-libs/gts
- optfeature "Visualization" sci-visualization/paraview
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}