commit: cfa137c480567626dd5c6ac8856772af26f1f6bb Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Thu May 1 19:30:42 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 8 06:26:46 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfa137c4
media-gfx/freecad: 1.0.0-r3 #953399 #940524 #952988 Closes: https://bugs.gentoo.org/953399 Closes: https://bugs.gentoo.org/940524 Closes: https://bugs.gentoo.org/952988 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/41967 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/freecad/Manifest | 1 + media-gfx/freecad/freecad-1.0.0-r3.ebuild | 30 ++++++++++++++++++++++-------- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 6c17cf764fe5..6466fc004001 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -1 +1,2 @@ DIST freecad-1.0.0.tar.gz 91599325 BLAKE2B 65540eb42e7d508456c9edbf2122e0f288708c33e6d00d3c8c45550e7a614f658f91ba25978a66819bc094b7138aab72a89c0172d0841be1ff798ade5a8bdc64 SHA512 afc1079ea04fd5bb8135f8ad1012d9e4e05c8839dd0a4e00253eada58fe018f445c1200d1ca7ac9f268644c946cbf55b7b313dc3d6bd010f9da3a3334103b7db +DIST freecad-20710.patch 902 BLAKE2B ce69e5714c06e969bd533c54be9f7de0c23fc881a5259979c444aecc1f5cbb175b01c7a61bf3ebc35e0eeb7f9aabfba729499e449cbf2a06055df6aecc8465cd SHA512 1df1b0941d1ccbf9aef0f882cd17e647448acb9267a2fae503b4427b80620374e5d4e1a1bb651fab8b631db3ff4d53748951d75e244a9ffddda817b6d4971a84 diff --git a/media-gfx/freecad/freecad-1.0.0-r3.ebuild b/media-gfx/freecad/freecad-1.0.0-r3.ebuild index 3460ebcd8d63..b8a807f7fdd8 100644 --- a/media-gfx/freecad/freecad-1.0.0-r3.ebuild +++ b/media-gfx/freecad/freecad-1.0.0-r3.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{11..12} ) -inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils xdg +inherit check-reqs cmake flag-o-matic optfeature python-single-r1 qmake-utils toolchain-funcs xdg DESCRIPTION="Qt based Computer Aided Design application" HOMEPAGE="https://www.freecad.org/ https://github.com/FreeCAD/FreeCAD"; @@ -17,7 +17,10 @@ if [[ ${PV} == *9999* ]]; then 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" + 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 + " KEYWORDS="~amd64" S="${WORKDIR}/FreeCAD-${PV}" fi @@ -84,7 +87,6 @@ RDEPEND=" dev-python/matplotlib[${PYTHON_USEDEP}] >=dev-python/pivy-0.6.5[${PYTHON_USEDEP}] dev-python/pyside:6=[uitools(-),gui,svg,${PYTHON_USEDEP}] - ' ) virtual/glu virtual/opengl @@ -112,6 +114,7 @@ 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}-9999-tests-src-Qt-only-build-test-for-BUILD_GUI-ON.patch + "${DISTDIR}/${PN}-20710.patch" # DESTDIR in env ) DOCS=( CODE_OF_CONDUCT.md README.md ) @@ -137,7 +140,9 @@ src_configure() { filter-lto # Fix building tests - append-ldflags -Wl,--copy-dt-needed-entries + if ! tc-ld-is-mold; then # 940524 + append-ldflags -Wl,--copy-dt-needed-entries + fi local mycmakeargs=( -DBUILD_DESIGNER_PLUGIN=$(usex designer) @@ -205,7 +210,7 @@ src_configure() { # 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 + # Use the version of pyside[tools] that matches the selected python version -DPYTHON_CONFIG_SUFFIX="-${EPYTHON}" -DPython3_EXECUTABLE=${PYTHON} ) @@ -251,6 +256,9 @@ src_configure() { src_test() { cd "${BUILD_DIR}" || die + # No module named 'ifcopenshell' #940465 + rm "${BUILD_DIR}/Mod/BIM/nativeifc/ifc_performance_test.py" || die + local -x FREECAD_USER_HOME="${HOME}" local -x FREECAD_USER_DATA="${T}" local -x FREECAD_USER_TEMP="${T}" @@ -260,7 +268,13 @@ src_test() { src_install() { cmake_src_install - dobin src/Tools/freecad-thumbnailer + if [[ -f src/Tools/freecad-thumbnailer ]]; then + dobin src/Tools/freecad-thumbnailer + fi + + if [[ -f freecad-thumbnailer ]]; then + dobin freecad-thumbnailer + fi if use gui; then newbin - freecad <<- _EOF_
