commit: b7f20e87f626612e2ba08f133d1592075e02ed65 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Jan 7 16:31:17 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Jan 7 19:15:51 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f20e87
media-gfx/openscad: Fix build w/ boost-1.89 Closes: https://bugs.gentoo.org/967652 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/openscad-2025.05.01_pre-boost-1.89.patch | 31 ++++++++++++++++++++++ .../openscad/openscad-2025.05.01_pre-r1.ebuild | 8 +++--- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/media-gfx/openscad/files/openscad-2025.05.01_pre-boost-1.89.patch b/media-gfx/openscad/files/openscad-2025.05.01_pre-boost-1.89.patch new file mode 100644 index 000000000000..9294eb636d32 --- /dev/null +++ b/media-gfx/openscad/files/openscad-2025.05.01_pre-boost-1.89.patch @@ -0,0 +1,31 @@ +From 6afea6fcab08e2cfefffef04e26ce9068b53b37c Mon Sep 17 00:00:00 2001 +From: Marius Kintel <[email protected]> +Date: Mon, 18 Aug 2025 21:55:18 -0400 +Subject: [PATCH] Boost system is not longer in use (#6110) + +--- + CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 48fc74ce6a4..89ef6f49070 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -336,7 +336,7 @@ if (MSVC) + message(STATUS "Eigen: ${Eigen3_VERSION}") + + set(Boost_USE_STATIC_LIBS TRUE) +- find_package(Boost 1.61 REQUIRED COMPONENTS system regex program_options) ++ find_package(Boost 1.70 REQUIRED COMPONENTS regex program_options) + message(STATUS "Boost: ${Boost_VERSION}") + target_include_directories(OpenSCAD SYSTEM PRIVATE ${Boost_INCLUDE_DIRS}) + target_link_libraries(OpenSCAD PRIVATE ${Boost_LIBRARIES}) +@@ -384,7 +384,7 @@ else() + target_compile_definitions(OpenSCAD PRIVATE EIGEN_DONT_ALIGN) + message(STATUS "Eigen: ${Eigen3_VERSION}") + +- find_package(Boost 1.61 REQUIRED COMPONENTS system regex program_options) ++ find_package(Boost 1.70 REQUIRED COMPONENTS regex program_options) + message(STATUS "Boost: ${Boost_VERSION}") + target_include_directories(OpenSCAD SYSTEM PRIVATE ${Boost_INCLUDE_DIRS}) + target_link_libraries(OpenSCAD PRIVATE ${Boost_LIBRARIES}) diff --git a/media-gfx/openscad/openscad-2025.05.01_pre-r1.ebuild b/media-gfx/openscad/openscad-2025.05.01_pre-r1.ebuild index 795ff6eb2890..8a479554af48 100644 --- a/media-gfx/openscad/openscad-2025.05.01_pre-r1.ebuild +++ b/media-gfx/openscad/openscad-2025.05.01_pre-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2025 Gentoo Authors +# Copyright 1999-2026 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -117,6 +117,8 @@ DOCS=( doc/translation.txt ) +PATCHES=( "${FILESDIR}/${P}-boost-1.89.patch" ) # bug 967652 + # NOTE the build system sets up a venv for tests, we could use imagemagick with -DUSE_IMAGE_COMPARE_PY="no" python_check_deps() { python_has_version "dev-python/numpy[${PYTHON_USEDEP}]" && @@ -133,13 +135,13 @@ src_prepare() { mv -f "${WORKDIR}/MCAD-${MCAD_COMMIT}"/* "${S}/libraries/MCAD/" || die fi + cmake_src_prepare + # NOTE adhere CMP0167 # https://cmake.org/cmake/help/latest/policy/CMP0167.html sed \ -e '/find_package(Boost/s/)/ CONFIG)/g' \ -i CMakeLists.txt || die - - cmake_src_prepare } src_configure() {
