commit: 04f9e528e0391790bcedd3222b1ddf89886d878f Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> AuthorDate: Sun Jul 23 16:24:04 2023 +0000 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org> CommitDate: Sun Jul 23 16:40:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f9e528
media-gfx/prusaslicer: 2.6.0 version bump. Closes: https://bugs.gentoo.org/910225 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org> media-gfx/prusaslicer/Manifest | 1 + .../prusaslicer-2.6.0-disable-noisy-asserts.patch | 14 ++++ ...icer-2.6.0-libexpat-double-definition-fix.patch | 22 ++++++ media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild | 87 ++++++++++++++++++++++ 4 files changed, 124 insertions(+) diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest index 0a912e0ff23f..967e72f1d40f 100644 --- a/media-gfx/prusaslicer/Manifest +++ b/media-gfx/prusaslicer/Manifest @@ -1 +1,2 @@ DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8 SHA512 7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2 +DIST prusaslicer-2.6.0.tar.gz 56430180 BLAKE2B 7d6a0344f558d5788676364262f9e2b878a01e199fa8c95cda87c801c84fd02d5fc9df5a16096d36ec2e02ea54c8189165d524d8e7f73f66526fba6e5c60e55b SHA512 c6133f09ccee5c3c6f1e6e3aebfee749fb0138e830d93ed42b19063b89738162095fa7c017695643b736099750bb56d6bd8174f8bf18a6f0703811703bfb508c diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch new file mode 100644 index 000000000000..0e3d1d340572 --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch @@ -0,0 +1,14 @@ +diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp +index e855b6290..2479bf054 100644 +--- a/src/slic3r/GUI/GUI_App.cpp ++++ b/src/slic3r/GUI/GUI_App.cpp +@@ -1128,6 +1128,9 @@ bool GUI_App::OnInit() + + bool GUI_App::on_init_inner() + { ++ // Disable the wxWidgets asserts breakpoints, end users have no use for them. ++ wxSizerFlags::DisableConsistencyChecks(); ++ + // Set initialization of image handlers before any UI actions - See GH issue #7469 + wxInitAllImageHandlers(); + 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 new file mode 100644 index 000000000000..23006a2ceedf --- /dev/null +++ b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-libexpat-double-definition-fix.patch @@ -0,0 +1,22 @@ +From fdae4a9817b01aacd70ab033dfac711af2acb61e Mon Sep 17 00:00:00 2001 +From: Malte kleine Piening <mkl.pien...@gmail.com> +Date: Tue, 18 Apr 2023 22:29:04 +0200 +Subject: [PATCH] fixed double definition of target libexpat described in #9581 + +--- + cmake/modules/FindEXPAT.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/modules/FindEXPAT.cmake b/cmake/modules/FindEXPAT.cmake +index de204c60f7e..5863e136ec5 100644 +--- 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/prusaslicer-2.6.0.ebuild b/media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild new file mode 100644 index 000000000000..fcbc39930483 --- /dev/null +++ b/media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2023 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" + +LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +RESTRICT="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:= + 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] +" + +PATCHES=( + "${FILESDIR}/${P}-libexpat-double-definition-fix.patch" + "${FILESDIR}/${P}-disable-noisy-asserts.patch" +) + +S="${WORKDIR}/${MY_PN}-version_${MY_PV}" + +src_prepare() { + 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 +}
