commit: 524d592e44f173eb612e7e85a8dc2fece7e88171 Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Oct 17 12:45:04 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 17 13:50:01 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=524d592e
media-libs/lib3mf: fix build with cmake-4.1.2 Closes: https://bugs.gentoo.org/963834 Closes: https://bugs.gentoo.org/957488 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44221 Signed-off-by: Sam James <sam <AT> gentoo.org> .../lib3mf/{lib3mf-2.4.1.ebuild => lib3mf-2.4.1-r1.ebuild} | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/media-libs/lib3mf/lib3mf-2.4.1.ebuild b/media-libs/lib3mf/lib3mf-2.4.1-r1.ebuild similarity index 87% rename from media-libs/lib3mf/lib3mf-2.4.1.ebuild rename to media-libs/lib3mf/lib3mf-2.4.1-r1.ebuild index ca1502d24d0c..dfc3374bac7b 100644 --- a/media-libs/lib3mf/lib3mf-2.4.1.ebuild +++ b/media-libs/lib3mf/lib3mf-2.4.1-r1.ebuild @@ -7,7 +7,9 @@ inherit cmake DESCRIPTION="Implementation of the 3D Manufacturing Format file standard" HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"; -SRC_URI="https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +SRC_URI=" + https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz +" LICENSE="BSD" SLOT="0/2" @@ -29,7 +31,6 @@ BDEPEND=" dev-debug/valgrind ) " - PATCHES=( "${FILESDIR}/${PN}-2.4.1-cmake_minimum_version-3.10.patch" "${FILESDIR}/${PN}-2.4.1-remove-std-and-opt-flags.patch" @@ -37,15 +38,18 @@ PATCHES=( ) src_prepare() { - cmake_src_prepare - # DO NOT WANT! rm -r Libraries/libressl || die + + # DO NOT WANT! + rm -r SDK || die + + cmake_src_prepare } src_configure() { local mycmakeargs=( - -DCMAKE_INSTALL_INCLUDEDIR="include/${PN}" + -DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/${PN}" -DLIB3MF_TESTS=$(usex test) -DUSE_INCLUDED_LIBZIP=OFF -DUSE_INCLUDED_ZLIB=OFF
