commit: 1139705e7e2422c3798b3f1070491745e5e34c0b Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Tue Aug 6 09:15:41 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Tue Aug 6 09:15:52 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1139705e
media-gfx/prusaslicer: dropped obsolete 2.7.4 Bug: https://bugs.gentoo.org/936874 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-gfx/prusaslicer/Manifest | 1 - ...icer-2.6.0-libexpat-double-definition-fix.patch | 16 ---- .../files/prusaslicer-2.7.4-boost-1.85.patch | 30 ------ media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild | 101 --------------------- 4 files changed, 148 deletions(-) diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 96bff41a9c8d..1d0a10b8a015 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1,2 +1 @@ -DIST prusaslicer-2.7.4.tar.gz 65396083 BLAKE2B 658c9c623e9b25ba2590f3b816987776050b25849dab2b52500ed1673434f016007b6f40944afe412df4a517351785db15de8c8b8e633d7765d656e35014aa69 SHA512 fa876160ec641ecaed20339d66c01971ca1ad73fdfba3b19bae4169e81020175aa5b99a8a7f4f01bf15d112b817cde8226c01bb4bdfb077f387a2d27f92e5d6b DIST prusaslicer-2.8.0.tar.gz 69806919 BLAKE2B b87c63ae411814dbffc8ae96c243bf06018d600db732ef32f7c766ce6bdf156b0aca6da90868482f39b9c6421c6a386bccc9f69e23218dadc07f1bcdb21b9793 SHA512 d98b43e9e1a6da9cbab46b2564da02fc0f8521d84a4df915d0ffd0878ee1a25afebe7078e38b124ec8565782379c51a7f9564462652ef1a7d9819d29297c1937 diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch deleted file mode 100644 index 4a93da994bd7..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -From fdae4a9817b01aacd70ab033dfac711af2acb61e Mon Sep 17 00:00:00 2001 -From: Malte kleine Piening <[email protected]> -Date: Tue, 18 Apr 2023 22:29:04 +0200 -Subject: [PATCH] fixed double definition of target libexpat described in #9581 - ---- a/cmake/modules/FindEXPAT.cmake -+++ b/cmake/modules/FindEXPAT.cmake -@@ -25,7 +25,7 @@ if (NOT EXPAT_FOUND) - endif () - endif() - --if (EXPAT_FOUND AND NOT TARGET EXPAT::EXPAT) -+if (EXPAT_FOUND AND NOT (TARGET EXPAT::EXPAT OR TARGET expat::expat)) - add_library(libexpat INTERFACE) - add_library(EXPAT::EXPAT ALIAS libexpat) - target_link_libraries(libexpat INTERFACE expat::expat) diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch b/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch deleted file mode 100644 index 4ccaff8f6b17..000000000000 --- a/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- PrusaSlicer-version_2.7.4.old/src/slic3r/Config/Snapshot.cpp -+++ PrusaSlicer-version_2.7.4/src/slic3r/Config/Snapshot.cpp -@@ -12,6 +12,7 @@ - #include <boost/property_tree/ini_parser.hpp> - #include <boost/property_tree/ptree_fwd.hpp> - #include <boost/filesystem/operations.hpp> -+#include <boost/filesystem/directory.hpp> - #include <boost/log/trivial.hpp> - - #include "libslic3r/PresetBundle.hpp" ---- PrusaSlicer-version_2.7.4.old/src/slic3r/Config/Version.cpp -+++ PrusaSlicer-version_2.7.4/src/slic3r/Config/Version.cpp -@@ -7,6 +7,7 @@ - #include <cctype> - - #include <boost/filesystem/operations.hpp> -+#include <boost/filesystem/directory.hpp> - #include <boost/nowide/fstream.hpp> - - #include "libslic3r/libslic3r.h" ---- PrusaSlicer-version_2.7.4.old/src/slic3r/GUI/RemovableDriveManager.cpp -+++ PrusaSlicer-version_2.7.4/src/slic3r/GUI/RemovableDriveManager.cpp -@@ -35,7 +35,6 @@ - #include <pwd.h> - #include <boost/filesystem.hpp> - #include <boost/system/error_code.hpp> --#include <boost/filesystem/convenience.hpp> - #include <boost/process.hpp> - #endif - diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild deleted file mode 100644 index 3745d41a4e8d..000000000000 --- a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -WX_GTK_VER="3.2-gtk3" -MY_PN="PrusaSlicer" -MY_PV="$(ver_rs 3 -)" - -inherit cmake wxwidgets xdg - -DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication (3D printers)" -HOMEPAGE="https://www.prusa3d.com/prusaslicer/"; -SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz -> ${P}.tar.gz" - -S="${WORKDIR}/${MY_PN}-version_${MY_PV}" - -LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="test" - -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-cpp/eigen:3 - dev-cpp/tbb:= - dev-libs/boost:=[nls] - dev-libs/cereal - dev-libs/expat - dev-libs/glib:2 - dev-libs/gmp:= - dev-libs/mpfr:= - media-gfx/openvdb:= - media-gfx/libbgcode - net-misc/curl[adns] - media-libs/glew:0= - media-libs/libjpeg-turbo:= - media-libs/libpng:0= - media-libs/qhull:= - sci-libs/libigl - sci-libs/nlopt - sci-libs/opencascade:= - sci-mathematics/cgal:= - sys-apps/dbus - sys-libs/zlib:= - virtual/opengl - x11-libs/gtk+:3 - >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl] - media-libs/nanosvg:= -" -DEPEND="${RDEPEND} - media-libs/qhull[static-libs] - test? ( =dev-cpp/catch-2* ) -" - -PATCHES=( - "${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch" - "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch" - "${FILESDIR}/${PN}-2.7.4-boost-1.85.patch" -) - -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' \ - src/occt_wrapper/CMakeLists.txt || die - cmake_src_prepare -} - -src_configure() { - CMAKE_BUILD_TYPE="Release" - - setup-wxwidgets - - local mycmakeargs=( - -DOPENVDB_FIND_MODULE_PATH="/usr/$(get_libdir)/cmake/OpenVDB" - - -DSLIC3R_BUILD_TESTS=$(usex test) - -DSLIC3R_FHS=ON - -DSLIC3R_GTK=3 - -DSLIC3R_GUI=ON - -DSLIC3R_PCH=OFF - -DSLIC3R_STATIC=OFF - -DSLIC3R_WX_STABLE=ON - -Wno-dev - ) - - cmake_src_configure -} - -src_test() { - CMAKE_SKIP_TESTS=( - "^libslic3r_tests$" - ) - cmake_src_test -}
