commit: 5a345e202892c9358921d7a70cd54624bf17e42c Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Mon Mar 25 18:10:59 2024 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Mar 25 18:54:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a345e20
media-gfx/prusaslicer: fix build with opencascade-7.8.0 Closes: https://bugs.gentoo.org/927774 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/prusaslicer-2.7.2-opencascade-7.8.0.patch | 18 ++++++++++++++++++ media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild | 6 +++++- media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild | 4 ++++ media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild | 4 ++++ 4 files changed, 31 insertions(+), 1 deletion(-) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch new file mode 100644 index 000000000000..3c97ead5c6b2 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch @@ -0,0 +1,18 @@ +diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt +index d8dd8e1..d27055f 100644 +--- a/src/occt_wrapper/CMakeLists.txt ++++ b/src/occt_wrapper/CMakeLists.txt +@@ -22,11 +22,8 @@ generate_export_header(OCCTWrapper) + find_package(OpenCASCADE REQUIRED) + + set(OCCT_LIBS +- TKXDESTEP +- TKSTEP +- TKSTEP209 +- TKSTEPAttr +- TKSTEPBase ++ TKDESTEP ++ TKDESTL + TKXCAF + TKXSBase + TKVCAF diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild index 4908a2557257..c2fcc93980c9 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -59,6 +59,10 @@ PATCHES=( S="${WORKDIR}/${MY_PN}-version_${MY_PV}" src_prepare() { + if has_version ">=sci-libs/opencascade-7.8.0"; then + eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch" + fi + sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild index 52f7bd2d1548..e835e7b55b23 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild @@ -59,6 +59,10 @@ PATCHES=( S="${WORKDIR}/${MY_PN}-version_${MY_PV}" src_prepare() { + if has_version ">=sci-libs/opencascade-7.8.0"; then + eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch" + fi + sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \ diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild index 2a926a3e0102..53be447d2fa0 100644 --- a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild +++ b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild @@ -59,6 +59,10 @@ PATCHES=( S="${WORKDIR}/${MY_PN}-version_${MY_PV}" src_prepare() { + if has_version ">=sci-libs/opencascade-7.8.0"; then + eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch" + fi + sed -i -e 's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g' version.inc || die sed -i -e 's/find_package(OpenCASCADE 7.6.2 REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
