commit: c83045924d872c14c684ea0bae88a49bec3cdcac Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> AuthorDate: Sat Mar 9 10:04:03 2024 +0000 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org> CommitDate: Sat Mar 9 10:16:10 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8304592
media-gfx/freecad: fix build with qt6 - Drawing module is unmaintained and not ported to qt6. - With the shiboken6 fix from b6bfb7ce52d2f05ed2deda2aa94bf46e51d56844 it now compiles successfully. - Sync the 9999 ebuild - Add yaml-cpp dep to 9999 ebuild Closes: https://bugs.gentoo.org/920579 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org> .../{freecad-0.21.2-r1.ebuild => freecad-0.21.2-r2.ebuild} | 11 ++++++----- media-gfx/freecad/freecad-9999.ebuild | 11 ++++++++--- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/media-gfx/freecad/freecad-0.21.2-r1.ebuild b/media-gfx/freecad/freecad-0.21.2-r2.ebuild similarity index 98% rename from media-gfx/freecad/freecad-0.21.2-r1.ebuild rename to media-gfx/freecad/freecad-0.21.2-r2.ebuild index 3df16ee39b5c..6f67542fe86c 100644 --- a/media-gfx/freecad/freecad-0.21.2-r1.ebuild +++ b/media-gfx/freecad/freecad-0.21.2-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit check-reqs cmake optfeature python-single-r1 qmake-utils xdg @@ -59,7 +59,6 @@ RDEPEND=" ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] - dev-qt/qt5compat:6 ) media-libs/freetype media-libs/qhull:= @@ -100,6 +99,7 @@ RDEPEND=" ) qt6? ( 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 @@ -158,9 +158,7 @@ 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 @@ -195,7 +193,6 @@ src_configure() { -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_DRAWING=ON -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for >=boost-1.77.0 -DBUILD_FEM=$(usex fem) -DBUILD_FEM_NETGEN=$(usex netgen) @@ -280,6 +277,8 @@ src_configure() { -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+=( @@ -289,6 +288,8 @@ src_configure() { -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 diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index e9f4f85bd609..05acf4426854 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -45,6 +45,7 @@ RESTRICT="!test? ( test )" RDEPEND=" ${PYTHON_DEPS} + dev-cpp/yaml-cpp dev-libs/OpenNI2[opengl(+)] dev-libs/boost:= dev-libs/libfmt:= @@ -59,7 +60,6 @@ RDEPEND=" ) qt6? ( dev-qt/qtbase:6[concurrent,network,xml] - dev-qt/qt5compat:6 ) media-libs/freetype media-libs/qhull:= @@ -99,7 +99,9 @@ RDEPEND=" ' python3_{10..11} ) ) qt6? ( - dev-qt/qttools:6[designer] + 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] @@ -195,7 +197,6 @@ src_configure() { -DBUILD_COMPLETE=OFF # deprecated -DBUILD_DRAFT=ON -DBUILD_DESIGNER_PLUGIN=$(usex designer) - -DBUILD_DRAWING=ON -DBUILD_ENABLE_CXX_STD:STRING="C++17" # needed for current git master -DBUILD_FEM=$(usex fem) -DBUILD_FEM_NETGEN=$(usex netgen) @@ -280,6 +281,8 @@ src_configure() { -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+=( @@ -289,6 +292,8 @@ src_configure() { -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
