diff options
| author |   Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-04-14 10:53:53 +0200 |
|---|---|---|
| committer | Andrew Ammerlaan <andrewammerlaan@gentoo.org> | 2024-04-14 10:53:53 +0200 |
| commit | 91f702aa09d2fd99e78bb974ae80440daf8dc74b (patch) | |
| tree | da31d8f4636d6bd12d6fd5a1579beb86d4e5bf30 /media-gfx/freecad | |
| parent | dev-java/junit: add 5.10.2 (diff) | |
| download | gentoo-91f702aa09d2fd99e78bb974ae80440daf8dc74b.tar.gz gentoo-91f702aa09d2fd99e78bb974ae80440daf8dc74b.tar.bz2 gentoo-91f702aa09d2fd99e78bb974ae80440daf8dc74b.zip | |
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@gentoo.org>
Diffstat (limited to 'media-gfx/freecad')
| -rw-r--r-- | media-gfx/freecad/files/freecad-0.21.2-shiboken-6.7.0.patch | 8 | ||||
| -rw-r--r-- | media-gfx/freecad/freecad-0.21.2-r2.ebuild | 6 |
2 files changed, 14 insertions, 0 deletions
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 } |