commit: c86e509eb676155b7929bab793d5d84757c93329 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Sep 16 13:12:07 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Sep 16 13:13:53 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c86e509e
app-arch/innoextract: fix build w/ boost-1.89.0 Closes: https://bugs.gentoo.org/962944 Signed-off-by: Sam James <sam <AT> gentoo.org> .../innoextract-1.10_pre20250206-boost-1.89.patch | 37 ++++++++++++++++++ .../innoextract-1.10_pre20250206-r1.ebuild | 44 ++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/app-arch/innoextract/files/innoextract-1.10_pre20250206-boost-1.89.patch b/app-arch/innoextract/files/innoextract-1.10_pre20250206-boost-1.89.patch new file mode 100644 index 000000000000..2b7e38e6d85a --- /dev/null +++ b/app-arch/innoextract/files/innoextract-1.10_pre20250206-boost-1.89.patch @@ -0,0 +1,37 @@ +https://bugs.gentoo.org/962944 +https://github.com/dscharrer/innoextract/pull/199 + +From 882796e0e9b134b02deeaae4bbfe92920adb6fe2 Mon Sep 17 00:00:00 2001 +From: Michael Cho <[email protected]> +Date: Mon, 11 Aug 2025 12:06:17 -0400 +Subject: [PATCH] CMake: Fix build with Boost 1.89.0 + +--- + CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 69956105..dbbe0d34 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,13 +173,17 @@ else() + set(INNOEXTRACT_HAVE_LZMA 0) + endif() + +-find_package(Boost REQUIRED COMPONENTS ++set(BOOST_REQUIRED_COMPONENTS + iostreams + filesystem + date_time +- system + program_options + ) ++find_package(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) ++if(Boost_MAJOR_VERSION EQUAL 1 AND Boost_MINOR_VERSION LESS 69) ++ list(APPEND BOOST_REQUIRED_COMPONENTS system) ++ find_package(Boost REQUIRED COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) ++endif() + list(APPEND LIBRARIES ${Boost_LIBRARIES}) + link_directories(${Boost_LIBRARY_DIRS}) + include_directories(SYSTEM ${Boost_INCLUDE_DIR}) + diff --git a/app-arch/innoextract/innoextract-1.10_pre20250206-r1.ebuild b/app-arch/innoextract/innoextract-1.10_pre20250206-r1.ebuild new file mode 100644 index 000000000000..71d0c098195c --- /dev/null +++ b/app-arch/innoextract/innoextract-1.10_pre20250206-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +COMMIT="6e9e34ed0876014fdb46e684103ef8c3605e382e" +DESCRIPTION="A tool to unpack installers created by Inno Setup" +HOMEPAGE="https://constexpr.org/innoextract/"; +SRC_URI="https://github.com/dscharrer/innoextract/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN}-${COMMIT}" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~m68k ~ppc64 ~x86" +IUSE="debug +iconv +lzma test" +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/boost:=[bzip2,zlib] + iconv? ( virtual/libiconv ) + lzma? ( app-arch/xz-utils ) +" +DEPEND=" + ${RDEPEND} +" + +PATCHES=( + "${FILESDIR}/${PN}-1.9-fix-linkage.patch" + "${FILESDIR}/${PN}-1.10_pre20250206-boost-1.89.patch" +) + +src_configure() { + local mycmakeargs=( + -DBUILD_TESTS=$(usex test) + -DDEBUG=$(usex debug) + -DSET_OPTIMIZATION_FLAGS=OFF + -DSTRICT_USE=ON + -DUSE_LZMA=$(usex lzma) + -DWITH_CONV=$(usex iconv iconv builtin) + ) + cmake_src_configure +}
