[gentoo-commits] repo/gentoo:master commit in: media-gfx/freecad/, media-gfx/freecad/files/

["Andrew Ammerlaan" <andrewammerlaan@gentoo.org>]

commit:     91f702aa09d2fd99e78bb974ae80440daf8dc74b
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 08:53:53 2024 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 08:53:53 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f702aa

media-gfx/freecad: add patch for build with shiboken 6.7.0

patch is added conditional because not sure what this does with older shiboken

and block against opencascade[inspector] which breaks qt6 configure

Bug: https://bugs.gentoo.org/929973
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch | 8 ++++++++
 media-gfx/freecad/freecad-0.21.2-r2.ebuild                  | 6 ++++++
 2 files changed, 14 insertions(+)

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
new file mode 100644
index 000000000000..8efd55121ee7
--- /dev/null
+++ b/media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch
@@ -0,0 +1,8 @@
+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/freecad-0.21.2-r2.ebuild b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
index f0c0f0c47bbb..33eb615da690 100644
--- a/media-gfx/freecad/freecad-0.21.2-r2.ebuild
+++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild
@@ -98,6 +98,7 @@ RDEPEND="
 			' python3_{10..11} )
 		)
 		qt6? (
+			sci-libs/opencascade[-inspector(-)]
 			designer? ( dev-qt/qttools:6[designer] )
 			dev-qt/qt5compat:6
 			dev-qt/qttools:6[widgets]
@@ -181,6 +182,11 @@ src_prepare() {
 
 	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
+
 	cmake_src_prepare
 }