commit: a84dba9ab4e4719de1398d4a7e692fdecedfb6ac Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon Sep 29 15:30:55 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 3 00:34:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a84dba9a
media-gfx/freecad: add 1.0.2 replace ccache patch with cmake option update pybind dep Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/43984 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/freecad/Manifest | 2 ++ media-gfx/freecad/freecad-1.0.1.ebuild | 3 ++- .../{freecad-1.0.1.ebuild => freecad-1.0.2.ebuild} | 30 ++++++++++++---------- media-gfx/freecad/freecad-9999.ebuild | 23 ++++++++++------- 4 files changed, 35 insertions(+), 23 deletions(-) diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index c371ec6f757f..743f7cc496b8 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -1,5 +1,7 @@ DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db DIST freecad-1.0.1.tar.gz 91625067 BLAKE2B 059246ba4f9424fbd6f01455975cd4413660239cd2553ec7f685aa84dec47fddcdffd90269996a877ae44df460c75d345300872a179ffa0f149cb748b17444c0 SHA512 69a82c0af45137079b1ce184a4a3df475c005da66b4a4cab17371a1f62432b13f721e3da8b350b3ad50125c939cdfa5fed477e0605d52bd8fcee3c528931a185 +DIST freecad-1.0.2.tar.gz 91635756 BLAKE2B d71e356ad64ff1dd9a6433752dd1ae71e981a7711494a5e8e9fc79e467da70c1cd2a9d2fa8a8be61785cc6132f5e3c8d34a26ac6102ee9ac7a3baacb90df792e SHA512 927cf3a4784c99f7e3e9ce45b8ef7a035f4772cc360b4cbb4b537806cd4218b193938129a4c1d1ba7f67a6ac351d718bddb65879cafbcbcd27c14cf7af322c20 DIST freecad-18423.patch 3094 BLAKE2B a5f4d1b7767e14ae61052348d57fcdaa4f73d2356daea1d2b89b3629faf92aadc1b1fd5c94443f1a5cc9917cf2026a19c28de990506b8da5886863354e581dc9 SHA512 a4dec8c9e6ac489c81cf7d4b81090614880a94664a0844c2ceab472fd410364aab555287f3233c965791d9fbf72f6faa36645910cc0f8bfcb9fa1d34c29f6a69 DIST freecad-20710.patch 902 BLAKE2B ce69e5714c06e969bd533c54be9f7de0c23fc881a5259979c444aecc1f5cbb175b01c7a61bf3ebc35e0eeb7f9aabfba729499e449cbf2a06055df6aecc8465cd SHA512 1df1b0941d1ccbf9aef0f882cd17e647448acb9267a2fae503b4427b80620374e5d4e1a1bb651fab8b631db3ff4d53748951d75e244a9ffddda817b6d4971a84 +DIST freecad-21433.patch 1151 BLAKE2B 88945020844ba6df0b5ae70a6e889191886165e21711c021c56a8902a881aeebca1974d12a92e0f3c45ba354221acc2c65ffd84b0cb2055aa307f693a0b8f235 SHA512 2b28cabb53fa0d2bc8ee2fab9b5672c225baff20705731c89491f0b2c89877e31c3b622396ecdcf806208b6c7bacb231ad635681183ece14f4102def96381493 DIST freecad-22221.patch 7118 BLAKE2B b8432e7eafe265fda739a94eb0d6a2e644afe510e79fc1bed46d09defe5fdbb57d6bef206e292fa912b6a34242ecdb14c1fe5d8c3ebfc74330d8b4e0042fdb39 SHA512 23f914b27f28fe72829a31b8d646fcdc2241c3541a5d13eab34a7acbc88bdbbe2b7447aa6e0768a98dcb72c61f802aab5efbdd194b4d6db3997475231aad71f9 diff --git a/media-gfx/freecad/freecad-1.0.1.ebuild b/media-gfx/freecad/freecad-1.0.1.ebuild index 6f7b2c9d695d..e4e2b2a57315 100644 --- a/media-gfx/freecad/freecad-1.0.1.ebuild +++ b/media-gfx/freecad/freecad-1.0.1.ebuild @@ -137,7 +137,6 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch - "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch "${FILESDIR}"/${PN}-1.0.1-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch "${DISTDIR}/${PN}-20710.patch" # DESTDIR in env "${DISTDIR}/${PN}-22221.patch" # vtk-9.5 @@ -284,6 +283,8 @@ src_configure() { fi local mycmakeargs=( + -DFREECAD_USE_CCACHE="no" # Do not use CCache + -DCMAKE_POLICY_DEFAULT_CMP0144="OLD" # FLANN_ROOT -DCMAKE_POLICY_DEFAULT_CMP0167="OLD" # FindBoost -DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command diff --git a/media-gfx/freecad/freecad-1.0.1.ebuild b/media-gfx/freecad/freecad-1.0.2.ebuild similarity index 95% copy from media-gfx/freecad/freecad-1.0.1.ebuild copy to media-gfx/freecad/freecad-1.0.2.ebuild index 6f7b2c9d695d..a3f8aae46261 100644 --- a/media-gfx/freecad/freecad-1.0.1.ebuild +++ b/media-gfx/freecad/freecad-1.0.2.ebuild @@ -25,9 +25,9 @@ else SRC_URI=" https://github.com/${MY_PN}/${MY_PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz https://github.com/FreeCAD/FreeCAD/commit/d91b3e051789623f0bc1eff65947c361e7a661d0.patch -> ${PN}-20710.patch - https://github.com/FreeCAD/FreeCAD/commit/3d2b7dc9c7ac898b30fe469b7cbd424ed1bca0a2.patch -> ${PN}-22221.patch + https://github.com/FreeCAD/FreeCAD/commit/9ea0f32692e13eee85b1e74bd42514942d357906.patch -> ${PN}-21433.patch " - KEYWORDS="amd64" + KEYWORDS="~amd64" S="${WORKDIR}/FreeCAD-${PV}" fi @@ -74,7 +74,7 @@ RDEPEND=" sys-libs/zlib $(python_gen_cond_dep ' dev-python/numpy[${PYTHON_USEDEP}] - <dev-python/pybind11-3[${PYTHON_USEDEP}] + dev-python/pybind11[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] ') assembly? ( sci-libs/ondselsolver ) @@ -108,7 +108,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.3.1:3 + <dev-cpp/eigen-5:= dev-cpp/ms-gsl test? ( $(python_gen_impl_dep '-debug') @@ -137,10 +137,9 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.0.0-r1-Gentoo-specific-don-t-check-vcs.patch - "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch "${FILESDIR}"/${PN}-1.0.1-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch "${DISTDIR}/${PN}-20710.patch" # DESTDIR in env - "${DISTDIR}/${PN}-22221.patch" # vtk-9.5 + "${DISTDIR}/${PN}-21433.patch" # FindHDF5 fails to find HDF5 after a failing pkg_search_module ) DOCS=( CODE_OF_CONDUCT.md README.md ) @@ -263,12 +262,11 @@ src_prepare() { # deprecated in python-3.11 removed in python-3.13 sed -e '/import imghdr/d' -i src/Mod/CAM/CAMTests/TestCAMSanity.py || die - cmake_src_prepare + # The PCL point_traits.h header was renamed (and deprecated) since 1.11.0 and removed in 1.15.0. + # d9e731ca94abc14808ebeed208617116f6d5ea4a + sed -e 's#pcl/point_traits.h#pcl/type_traits.h#g' -i src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp || die - if ! grep -q TKExpress cMake/FindOCC.cmake ; then - eqawarn "Applying opencascade-7.9.0 patch" - eapply -l "${FILESDIR}/${PN}-1.0.1-opencascade-7.9.0.patch" - fi + cmake_src_prepare } src_configure() { @@ -284,6 +282,8 @@ src_configure() { fi local mycmakeargs=( + -DFREECAD_USE_CCACHE="no" # Do not use CCache + -DCMAKE_POLICY_DEFAULT_CMP0144="OLD" # FLANN_ROOT -DCMAKE_POLICY_DEFAULT_CMP0167="OLD" # FindBoost -DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command @@ -345,7 +345,7 @@ src_configure() { -DFREECAD_BUILD_DEBIAN=OFF -DFREECAD_USE_EXTERNAL_E57FORMAT="no" - -DFREECAD_USE_EXTERNAL_GTEST="yes" + -DFREECAD_USE_EXTERNAL_GTEST="$(usex test)" -DFREECAD_USE_EXTERNAL_ONDSELSOLVER=$(usex assembly) -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree @@ -368,7 +368,7 @@ src_configure() { if [[ ${PV} == *9999* ]]; then mycmakeargs+=( - -DENABLE_DEVELOPER_TESTS=ON + -DENABLE_DEVELOPER_TESTS="$(usex test)" -DPACKAGE_WCREF="%{release} (Git)" -DPACKAGE_WCURL="git://github.com/FreeCAD/FreeCAD.git main" @@ -457,6 +457,10 @@ src_test() { ) fi + local -x CMAKE_SKIP_TESTS=( + "^ConstraintPointsAccess." + ) + local -x FREECAD_USER_HOME="${HOME}" local -x FREECAD_USER_DATA="${T}/data" local -x FREECAD_USER_TEMP="${T}/temp" diff --git a/media-gfx/freecad/freecad-9999.ebuild b/media-gfx/freecad/freecad-9999.ebuild index 61ae246d1eb1..38922248e20b 100644 --- a/media-gfx/freecad/freecad-9999.ebuild +++ b/media-gfx/freecad/freecad-9999.ebuild @@ -106,7 +106,7 @@ RDEPEND=" ) " DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.3.1:3 + <dev-cpp/eigen-5:= dev-cpp/ms-gsl test? ( $(python_gen_impl_dep '-debug') @@ -135,9 +135,9 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-9999-Gentoo-specific-don-t-check-vcs.patch - "${FILESDIR}"/${PN}-0.21.0-0001-Gentoo-specific-disable-ccache-usage.patch "${FILESDIR}"/${PN}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch "${FILESDIR}/${PN}-1.0.0-r4-error-cannot-convert-bool-to-App-DocumentInitFlags.patch" + "${FILESDIR}/${PN}-1.0.2-pybind11-latent-slots-macro-conflicts-with-Qt.patch" # fixed in pybind-3.0.1 ) DOCS=( CODE_OF_CONDUCT.md README.md ) @@ -260,16 +260,15 @@ src_prepare() { # deprecated in python-3.11 removed in python-3.13 sed -e '/import imghdr/d' -i src/Mod/CAM/CAMTests/TestCAMSanity.py || die + # The PCL point_traits.h header was renamed (and deprecated) since 1.11.0 and removed in 1.15.0. + # d9e731ca94abc14808ebeed208617116f6d5ea4a + sed -e 's#pcl/point_traits.h#pcl/type_traits.h#g' -i src/Mod/ReverseEngineering/App/SurfaceTriangulation.cpp || die + # band-aid fix for botched version check, needs to be revisited for VTK-10 sed -e 's/vtkVersion.GetVTKMajorVersion() > 9/vtkVersion.GetVTKMajorVersion() >= 9/g' \ -i src/Mod/Fem/femguiutils/data_extraction.py || die cmake_src_prepare - - if ! grep -q TKExpress cMake/FindOCC.cmake ; then - eqawarn "Applying opencascade-7.9.0 patch" - eapply -l "${FILESDIR}/${PN}-1.0.1-opencascade-7.9.0.patch" - fi } src_configure() { @@ -285,6 +284,8 @@ src_configure() { fi local mycmakeargs=( + -DFREECAD_USE_CCACHE="no" # Do not use CCache + -DCMAKE_POLICY_DEFAULT_CMP0144="OLD" # FLANN_ROOT -DCMAKE_POLICY_DEFAULT_CMP0167="OLD" # FindBoost -DCMAKE_POLICY_DEFAULT_CMP0175="OLD" # add_custom_command @@ -346,7 +347,7 @@ src_configure() { -DFREECAD_BUILD_DEBIAN=OFF -DFREECAD_USE_EXTERNAL_E57FORMAT="no" - -DFREECAD_USE_EXTERNAL_GTEST="yes" + -DFREECAD_USE_EXTERNAL_GTEST="$(usex test)" -DFREECAD_USE_EXTERNAL_ONDSELSOLVER=$(usex assembly) -DFREECAD_USE_EXTERNAL_SMESH=OFF # no package in Gentoo -DFREECAD_USE_EXTERNAL_ZIPIOS=OFF # doesn't work yet, also no package in Gentoo tree @@ -369,7 +370,7 @@ src_configure() { if [[ ${PV} == *9999* ]]; then mycmakeargs+=( - -DENABLE_DEVELOPER_TESTS=ON + -DENABLE_DEVELOPER_TESTS="$(usex test)" -DPACKAGE_WCREF="%{release} (Git)" -DPACKAGE_WCURL="git://github.com/FreeCAD/FreeCAD.git main" @@ -458,6 +459,10 @@ src_test() { ) fi + local -x CMAKE_SKIP_TESTS=( + "^ConstraintPointsAccess." + ) + local -x FREECAD_USER_HOME="${HOME}" local -x FREECAD_USER_DATA="${T}/data" local -x FREECAD_USER_TEMP="${T}/temp"
