commit: ae9d9745a12dd219adf6220cc26701cad0a2c22d Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com> AuthorDate: Fri Oct 17 13:41:07 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=ae9d9745
media-libs/lib3mf: drop 2.3.2 Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/44221 Closes: https://github.com/gentoo/gentoo/pull/44221 Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/lib3mf/Manifest | 1 - .../files/lib3mf-2.2.0-include-cstdint.patch | 13 ---- .../files/lib3mf-2.3.2-include-cstdint.patch | 13 ---- .../lib3mf-2.3.2-remove-std-and-opt-flags.patch | 30 --------- media-libs/lib3mf/lib3mf-2.3.2.ebuild | 71 ---------------------- media-libs/lib3mf/metadata.xml | 7 --- 6 files changed, 135 deletions(-) diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest index cea3a9b7a687..0dd615930de7 100644 --- a/media-libs/lib3mf/Manifest +++ b/media-libs/lib3mf/Manifest @@ -1,2 +1 @@ -DIST lib3mf-2.3.2.tar.gz 35247937 BLAKE2B 8e20e44d715a2942dea8b3d08cb18593162bfd12b9f09b82b182e901f6beb76e2c88d83860c39cdd4e4c239e18f6949e9f9fd5921bc8a9d257975c54a8777e26 SHA512 875529759aff6128b32291d0719b95a75a72a3b19f98711b12c9b1076727b231668b3b14604e69bb1fec79b4725fd098f030b7e965072e566bfb061f3086279c DIST lib3mf-2.4.1.tar.gz 36313494 BLAKE2B f5fea473e2e28480372cc39178e78022c3612e705d4ea95366a9b9988bdf729a09ee6045af234bc3b4d817d2cd77c1523b27c93abc86c10893a04268276aa251 SHA512 91d3928315bd5d1a8553284505d28c7d839a3cbd8b07a87bca5a21087fffa8ba7a1738ed14313212815a09e33f7a82318f7b069f1bbe40456b57ec528379ab4b diff --git a/media-libs/lib3mf/files/lib3mf-2.2.0-include-cstdint.patch b/media-libs/lib3mf/files/lib3mf-2.2.0-include-cstdint.patch deleted file mode 100644 index 36776fd02751..000000000000 --- a/media-libs/lib3mf/files/lib3mf-2.2.0-include-cstdint.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/Common/Platform/NMR_ImportStream_Unique_Memory.cpp b/Source/Common/Platform/NMR_ImportStream_Unique_Memory.cpp -index 43fd428..e966aa0 100644 ---- a/Source/Common/Platform/NMR_ImportStream_Unique_Memory.cpp -+++ b/Source/Common/Platform/NMR_ImportStream_Unique_Memory.cpp -@@ -35,6 +35,8 @@ This is a platform independent class for keeping data in a memory stream that ow - #include "Common/NMR_Exception.h" - #include "Common/NMR_Exception_Windows.h" - -+#include <cstdint> -+ - namespace NMR { - - CImportStream_Unique_Memory::CImportStream_Unique_Memory() diff --git a/media-libs/lib3mf/files/lib3mf-2.3.2-include-cstdint.patch b/media-libs/lib3mf/files/lib3mf-2.3.2-include-cstdint.patch deleted file mode 100644 index 13df032b71fc..000000000000 --- a/media-libs/lib3mf/files/lib3mf-2.3.2-include-cstdint.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Source/Common/Platform/NMR_EncryptionHeader.cpp -+++ b/Source/Common/Platform/NMR_EncryptionHeader.cpp -@@ -8,6 +8,7 @@ - #include "Common/Platform/NMR_ExportStream.h" - - #include "Common/NMR_Architecture_Utils.h" -+#include <cstdint> - #include <cstring> - - #define LIB3MF_MAXENCRYPTIONHEADERSIZE (1UL << 31) --- -2.47.1 - diff --git a/media-libs/lib3mf/files/lib3mf-2.3.2-remove-std-and-opt-flags.patch b/media-libs/lib3mf/files/lib3mf-2.3.2-remove-std-and-opt-flags.patch deleted file mode 100644 index 0230335b87ec..000000000000 --- a/media-libs/lib3mf/files/lib3mf-2.3.2-remove-std-and-opt-flags.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 057ae273bf223573b7cdb6ec978e051220ffe401 Mon Sep 17 00:00:00 2001 -From: Peter Levine <[email protected]> -Date: Sat, 18 Feb 2023 13:21:29 -0500 -Subject: [PATCH] [Gentoo specific] remove optimization flags and C++ standard - flags - -Remove the lines in CMakeLists.txt that emit -std=c++11 (as wall as -emitting -O2) to enable the compiler default, which builds against -the latest GTest with both clang-16.0.0_pre20230107 and -gcc-12.2.1_p20230121-r1. - -Signed-off-by: Peter Levine <[email protected]> ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,12 +32,10 @@ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - # using GCC - add_definitions(-DBUILD_DLL) - add_compile_options(-Wall) -- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") - elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin") - # using GCC - add_definitions(-DBUILD_DLL) - add_compile_options(-Wall) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -O2") - set(CMAKE_MACOSX_RPATH ON) - endif() - --- -2.39.1 - diff --git a/media-libs/lib3mf/lib3mf-2.3.2.ebuild b/media-libs/lib3mf/lib3mf-2.3.2.ebuild deleted file mode 100644 index 4cb044e73b86..000000000000 --- a/media-libs/lib3mf/lib3mf-2.3.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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" - -LICENSE="BSD" -SLOT="0/2" -KEYWORDS="amd64 ~arm64 ~ppc64 x86" -IUSE="+system-act test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/libzip:= - sys-apps/util-linux - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig - test? ( - dev-cpp/gtest - dev-libs/openssl - dev-debug/valgrind - ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.3.2-remove-std-and-opt-flags.patch - "${FILESDIR}"/${PN}-2.2.0-include-cstdint.patch - "${FILESDIR}"/${PN}-2.3.2-include-cstdint.patch -) - -src_prepare() { - cmake_src_prepare - - # DO NOT WANT! - rm -r Libraries/libressl || die -} - -src_configure() { - local mycmakeargs=( - -DCMAKE_INSTALL_INCLUDEDIR="include/${PN}" - -DLIB3MF_TESTS=$(usex test) - -DUSE_INCLUDED_LIBZIP=OFF - -DUSE_INCLUDED_ZLIB=OFF - -DSTRIP_BINARIES=OFF - ) - - if use test; then - mycmakeargs+=( - # code says it uses libressl, but works with openssl too - -DUSE_INCLUDED_SSL=OFF - ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - for suf in abi types implicit; do - dosym -r /usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp /usr/include/${PN}/${PN}_${suf}.hpp - done -} diff --git a/media-libs/lib3mf/metadata.xml b/media-libs/lib3mf/metadata.xml index d93427ed8a3b..6af88f042b41 100644 --- a/media-libs/lib3mf/metadata.xml +++ b/media-libs/lib3mf/metadata.xml @@ -15,13 +15,6 @@ It provides reading and writing capabilities for 3MF files, as well as conversion and validation tools for input and output data. </longdescription> -<use> - <flag name="system-act"> - Use system-provided <pkg>dev-go/act</pkg> as code generator - instead of package provided binaries. This flag will be removed - after some time used for testing! - </flag> -</use> <upstream> <remote-id type="github">3MFConsortium/lib3mf</remote-id> </upstream>
