[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2026-03-09 Thread David Seifert
commit: cf892a54b4fa99d0b9643dc850cdcadc4efc1c90
Author: David Seifert  gentoo  org>
AuthorDate: Mon Mar  9 08:50:43 2026 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Mar  9 08:50:43 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf892a54

media-gfx/prusaslicer: remove hard catch-3.8 pinning

Signed-off-by: David Seifert  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild | 2 +-
 media-gfx/prusaslicer/prusaslicer-.ebuild  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
index 908235a24532..c26e8d841ba0 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
media-libs/qhull[static-libs]
-   test? ( =dev-cpp/catch-3.8* )
+   test? ( >=dev-cpp/catch-3.8 )
 "
 
 PATCHES=(

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index bbca0ded57a1..74f5ca1679be 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -59,7 +59,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
media-libs/qhull[static-libs]
-   test? ( =dev-cpp/catch-3.8* )
+   test? ( >=dev-cpp/catch-3.8 )
 "
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2026-01-10 Thread Miroslav Šulc
commit: 8114ab0c18e0f25337df828f15078d8b102c2d98
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jan 10 09:55:14 2026 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jan 10 09:55:25 2026 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8114ab0c

media-gfx/prusaslicer: added patch for boost 1.89

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.9.4-boost-1.89.patch   | 38 ++
 media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild |  3 +-
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  3 +-
 3 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.4-boost-1.89.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.4-boost-1.89.patch
new file mode 100644
index ..a06aa0383299
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.4-boost-1.89.patch
@@ -0,0 +1,38 @@
+From ec56226d71a345c01c4ae668a78003e0e893ee7d Mon Sep 17 00:00:00 2001
+From: Paul Zander 
+Date: Fri, 9 Jan 2026 14:54:28 +0100
+Subject: [PATCH] boost 1.89
+
+`Boost::system` is not valid since Boost 1.89.0.
+
+PrusaSlicer requires a minimum of Boost 1.83.0 so Boost.System is guaranteed to
+be header-only (since 1.69[^1]) and the component can be removed.
+
+[^1]:
+https://www.boost.org/doc/libs/1_69_0/libs/system/doc/html/system.html#changes_in_boost_1_69
+
+Signed-off-by: Paul Zander 
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -370,7 +370,7 @@ endif()
+ # boost::process was introduced first in version 1.64.0,
+ # boost::beast::detail::base64 was introduced first in version 1.66.0
+ set(MINIMUM_BOOST_VERSION "1.83.0")
+-set(_boost_components 
"system;filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide")
++set(_boost_components 
"filesystem;thread;log;locale;regex;chrono;atomic;date_time;iostreams;nowide")
+ find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS 
${_boost_components})
+ 
+ find_package(Eigen3 3.3.7 REQUIRED)
+--- a/src/slic3r/Utils/Bonjour.cpp
 b/src/slic3r/Utils/Bonjour.cpp
+@@ -11,6 +11,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+-- 
+2.52.0
\ No newline at end of file

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
index 31444cf810f1..908235a24532 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.4.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
@@ -69,6 +69,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
"${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
"${FILESDIR}/${PN}-2.9.2-boost-1.88.patch"
+   "${FILESDIR}/${PN}-2.9.4-boost-1.89.patch"
 )
 
 src_prepare() {

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index c005e61aa5f3..bbca0ded57a1 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.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
@@ -69,6 +69,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
"${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
"${FILESDIR}/${PN}-2.9.2-boost-1.88.patch"
+   "${FILESDIR}/${PN}-2.9.4-boost-1.89.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-12-29 Thread Miroslav Šulc
commit: 80a996676b3e606649fbef1076f5e5899ee81897
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Dec 29 10:19:35 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Dec 29 10:19:35 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80a99667

media-gfx/prusaslicer: dropped obsolete 2.9.3-r1

Bug: https://bugs.gentoo.org/967634
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest|   1 -
 media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild | 113 --
 2 files changed, 114 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index a8ddfb59e95f..a067e17ee27e 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1 @@
-DIST prusaslicer-2.9.3.tar.gz 77547931 BLAKE2B 
0c84eaa7a94991bd0d691adc70d96291146c2776ec6030449bd9f3dd9d0fe645f7298d55a7e66aeb55f4476a331750cd95216910f3135b18a90fb23cf627a050
 SHA512 
d4463d1057bc14c62584f7c66cffd29189d12417d4badab992e73d8e5fd63f3f5e573f7a1904c9271777aedc28802e7938d69e4d9d96aa6b02b8f91208f4b3f3
 DIST prusaslicer-2.9.4.tar.gz 79411287 BLAKE2B 
59496c5a31fc8d7aeca804409a400edd4ff69efcabbf92662a40f04729d63c0937c25aaf1dc02304a16dfb9637b469c61d0f6ec250c9d58f9fc8a52b78fb
 SHA512 
777b1fb3e2a6ce0f233c34749dc351b9ded2a9900a0e4b7ebc0c8c9cb2d7b2a4eec5da49772da16cdb317ecb2fba319166bb3da113e46d9ac5e6c2d5d4ca430e

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild
deleted file mode 100644
index 31444cf810f1..
--- a/media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2025 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
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
-else
-   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 ~x86"
-   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-fi
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   dev-cpp/eigen:3
-   dev-cpp/tbb:=
-   dev-cpp/nlohmann_json:=
-   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:=
-   net-libs/webkit-gtk:4.1
-   sci-libs/libigl
-   sci-libs/nlopt
-   sci-libs/opencascade:=
-   sci-mathematics/cgal:=
-   sci-mathematics/z3:=
-   sys-apps/dbus
-   virtual/zlib:=
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl,webkit]
-   media-libs/nanosvg:=
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-   test? ( =dev-cpp/catch-3.8* )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
-   "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
-   "${FILESDIR}/${PN}-2.8.1-fstream.patch"
-   "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
-   "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
-   "${FILESDIR}/${PN}-2.9.2-boost-1.88.patch"
-)
-
-src_prepare() {
-   if has_version ">=sci-libs/opencascade-7.8.0"; then
-   eapply "${FILESDIR}/prusaslicer-2.8.1-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.[0-9] 
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
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-12-20 Thread Arthur Zamarin
commit: 27923d2850f1626154e9ff5e10d80841c390eed8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat Dec 20 12:18:35 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat Dec 20 12:18:35 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27923d28

media-gfx/prusaslicer: Stabilize 2.9.4 amd64, #967634

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
index c005e61aa5f3..31444cf810f1 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
 else

SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~x86"
S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-11-16 Thread Miroslav Šulc
commit: a4b6cb9f0972eac59ccf0a7b08a277d612bca8b1
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Nov 16 18:16:59 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Nov 16 18:16:59 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4b6cb9f

media-gfx/prusaslicer: dropped obsolete 2.9.2-r1

Bug: https://bugs.gentoo.org/965303
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest|   1 -
 media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild | 112 --
 2 files changed, 113 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index bd83fe015122..a8ddfb59e95f 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1,2 @@
-DIST prusaslicer-2.9.2.tar.gz 76992191 BLAKE2B 
ac88d2549baeb896137f85531eabe8e3c87b2998766e9f21d5e10be62fd421d821d2e66a818462c26fd20105fa3589e5396300f8795f0f97cbf26d11d25dd1bf
 SHA512 
f43d6c2e639f029f91e722bcbac7db993ff4df69a850421e9acac4165bafeeb7f765a9ecab88d5bd5221524b3fbce78ae84f62d290a406406fd75644811440c1
 DIST prusaslicer-2.9.3.tar.gz 77547931 BLAKE2B 
0c84eaa7a94991bd0d691adc70d96291146c2776ec6030449bd9f3dd9d0fe645f7298d55a7e66aeb55f4476a331750cd95216910f3135b18a90fb23cf627a050
 SHA512 
d4463d1057bc14c62584f7c66cffd29189d12417d4badab992e73d8e5fd63f3f5e573f7a1904c9271777aedc28802e7938d69e4d9d96aa6b02b8f91208f4b3f3
 DIST prusaslicer-2.9.4.tar.gz 79411287 BLAKE2B 
59496c5a31fc8d7aeca804409a400edd4ff69efcabbf92662a40f04729d63c0937c25aaf1dc02304a16dfb9637b469c61d0f6ec250c9d58f9fc8a52b78fb
 SHA512 
777b1fb3e2a6ce0f233c34749dc351b9ded2a9900a0e4b7ebc0c8c9cb2d7b2a4eec5da49772da16cdb317ecb2fba319166bb3da113e46d9ac5e6c2d5d4ca430e

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild
deleted file mode 100644
index 841c6effcd1f..
--- a/media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2025 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
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
-else
-   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="amd64 ~arm64 ~x86"
-   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-fi
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-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:=
-   net-libs/webkit-gtk:4.1
-   sci-libs/libigl
-   sci-libs/nlopt
-   sci-libs/opencascade:=
-   sci-mathematics/cgal:=
-   sci-mathematics/z3:=
-   sys-apps/dbus
-   virtual/zlib:=
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl,webkit]
-   media-libs/nanosvg:=
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-   test? ( =dev-cpp/catch-3.8* )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
-   "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
-   "${FILESDIR}/${PN}-2.8.1-fstream.patch"
-   "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
-   "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
-   "${FILESDIR}/${PN}-2.9.2-boost-1.88.patch"
-)
-
-src_prepare() {
-   if has_version ">=sci-libs/opencascade-7.8.0"; then
-   eapply "${FILESDIR}/prusaslicer-2.8.1-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.[0-9] 
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
-   )
-
-  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-11-14 Thread Arthur Zamarin
commit: cdcb44468dbade6673ea0161064ce41d745667c2
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Nov 14 10:24:42 2025 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Nov 14 10:24:42 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdcb4446

media-gfx/prusaslicer: Stabilize 2.9.3-r1 amd64, #965303

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild
index c005e61aa5f3..31444cf810f1 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
 else

SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~x86"
S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-11-07 Thread Miroslav Šulc
commit: 8672fbb15676f60f7701fd9799b1df5dec3e6e69
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Nov  7 16:48:20 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Nov  7 16:48:20 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8672fbb1

media-gfx/prusaslicer: bump to 2.9.4

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 +
 media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild | 113 +
 2 files changed, 114 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index fcfdd86ebd77..bd83fe015122 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1,3 @@
 DIST prusaslicer-2.9.2.tar.gz 76992191 BLAKE2B 
ac88d2549baeb896137f85531eabe8e3c87b2998766e9f21d5e10be62fd421d821d2e66a818462c26fd20105fa3589e5396300f8795f0f97cbf26d11d25dd1bf
 SHA512 
f43d6c2e639f029f91e722bcbac7db993ff4df69a850421e9acac4165bafeeb7f765a9ecab88d5bd5221524b3fbce78ae84f62d290a406406fd75644811440c1
 DIST prusaslicer-2.9.3.tar.gz 77547931 BLAKE2B 
0c84eaa7a94991bd0d691adc70d96291146c2776ec6030449bd9f3dd9d0fe645f7298d55a7e66aeb55f4476a331750cd95216910f3135b18a90fb23cf627a050
 SHA512 
d4463d1057bc14c62584f7c66cffd29189d12417d4badab992e73d8e5fd63f3f5e573f7a1904c9271777aedc28802e7938d69e4d9d96aa6b02b8f91208f4b3f3
+DIST prusaslicer-2.9.4.tar.gz 79411287 BLAKE2B 
59496c5a31fc8d7aeca804409a400edd4ff69efcabbf92662a40f04729d63c0937c25aaf1dc02304a16dfb9637b469c61d0f6ec250c9d58f9fc8a52b78fb
 SHA512 
777b1fb3e2a6ce0f233c34749dc351b9ded2a9900a0e4b7ebc0c8c9cb2d7b2a4eec5da49772da16cdb317ecb2fba319166bb3da113e46d9ac5e6c2d5d4ca430e

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
new file mode 100644
index ..c005e61aa5f3
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.4.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2025 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
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
+else
+   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+fi
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-cpp/eigen:3
+   dev-cpp/tbb:=
+   dev-cpp/nlohmann_json:=
+   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:=
+   net-libs/webkit-gtk:4.1
+   sci-libs/libigl
+   sci-libs/nlopt
+   sci-libs/opencascade:=
+   sci-mathematics/cgal:=
+   sci-mathematics/z3:=
+   sys-apps/dbus
+   virtual/zlib:=
+   virtual/opengl
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl,webkit]
+   media-libs/nanosvg:=
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+   test? ( =dev-cpp/catch-3.8* )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
+   "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
+   "${FILESDIR}/${PN}-2.8.1-fstream.patch"
+   "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
+   "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
+   "${FILESDIR}/${PN}-2.9.2-boost-1.88.patch"
+)
+
+src_prepare() {
+   if has_version ">=sci-libs/opencascade-7.8.0"; then
+   eapply "${FILESDIR}/prusaslicer-2.8.1-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.[0-9] 
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
+}
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-10-18 Thread Miroslav Šulc
commit: 8a0509bb1c4f686fdc5a3b5db41424f2e4ddb296
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Sep 25 11:45:22 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Sep 25 11:56:10 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a0509bb

media-gfx/prusaslicer: added missing dep to 2.9.3 & live

Closes: https://bugs.gentoo.org/962935
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../{prusaslicer-2.9.3.ebuild => prusaslicer-2.9.3-r1.ebuild}| 1 +
 media-gfx/prusaslicer/prusaslicer-.ebuild| 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.3.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild
similarity index 99%
rename from media-gfx/prusaslicer/prusaslicer-2.9.3.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild
index d679a8fb8cf1..31cdde32d9ff 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.9.3.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.3-r1.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
dev-cpp/eigen:3
dev-cpp/tbb:=
+   dev-cpp/nlohmann_json:=
dev-libs/boost:=[nls]
dev-libs/cereal
dev-libs/expat

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index d679a8fb8cf1..31cdde32d9ff 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -30,6 +30,7 @@ RESTRICT="!test? ( test )"
 RDEPEND="
dev-cpp/eigen:3
dev-cpp/tbb:=
+   dev-cpp/nlohmann_json:=
dev-libs/boost:=[nls]
dev-libs/cereal
dev-libs/expat



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-09-16 Thread Miroslav Šulc
commit: 45e2e3ee6a6e699c8f8bf48e0f6e46bcf62b0805
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Sep 14 08:53:50 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Sep 14 08:54:53 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e2e3ee

media-gfx/prusaslicer: bump to 2.9.3

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 +
 media-gfx/prusaslicer/prusaslicer-2.9.3.ebuild | 112 +
 2 files changed, 113 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 53d1843ea4dc..fcfdd86ebd77 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1 +1,2 @@
 DIST prusaslicer-2.9.2.tar.gz 76992191 BLAKE2B 
ac88d2549baeb896137f85531eabe8e3c87b2998766e9f21d5e10be62fd421d821d2e66a818462c26fd20105fa3589e5396300f8795f0f97cbf26d11d25dd1bf
 SHA512 
f43d6c2e639f029f91e722bcbac7db993ff4df69a850421e9acac4165bafeeb7f765a9ecab88d5bd5221524b3fbce78ae84f62d290a406406fd75644811440c1
+DIST prusaslicer-2.9.3.tar.gz 77547931 BLAKE2B 
0c84eaa7a94991bd0d691adc70d96291146c2776ec6030449bd9f3dd9d0fe645f7298d55a7e66aeb55f4476a331750cd95216910f3135b18a90fb23cf627a050
 SHA512 
d4463d1057bc14c62584f7c66cffd29189d12417d4badab992e73d8e5fd63f3f5e573f7a1904c9271777aedc28802e7938d69e4d9d96aa6b02b8f91208f4b3f3

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.3.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.3.ebuild
new file mode 100644
index ..d679a8fb8cf1
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2025 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
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
+else
+   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+fi
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+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:=
+   net-libs/webkit-gtk:4.1
+   sci-libs/libigl
+   sci-libs/nlopt
+   sci-libs/opencascade:=
+   sci-mathematics/cgal:=
+   sci-mathematics/z3:=
+   sys-apps/dbus
+   sys-libs/zlib:=
+   virtual/opengl
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl,webkit]
+   media-libs/nanosvg:=
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+   test? ( =dev-cpp/catch-3.8* )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
+   "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
+   "${FILESDIR}/${PN}-2.8.1-fstream.patch"
+   "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
+   "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
+   "${FILESDIR}/${PN}-2.9.2-boost-1.88.patch"
+)
+
+src_prepare() {
+   if has_version ">=sci-libs/opencascade-7.8.0"; then
+   eapply "${FILESDIR}/prusaslicer-2.8.1-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.[0-9] 
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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2025-06-09 Thread Miroslav Šulc
commit: 7cce1f914e2a91c2484befdd839f7b1d103424d4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon Jun  9 17:40:06 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon Jun  9 17:40:27 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cce1f91

media-gfx/prusaslicer: dropped obsolete 2.8.1-r2

Bug: https://bugs.gentoo.org/949375
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 -
 .../files/prusaslicer-2.8.0-missing-includes.patch |  20 
 .../files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch  |  28 -
 .../files/prusaslicer-2.8.1-fixed-linking.patch|  20 
 .../files/prusaslicer-2.9.0-arrange-static.patch   |  37 ---
 .../files/prusaslicer-2.9.0-missing-includes.patch |  10 --
 media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild  | 117 -
 7 files changed, 233 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 466ff991d796..53d1843ea4dc 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1 @@
-DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B 
dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453
 SHA512 
0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8dab19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912
 DIST prusaslicer-2.9.2.tar.gz 76992191 BLAKE2B 
ac88d2549baeb896137f85531eabe8e3c87b2998766e9f21d5e10be62fd421d821d2e66a818462c26fd20105fa3589e5396300f8795f0f97cbf26d11d25dd1bf
 SHA512 
f43d6c2e639f029f91e722bcbac7db993ff4df69a850421e9acac4165bafeeb7f765a9ecab88d5bd5221524b3fbce78ae84f62d290a406406fd75644811440c1

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
deleted file mode 100644
index 9d13876b607b..
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/src/slic3r/Config/Version.cpp
-+++ b/src/slic3r/Config/Version.cpp
-@@ -7,6 +7,7 @@
- #include 
- 
- #include 
-+#include 
- #include 
- 
- #include "libslic3r/libslic3r.h"
 a/src/slic3r/GUI/UserAccountCommunication.cpp
-+++ b/src/slic3r/GUI/UserAccountCommunication.cpp
-@@ -13,6 +13,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- 

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch
deleted file mode 100644
index d7c700662b72..
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001
-From: Gregor Riepl 
-Date: Mon, 27 Nov 2023 13:01:55 +0100
-Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString
- overloads
-
 a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
-+++ b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
-@@ -606,7 +606,7 @@ void 
PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
- // Always fill in the "printhost_port" combo box from the config and 
select it.
- {
- Choice* choice = 
dynamic_cast(m_optgroup->get_field("printhost_port"));
--choice->set_values({ m_config->opt_string("printhost_port") });
-+choice->set_values(std::vector({ 
m_config->opt_string("printhost_port") }));
- choice->set_selection();
- }
- 
 a/src/slic3r/GUI/Plater.cpp
-+++ b/src/slic3r/GUI/Plater.cpp
-@@ -4048,7 +4048,7 @@ void Plater::load_project(const wxString& filename)
- 
- p->reset();
- 
--if (! load_files({ into_path(filename) }).empty()) {
-+if (! load_files(std::vector({ 
into_path(filename) })).empty()) {
- // At least one file was loaded.
- p->set_project_filename(filename);
- // Save the names of active presets and project specific config into 
ProjectDirtyStateManager.

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
deleted file mode 100644
index 9d387a07993d..
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES
- )
- 
- find_package(NanoSVG REQUIRED)
-+find_package(OpenSSL REQUIRED)
- 
- if (APPLE)
- list(APPEND SLIC3R_GUI_SOURCES
-@@ -438,6 +439,9 @@ target_link_libraries(
- NanoSVG::nanosvgrast
- stb_dxt
- fastfloat
-+OpenSSL::SSL
-+OpenSSL::Crypto
-+Boost::log
- )
- 
- if (MSVC)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch
deleted file mode 100644
index d7f006f527fb..

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2025-05-18 Thread Miroslav Šulc
commit: e59e228b984a90eb27691d00d21a5abfe540576e
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun May 18 09:11:52 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun May 18 09:12:27 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e59e228b

media-gfx/prusaslicer: fixed compilation with boost 1.88

Closes: https://bugs.gentoo.org/93
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.8.1-boost-1.87.patch   | 40 +-
 .../files/prusaslicer-2.9.0-arrange-static.patch   |  9 -
 .../files/prusaslicer-2.9.2-boost-1.88.patch   | 39 +
 media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild  |  1 +
 media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild  |  1 +
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  1 +
 6 files changed, 58 insertions(+), 33 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch
index 7666c26800ae..3dae923d06a5 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch
@@ -1,9 +1,8 @@
 https://bugs.gentoo.org/946495
 https://github.com/prusa3d/PrusaSlicer/issues/13799
 
-diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp 
PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp
 PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp   
2024-12-21 11:52:03.612595066 +0100
-+++ PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp   
2024-12-21 12:34:03.859507724 +0100
+--- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp
 PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp
 @@ -113,7 +113,7 @@ GCodeSender::connect(std::string devname
  this->io.post(boost::bind(&GCodeSender::do_read, this));
  
@@ -13,9 +12,8 @@ diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSend
  this->background_thread.swap(t);
  
  // always send a M105 to check for connection because firmware might be 
silent on connect
-diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp 
PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp
 PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp   
2024-12-21 11:52:03.612595066 +0100
-+++ PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp   
2024-12-21 12:34:26.163427521 +0100
+--- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp
 PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp
 @@ -40,7 +40,7 @@ class GCodeSender : private boost::nonco
  void reset();
  
@@ -25,9 +23,8 @@ diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSend
  asio::serial_port serial;
  boost::thread background_thread;
  boost::asio::streambuf read_buffer, write_buffer;
-diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp 
PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp
 PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp   
2024-12-21 11:52:03.632594994 +0100
-+++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp   
2024-12-21 12:33:40.507591681 +0100
+--- PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp
 PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp
 @@ -429,7 +429,7 @@ void FirmwareDialog::priv::avr109_wait_f
  
  void FirmwareDialog::priv::avr109_reboot(const SerialPortInfo &port)
@@ -37,9 +34,8 @@ diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/Firmware
Serial serial(io, port.port, 1200);
std::this_thread::sleep_for(std::chrono::milliseconds(50));
  }
-diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp 
PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp
 PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp
2024-12-21 11:52:03.644594950 +0100
-+++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp
2024-12-21 12:47:16.560667015 +0100
+--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp
 PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp
 @@ -624,11 +624,11 @@ UdpSession::UdpSession(Bonjour::ReplyFn
buffer.resize(DnsMessage::MAX_SIZE);
  }
@@ -215,9 +211,8 @@ diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjou
}
catch (std::exception& e) {
BOOST_LOG_TRIVIAL(error) << e.what();
-diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.hpp 
PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.hpp
 PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.hpp
2024-12-21 11:52:03.644594950 +0100
-+++ PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-05-17 Thread David Seifert
commit: 3b82d259b8c05744727d8483595424da659b2f41
Author: David Seifert  gentoo  org>
AuthorDate: Sat May 17 14:57:19 2025 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat May 17 14:57:19 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b82d259

media-gfx/prusaslicer: slot op on x11-libs/wxGTK

Signed-off-by: David Seifert  gentoo.org>

 .../{prusaslicer-2.8.1-r1.ebuild => prusaslicer-2.8.1-r2.ebuild}  | 4 ++--
 .../{prusaslicer-2.9.2.ebuild => prusaslicer-2.9.2-r1.ebuild} | 2 +-
 media-gfx/prusaslicer/prusaslicer-.ebuild | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild
similarity index 96%
rename from media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild
index 1b384bbdb9a9..f4fd79172f51 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -52,7 +52,7 @@ RDEPEND="
sys-libs/zlib:=
virtual/opengl
x11-libs/gtk+:3
-   >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit]
+   x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl,webkit]
media-libs/nanosvg:=
 "
 DEPEND="${RDEPEND}

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild
similarity index 97%
rename from media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild
index 9e9bcda38297..5c0a5c28e744 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.2-r1.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
sys-libs/zlib:=
virtual/opengl
x11-libs/gtk+:3
-   >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit]
+   x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl,webkit]
media-libs/nanosvg:=
 "
 DEPEND="${RDEPEND}

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 9e9bcda38297..5c0a5c28e744 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -53,7 +53,7 @@ RDEPEND="
sys-libs/zlib:=
virtual/opengl
x11-libs/gtk+:3
-   >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit]
+   x11-libs/wxGTK:${WX_GTK_VER}=[X,opengl,webkit]
media-libs/nanosvg:=
 "
 DEPEND="${RDEPEND}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-05-11 Thread Miroslav Šulc
commit: 2c6408d404d1c7ed79e0e41bfb95fa84c28664ca
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun May 11 18:21:38 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun May 11 18:21:38 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c6408d4

media-gfx/prusaslicer: dropped obsolete 2.9.1

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 -
 media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild | 111 -
 2 files changed, 112 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 76a7738463e8..466ff991d796 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1,2 @@
 DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B 
dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453
 SHA512 
0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8dab19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912
-DIST prusaslicer-2.9.1.tar.gz 76767199 BLAKE2B 
0aaf606f25b449f6787905edc06c15cf89e78fa1bc51db2f1fd9e54cc5d1285be9cbe5232e98bdd24de792784c328fb6a79535414b3ff279ddc4dccc8dd0c93c
 SHA512 
a7a7131fa0d04bbf63954e047c8db18fffd71e35650841d281b5f97ec23b8029324a187320a5b5f5abdc7da2ec44c2a757e4a67db22e17bbcc069756e59959d9
 DIST prusaslicer-2.9.2.tar.gz 76992191 BLAKE2B 
ac88d2549baeb896137f85531eabe8e3c87b2998766e9f21d5e10be62fd421d821d2e66a818462c26fd20105fa3589e5396300f8795f0f97cbf26d11d25dd1bf
 SHA512 
f43d6c2e639f029f91e722bcbac7db993ff4df69a850421e9acac4165bafeeb7f765a9ecab88d5bd5221524b3fbce78ae84f62d290a406406fd75644811440c1

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild
deleted file mode 100644
index 9e9bcda38297..
--- a/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2025 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
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
-else
-   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-fi
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-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:=
-   net-libs/webkit-gtk:4.1
-   sci-libs/libigl
-   sci-libs/nlopt
-   sci-libs/opencascade:=
-   sci-mathematics/cgal:=
-   sci-mathematics/z3:=
-   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,webkit]
-   media-libs/nanosvg:=
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-   test? ( =dev-cpp/catch-3.8* )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
-   "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
-   "${FILESDIR}/${PN}-2.8.1-fstream.patch"
-   "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
-   "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
-)
-
-src_prepare() {
-   if has_version ">=sci-libs/opencascade-7.8.0"; then
-   eapply "${FILESDIR}/prusaslicer-2.8.1-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.[0-9] 
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=(
-   "

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-04-21 Thread Miroslav Šulc
commit: d7316cf15b2146413c86b86f2cf6a8e98da90f05
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Apr 22 06:36:20 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Apr 22 06:36:34 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7316cf1

media-gfx/prusaslicer: fixed catch version dependency

Closes: https://bugs.gentoo.org/954184
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild | 2 +-
 media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild | 2 +-
 media-gfx/prusaslicer/prusaslicer-.ebuild  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild
index ddb4522b2ddc..9e9bcda38297 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
media-libs/qhull[static-libs]
-   test? ( =dev-cpp/catch-2* )
+   test? ( =dev-cpp/catch-3.8* )
 "
 
 PATCHES=(

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild
index ddb4522b2ddc..9e9bcda38297 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
media-libs/qhull[static-libs]
-   test? ( =dev-cpp/catch-2* )
+   test? ( =dev-cpp/catch-3.8* )
 "
 
 PATCHES=(

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index ddb4522b2ddc..9e9bcda38297 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -58,7 +58,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
media-libs/qhull[static-libs]
-   test? ( =dev-cpp/catch-2* )
+   test? ( =dev-cpp/catch-3.8* )
 "
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-04-10 Thread Miroslav Šulc
commit: 3208426633a7e58dd43a34bf1dc01168c4e88a32
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Apr 10 16:18:05 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Apr 10 16:19:39 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32084266

media-gfx/prusaslicer: bump to 2.9.2

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 +
 media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild | 111 +
 2 files changed, 112 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 4778d455350d..39ed9b367029 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1,4 @@
 DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B 
dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453
 SHA512 
0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8dab19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912
 DIST prusaslicer-2.9.0.tar.gz 70604482 BLAKE2B 
14480ad6e4257d052e65f7158e14e6eb57f2e51c5c7ce3a6545b36a47007cb528aa38a1ff00eacd70374dfaef4ba7efd185dd5add1a6807f79148a124320126a
 SHA512 
554099ba827f8b4af37727d4e99ad6b2f339c530f35a4f8e63f0c5aaf455a5fc3261b983939c487f76964c522ea8ecd13527efea7f881749f907a039cfe7ef89
 DIST prusaslicer-2.9.1.tar.gz 76767199 BLAKE2B 
0aaf606f25b449f6787905edc06c15cf89e78fa1bc51db2f1fd9e54cc5d1285be9cbe5232e98bdd24de792784c328fb6a79535414b3ff279ddc4dccc8dd0c93c
 SHA512 
a7a7131fa0d04bbf63954e047c8db18fffd71e35650841d281b5f97ec23b8029324a187320a5b5f5abdc7da2ec44c2a757e4a67db22e17bbcc069756e59959d9
+DIST prusaslicer-2.9.2.tar.gz 76992191 BLAKE2B 
ac88d2549baeb896137f85531eabe8e3c87b2998766e9f21d5e10be62fd421d821d2e66a818462c26fd20105fa3589e5396300f8795f0f97cbf26d11d25dd1bf
 SHA512 
f43d6c2e639f029f91e722bcbac7db993ff4df69a850421e9acac4165bafeeb7f765a9ecab88d5bd5221524b3fbce78ae84f62d290a406406fd75644811440c1

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild
new file mode 100644
index ..ddb4522b2ddc
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.2.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2025 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
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
+else
+   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+fi
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+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:=
+   net-libs/webkit-gtk:4.1
+   sci-libs/libigl
+   sci-libs/nlopt
+   sci-libs/opencascade:=
+   sci-mathematics/cgal:=
+   sci-mathematics/z3:=
+   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,webkit]
+   media-libs/nanosvg:=
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+   test? ( =dev-cpp/catch-2* )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
+   "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
+   "${FILESDIR}/${PN}-2.8.1-fstream.patch"
+   "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
+   "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
+)
+
+src_prepare() {
+   if has_version ">=sci-libs/opencascade-7.8.0"; then
+   eapply "${FILESDIR}/prusaslicer-2.8.1-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.[0-9] 
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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-04-10 Thread Miroslav Šulc
commit: d897dae163d90554b0756c16d3684abfd6c9760d
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Apr 10 16:19:30 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Apr 10 16:19:39 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d897dae1

media-gfx/prusaslicer: dropped obsolete 2.9.0

Closes: https://bugs.gentoo.org/944289
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 -
 media-gfx/prusaslicer/prusaslicer-2.9.0.ebuild | 113 -
 2 files changed, 114 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 39ed9b367029..76a7738463e8 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,4 +1,3 @@
 DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B 
dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453
 SHA512 
0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8dab19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912
-DIST prusaslicer-2.9.0.tar.gz 70604482 BLAKE2B 
14480ad6e4257d052e65f7158e14e6eb57f2e51c5c7ce3a6545b36a47007cb528aa38a1ff00eacd70374dfaef4ba7efd185dd5add1a6807f79148a124320126a
 SHA512 
554099ba827f8b4af37727d4e99ad6b2f339c530f35a4f8e63f0c5aaf455a5fc3261b983939c487f76964c522ea8ecd13527efea7f881749f907a039cfe7ef89
 DIST prusaslicer-2.9.1.tar.gz 76767199 BLAKE2B 
0aaf606f25b449f6787905edc06c15cf89e78fa1bc51db2f1fd9e54cc5d1285be9cbe5232e98bdd24de792784c328fb6a79535414b3ff279ddc4dccc8dd0c93c
 SHA512 
a7a7131fa0d04bbf63954e047c8db18fffd71e35650841d281b5f97ec23b8029324a187320a5b5f5abdc7da2ec44c2a757e4a67db22e17bbcc069756e59959d9
 DIST prusaslicer-2.9.2.tar.gz 76992191 BLAKE2B 
ac88d2549baeb896137f85531eabe8e3c87b2998766e9f21d5e10be62fd421d821d2e66a818462c26fd20105fa3589e5396300f8795f0f97cbf26d11d25dd1bf
 SHA512 
f43d6c2e639f029f91e722bcbac7db993ff4df69a850421e9acac4165bafeeb7f765a9ecab88d5bd5221524b3fbce78ae84f62d290a406406fd75644811440c1

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.0.ebuild
deleted file mode 100644
index 2f4ebe6ec2af..
--- a/media-gfx/prusaslicer/prusaslicer-2.9.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2025 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
-
-if [[ ${PV} == ** ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
-else
-   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
-   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-fi
-
-DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
-HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
-
-LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
-SLOT="0"
-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:=
-   net-libs/webkit-gtk:4.1
-   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,webkit]
-   media-libs/nanosvg:=
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-   test? ( =dev-cpp/catch-2* )
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
-   "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
-   "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
-   "${FILESDIR}/${PN}-2.8.1-fstream.patch"
-   "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
-   "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
-   "${FILESDIR}/${PN}-2.9.0-missing-includes.patch"
-   "${FILESDIR}/${PN}-2.9.0-arrange-static.patch"
-)
-
-src_prepare() {
-   if has_version ">=sci-libs/opencascade-7.8.0"; then
-   eapply "${FILESDIR}/prusaslicer-2.8.1-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.[0-9] 
REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
-   src/occt_wrapper/CMakeLists.txt || die
-
-   cmake_src_prepare
-}
-
-src_configure() {
-   CMAKE_BUILD_TYPE="Release"
-
-   setup-wxwidget

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-03-11 Thread Miroslav Šulc
commit: f6c68c6ff9e12a479a829d8c686ee7790fd7691f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Mar 11 18:49:34 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Mar 11 18:49:44 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6c68c6f

media-gfx/prusaslicer: bump to 2.9.1

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 +
 media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild | 111 +
 2 files changed, 112 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 4e2171fa73fb..4778d455350d 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1,3 @@
 DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B 
dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453
 SHA512 
0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8dab19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912
 DIST prusaslicer-2.9.0.tar.gz 70604482 BLAKE2B 
14480ad6e4257d052e65f7158e14e6eb57f2e51c5c7ce3a6545b36a47007cb528aa38a1ff00eacd70374dfaef4ba7efd185dd5add1a6807f79148a124320126a
 SHA512 
554099ba827f8b4af37727d4e99ad6b2f339c530f35a4f8e63f0c5aaf455a5fc3261b983939c487f76964c522ea8ecd13527efea7f881749f907a039cfe7ef89
+DIST prusaslicer-2.9.1.tar.gz 76767199 BLAKE2B 
0aaf606f25b449f6787905edc06c15cf89e78fa1bc51db2f1fd9e54cc5d1285be9cbe5232e98bdd24de792784c328fb6a79535414b3ff279ddc4dccc8dd0c93c
 SHA512 
a7a7131fa0d04bbf63954e047c8db18fffd71e35650841d281b5f97ec23b8029324a187320a5b5f5abdc7da2ec44c2a757e4a67db22e17bbcc069756e59959d9

diff --git a/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild
new file mode 100644
index ..ddb4522b2ddc
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.9.1.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2025 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
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
+else
+   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+fi
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+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:=
+   net-libs/webkit-gtk:4.1
+   sci-libs/libigl
+   sci-libs/nlopt
+   sci-libs/opencascade:=
+   sci-mathematics/cgal:=
+   sci-mathematics/z3:=
+   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,webkit]
+   media-libs/nanosvg:=
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+   test? ( =dev-cpp/catch-2* )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
+   "${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
+   "${FILESDIR}/${PN}-2.8.1-fstream.patch"
+   "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
+   "${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
+)
+
+src_prepare() {
+   if has_version ">=sci-libs/opencascade-7.8.0"; then
+   eapply "${FILESDIR}/prusaslicer-2.8.1-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.[0-9] 
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_tes

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-02-18 Thread Miroslav Šulc
commit: c406480a5fd50b8ddc21ea4d0bee76370506b1b1
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Feb 19 04:24:20 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Feb 19 04:24:20 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c406480a

media-gfx/prusaslicer: updated live

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 17e3bd5a3e47..ddb4522b2ddc 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -48,7 +48,7 @@ RDEPEND="
sci-libs/nlopt
sci-libs/opencascade:=
sci-mathematics/cgal:=
-   sci-mathematics/z3
+   sci-mathematics/z3:=
sys-apps/dbus
sys-libs/zlib:=
virtual/opengl



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2025-02-18 Thread Miroslav Šulc
commit: 44cd0a689070376b12a08eec7fcf2b2a078e39fa
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Feb 19 04:05:25 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Feb 19 04:05:36 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44cd0a68

media-gfx/prusaslicer: updated live

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 2f4ebe6ec2af..17e3bd5a3e47 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -48,6 +48,7 @@ RDEPEND="
sci-libs/nlopt
sci-libs/opencascade:=
sci-mathematics/cgal:=
+   sci-mathematics/z3
sys-apps/dbus
sys-libs/zlib:=
virtual/opengl
@@ -62,13 +63,10 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
-   "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
"${FILESDIR}/${PN}-2.8.1-fstream.patch"
"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
"${FILESDIR}/${PN}-2.8.1-boost-1.87.patch"
-   "${FILESDIR}/${PN}-2.9.0-missing-includes.patch"
-   "${FILESDIR}/${PN}-2.9.0-arrange-static.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2025-01-03 Thread Miroslav Šulc
commit: e54c7174db82aa7dad34dfd6f521a680fc885787
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Jan  3 14:43:11 2025 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jan  3 14:43:11 2025 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54c7174

media-gfx/prusaslicer: bump to 2.9.0

Closes: https://bugs.gentoo.org/946720
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 .../files/prusaslicer-2.9.0-arrange-static.patch   | 46 +
 .../files/prusaslicer-2.9.0-fpic-all.patch | 18 ---
 .../prusaslicer/files/prusaslicer-2.9.0-fpic.patch | 57 --
 .../prusaslicer-2.9.0-slic3r-arrange-wrapper.patch | 18 ---
 .../files/prusaslicer-2.9.0-slic3r-arrange.patch   | 18 ---
 ...slicer-.ebuild => prusaslicer-2.9.0.ebuild} |  8 ++-
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  8 ++-
 8 files changed, 53 insertions(+), 121 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 070d14534a75..4e2171fa73fb 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1 +1,2 @@
 DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B 
dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453
 SHA512 
0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8dab19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912
+DIST prusaslicer-2.9.0.tar.gz 70604482 BLAKE2B 
14480ad6e4257d052e65f7158e14e6eb57f2e51c5c7ce3a6545b36a47007cb528aa38a1ff00eacd70374dfaef4ba7efd185dd5add1a6807f79148a124320126a
 SHA512 
554099ba827f8b4af37727d4e99ad6b2f339c530f35a4f8e63f0c5aaf455a5fc3261b983939c487f76964c522ea8ecd13527efea7f881749f907a039cfe7ef89

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch
new file mode 100644
index ..6bc8af73d03a
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-arrange-static.patch
@@ -0,0 +1,46 @@
+From a7c15a3ae9877dcf7da8c8fd80de8b128251db2b Mon Sep 17 00:00:00 2001
+From: Yuri D'Elia 
+Date: Fri, 3 Jan 2025 00:07:50 +0100
+Subject: [PATCH] Build libslic3r-arrange/wrapper as static
+
+Fix build on linux without SLIC3R_STATIC (these are for internal use
+only).
+
+- Avoids the need for installation (fixes
+  https://github.com/prusa3d/PrusaSlicer/pull/13812)
+- Fixes build without PIC (fixes
+  https://github.com/prusa3d/PrusaSlicer/pull/13810,
+  https://github.com/prusa3d/PrusaSlicer/issues/13694), which would
+  still result in broken behavior (duplicate static initialization
+  crashing on startup).
+---
+ src/slic3r-arrange-wrapper/CMakeLists.txt | 2 +-
+ src/slic3r-arrange/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/slic3r-arrange-wrapper/CMakeLists.txt 
b/src/slic3r-arrange-wrapper/CMakeLists.txt
+index 3f723e5aed1..34b64fc2969 100644
+--- a/src/slic3r-arrange-wrapper/CMakeLists.txt
 b/src/slic3r-arrange-wrapper/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ project(slic3r-arrange-wrapper)
+ cmake_minimum_required(VERSION 3.13)
+ 
+-add_library(slic3r-arrange-wrapper
++add_library(slic3r-arrange-wrapper STATIC
+ include/arrange-wrapper/Arrange.hpp
+ include/arrange-wrapper/ArrangeSettingsDb_AppCfg.hpp
+ include/arrange-wrapper/ArrangeSettingsView.hpp
+diff --git a/src/slic3r-arrange/CMakeLists.txt 
b/src/slic3r-arrange/CMakeLists.txt
+index 98ab2470535..36a54ca5985 100644
+--- a/src/slic3r-arrange/CMakeLists.txt
 b/src/slic3r-arrange/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ project(slic3r-arrange)
+ cmake_minimum_required(VERSION 3.13)
+ 
+-add_library(slic3r-arrange
++add_library(slic3r-arrange STATIC
+ include/arrange/Beds.hpp
+ include/arrange/ArrangeItemTraits.hpp
+ include/arrange/PackingContext.hpp

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch
deleted file mode 100644
index f71a5b988424..
--- a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From a48acef85b34b52085378b8ee39a79f7eaeac0fa Mon Sep 17 00:00:00 2001
-From: Andreas Schneider 
-Date: Fri, 20 Dec 2024 20:49:23 +0100
-Subject: [PATCH] cmake: Turn on position independent code for all targets
-
-Fixes: #13694
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,6 +1,9 @@
- cmake_minimum_required(VERSION 3.13)
- project(PrusaSlicer-native)
- 
-+# This enables -fPIC for shared libaries and -fpie for binaries
-+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+
- add_subdirectory(clipper)
- find_package(Qhull 7.2 REQUIRED)
- add_library(qhull INTERFACE)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch
deleted file mode 100644
index ea6e

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2024-12-25 Thread Sam James
commit: 79c6e09fd3934821efa1b2c2b53d6b84d5106664
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 26 07:20:23 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 26 07:20:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79c6e09f

media-gfx/prusaslicer: fix build w/ boost-1.87

Closes: https://bugs.gentoo.org/946495
Thanks-to: Attila Tóth  atoth.sote.hu>
Signed-off-by: Sam James  gentoo.org>

 .../files/prusaslicer-2.8.1-boost-1.87.patch   | 374 +
 media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild  |   1 +
 2 files changed, 375 insertions(+)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch
new file mode 100644
index ..7666c26800ae
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-boost-1.87.patch
@@ -0,0 +1,374 @@
+https://bugs.gentoo.org/946495
+https://github.com/prusa3d/PrusaSlicer/issues/13799
+
+diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp 
PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp
+--- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.cpp   
2024-12-21 11:52:03.612595066 +0100
 PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.cpp   
2024-12-21 12:34:03.859507724 +0100
+@@ -113,7 +113,7 @@ GCodeSender::connect(std::string devname
+ this->io.post(boost::bind(&GCodeSender::do_read, this));
+ 
+ // start reading in the background thread
+-boost::thread t(boost::bind(&boost::asio::io_service::run, &this->io));
++boost::thread t(boost::bind(&boost::asio::io_context::run, &this->io));
+ this->background_thread.swap(t);
+ 
+ // always send a M105 to check for connection because firmware might be 
silent on connect
+diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp 
PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp
+--- PrusaSlicer-version_2.8.1-orig/src/libslic3r/GCodeSender.hpp   
2024-12-21 11:52:03.612595066 +0100
 PrusaSlicer-version_2.8.1-dwok/src/libslic3r/GCodeSender.hpp   
2024-12-21 12:34:26.163427521 +0100
+@@ -40,7 +40,7 @@ class GCodeSender : private boost::nonco
+ void reset();
+ 
+ private:
+-asio::io_service io;
++asio::io_context io;
+ asio::serial_port serial;
+ boost::thread background_thread;
+ boost::asio::streambuf read_buffer, write_buffer;
+diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp 
PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp
+--- PrusaSlicer-version_2.8.1-orig/src/slic3r/GUI/FirmwareDialog.cpp   
2024-12-21 11:52:03.632594994 +0100
 PrusaSlicer-version_2.8.1-dwok/src/slic3r/GUI/FirmwareDialog.cpp   
2024-12-21 12:33:40.507591681 +0100
+@@ -429,7 +429,7 @@ void FirmwareDialog::priv::avr109_wait_f
+ 
+ void FirmwareDialog::priv::avr109_reboot(const SerialPortInfo &port)
+ {
+-  asio::io_service io;
++  asio::io_context io;
+   Serial serial(io, port.port, 1200);
+   std::this_thread::sleep_for(std::chrono::milliseconds(50));
+ }
+diff '--color=auto' -urNp 
PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp 
PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp
+--- PrusaSlicer-version_2.8.1-orig/src/slic3r/Utils/Bonjour.cpp
2024-12-21 11:52:03.644594950 +0100
 PrusaSlicer-version_2.8.1-dwok/src/slic3r/Utils/Bonjour.cpp
2024-12-21 12:47:16.560667015 +0100
+@@ -624,11 +624,11 @@ UdpSession::UdpSession(Bonjour::ReplyFn
+   buffer.resize(DnsMessage::MAX_SIZE);
+ }
+ 
+-UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& 
multicast_address, const asio::ip::address& interface_address, std::shared_ptr< 
boost::asio::io_service > io_service)
++UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& 
multicast_address, const asio::ip::address& interface_address, std::shared_ptr< 
boost::asio::io_context > io_context)
+   : replyfn(replyfn)
+   , multicast_address(multicast_address)
+-  , socket(*io_service)
+-  , io_service(io_service)
++  , socket(*io_context)
++  , io_context(io_context)
+ {
+   try {
+   // open socket
+@@ -658,11 +658,11 @@ UdpSocket::UdpSocket( Bonjour::ReplyFn r
+ }
+ 
+ 
+-UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& 
multicast_address, std::shared_ptr< boost::asio::io_service > io_service)
++UdpSocket::UdpSocket( Bonjour::ReplyFn replyfn, const asio::ip::address& 
multicast_address, std::shared_ptr< boost::asio::io_context > io_context)
+   : replyfn(replyfn)
+   , multicast_address(multicast_address)
+-  , socket(*io_service)
+-  , io_service(io_service)
++  , socket(*io_context)
++  , io_context(io_context)
+ {
+   try {
+   // open socket
+@@ -714,7 +714,7 @@ void UdpSocket::receive_handler

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-12-21 Thread Miroslav Šulc
commit: 20a41a5254279019654bd2fddb2f77d04ac4441f
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Dec 21 11:36:29 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Dec 21 11:38:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20a41a52

media-gfx/prusaslicer: updated fpic patches in live

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch | 18 ++
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  1 +
 2 files changed, 19 insertions(+)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch
new file mode 100644
index ..f71a5b988424
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic-all.patch
@@ -0,0 +1,18 @@
+From a48acef85b34b52085378b8ee39a79f7eaeac0fa Mon Sep 17 00:00:00 2001
+From: Andreas Schneider 
+Date: Fri, 20 Dec 2024 20:49:23 +0100
+Subject: [PATCH] cmake: Turn on position independent code for all targets
+
+Fixes: #13694
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -1,6 +1,9 @@
+ cmake_minimum_required(VERSION 3.13)
+ project(PrusaSlicer-native)
+ 
++# This enables -fPIC for shared libaries and -fpie for binaries
++set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++
+ add_subdirectory(clipper)
+ find_package(Qhull 7.2 REQUIRED)
+ add_library(qhull INTERFACE)

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 8e52edaf8502..2fcf6ded9e4e 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
"${FILESDIR}/${PN}-2.9.0-missing-includes.patch"
"${FILESDIR}/${PN}-2.9.0-fpic.patch"
+   "${FILESDIR}/${PN}-2.9.0-fpic-all.patch"
"${FILESDIR}/${PN}-2.9.0-slic3r-arrange.patch"
"${FILESDIR}/${PN}-2.9.0-slic3r-arrange-wrapper.patch"
 )



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-12-21 Thread Miroslav Šulc
commit: 84aefe3dc364492e74951b13ae62c8e63faf55dc
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Dec 21 08:03:00 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Dec 21 08:03:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84aefe3d

media-gfx/prusaslicer: updated live ebuild

Bug: https://bugs.gentoo.org/946720
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.9.0-missing-includes.patch | 10 ++
 .../prusaslicer-2.9.0-slic3r-arrange-wrapper.patch | 18 ++
 .../files/prusaslicer-2.9.0-slic3r-arrange.patch   | 18 ++
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  4 +++-
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-missing-includes.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-missing-includes.patch
new file mode 100644
index ..d6b1fd097a40
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-missing-includes.patch
@@ -0,0 +1,10 @@
+--- a/src/slic3r/GUI/UserAccountCommunication.cpp
 b/src/slic3r/GUI/UserAccountCommunication.cpp
+@@ -13,6 +13,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange-wrapper.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange-wrapper.patch
new file mode 100644
index ..a5a77d8fc370
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange-wrapper.patch
@@ -0,0 +1,18 @@
+From 09c89be8732d4b11f64980c7ac5368cd506847dd Mon Sep 17 00:00:00 2001
+From: Andreas Schneider 
+Date: Fri, 20 Dec 2024 20:15:51 +0100
+Subject: [PATCH] cmake: Install slic3r-arrange-wrapper
+
+Fixes #13805
+--- a/src/slic3r-arrange-wrapper/CMakeLists.txt
 b/src/slic3r-arrange-wrapper/CMakeLists.txt
+@@ -33,3 +33,9 @@ add_library(slic3r-arrange-wrapper
+ target_include_directories(slic3r-arrange-wrapper PRIVATE src)
+ target_include_directories(slic3r-arrange-wrapper PUBLIC include)
+ target_link_libraries(slic3r-arrange-wrapper PUBLIC slic3r-arrange)
++
++if (WIN32)
++install(TARGETS slic3r-arrange-wrapper LIBRARY DESTINATION 
${CMAKE_INSTALL_PREFIX})
++else()
++install(TARGETS slic3r-arrange-wrapper LIBRARY DESTINATION 
${CMAKE_INSTALL_LIBDIR})
++endif()

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange.patch
new file mode 100644
index ..7198d11f7464
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-slic3r-arrange.patch
@@ -0,0 +1,18 @@
+From 5f450dc269ff99af3f0e056ae4b30d254789500b Mon Sep 17 00:00:00 2001
+From: Andreas Schneider 
+Date: Fri, 20 Dec 2024 20:14:52 +0100
+Subject: [PATCH] cmake: Install slic3r-arrange
+
+Fixes #13805
+--- a/src/slic3r-arrange/CMakeLists.txt
 b/src/slic3r-arrange/CMakeLists.txt
+@@ -32,3 +32,9 @@ add_library(slic3r-arrange
+ target_include_directories(slic3r-arrange PRIVATE src)
+ target_include_directories(slic3r-arrange PUBLIC include)
+ target_link_libraries(slic3r-arrange PUBLIC libslic3r)
++
++if (WIN32)
++install(TARGETS slic3r-arrange LIBRARY DESTINATION 
${CMAKE_INSTALL_PREFIX})
++else()
++install(TARGETS slic3r-arrange LIBRARY DESTINATION 
${CMAKE_INSTALL_LIBDIR})
++endif()

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 1832088d5630..8e52edaf8502 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -62,12 +62,14 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
-   "${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
"${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
"${FILESDIR}/${PN}-2.8.1-fstream.patch"
"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
+   "${FILESDIR}/${PN}-2.9.0-missing-includes.patch"
"${FILESDIR}/${PN}-2.9.0-fpic.patch"
+   "${FILESDIR}/${PN}-2.9.0-slic3r-arrange.patch"
+   "${FILESDIR}/${PN}-2.9.0-slic3r-arrange-wrapper.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2024-12-15 Thread Miroslav Šulc
commit: 23c799f0abc279ba8fca2f2b4edbc7d9fdfbbd63
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Dec 15 14:24:44 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Dec 15 14:24:55 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23c799f0

media-gfx/prusaslicer: updated live ebuild

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../prusaslicer/files/prusaslicer-2.9.0-fpic.patch | 57 ++
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  5 +-
 2 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch
new file mode 100644
index ..ea6e297e96db
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.9.0-fpic.patch
@@ -0,0 +1,57 @@
+--- a/bundled_deps/admesh/CMakeLists.txt
 b/bundled_deps/admesh/CMakeLists.txt
+@@ -14,3 +14,4 @@ add_library(admesh STATIC
+ target_include_directories(admesh PUBLIC .)
+ target_link_libraries(admesh PRIVATE boost_headeronly localesutils)
+ target_link_libraries(admesh PUBLIC Eigen3::Eigen)
++set_target_properties(admesh PROPERTIES POSITION_INDEPENDENT_CODE ON)
+--- a/bundled_deps/glu-libtess/CMakeLists.txt
 b/bundled_deps/glu-libtess/CMakeLists.txt
+@@ -34,3 +34,4 @@ if(UNIX)
+ endif(UNIX)
+ 
+ target_include_directories(glu-libtess PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} 
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include)
++set_target_properties(glu-libtess PROPERTIES POSITION_INDEPENDENT_CODE ON)
+--- a/bundled_deps/miniz/CMakeLists.txt
 b/bundled_deps/miniz/CMakeLists.txt
+@@ -7,6 +7,7 @@ add_library(miniz_static STATIC
+ miniz.c
+ miniz.h
+ )
++set_target_properties(miniz_static PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ 
+ if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU")
+ target_compile_definitions(miniz_static PRIVATE _GNU_SOURCE)
+--- a/bundled_deps/CMakeLists.txt
 b/bundled_deps/CMakeLists.txt
+@@ -33,6 +33,7 @@ add_library(localesutils STATIC
+ )
+ target_include_directories(localesutils PUBLIC localesutils)
+ target_link_libraries(localesutils PRIVATE fastfloat)
++set_target_properties(localesutils PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ 
+ add_library(ankerl INTERFACE)
+ target_include_directories(ankerl INTERFACE ankerl)
+--- a/src/libslic3r/CMakeLists.txt
 b/src/libslic3r/CMakeLists.txt
+@@ -532,6 +532,7 @@ add_library(libslic3r_cgal STATIC
+ TryCatchSignal.hpp TryCatchSignal.cpp
+ Triangulation.hpp Triangulation.cpp
+ )
++set_target_properties(libslic3r_cgal PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ target_include_directories(libslic3r_cgal PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+ target_include_directories(libslic3r_cgal PUBLIC 
${CMAKE_CURRENT_SOURCE_DIR}/..)
+ 
+@@ -622,3 +623,5 @@ endif ()
+ if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
+ add_precompiled_header(libslic3r pchheader.hpp FORCEINCLUDE)
+ endif ()
++
++set_target_properties(libslic3r PROPERTIES POSITION_INDEPENDENT_CODE ON)
+--- a/src/clipper/CMakeLists.txt
 b/src/clipper/CMakeLists.txt
+@@ -12,3 +12,4 @@ add_library(clipper STATIC
+ target_link_libraries(clipper PRIVATE TBB::tbb TBB::tbbmalloc int128)
+ target_link_libraries(clipper PUBLIC Eigen3::Eigen)
+ target_include_directories(clipper PUBLIC .)
++set_target_properties(clipper PROPERTIES POSITION_INDEPENDENT_CODE ON)

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 66c1089c97e8..1832088d5630 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -64,10 +64,10 @@ PATCHES=(
"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
"${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
-   "${FILESDIR}/${PN}-2.8.1-fixed-linking.patch"
"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
"${FILESDIR}/${PN}-2.8.1-fstream.patch"
"${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
+   "${FILESDIR}/${PN}-2.9.0-fpic.patch"
 )
 
 src_prepare() {
@@ -80,9 +80,6 @@ src_prepare() {
sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] 
REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
src/occt_wrapper/CMakeLists.txt || die
 
-   # remove broken cmake find file: 
https://github.com/prusa3d/PrusaSlicer/issues/13608
-   rm cmake/modules/FindEigen3.cmake || die
-
cmake_src_prepare
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-11-21 Thread Miroslav Šulc
commit: 1b8e1f97640c55ecf980d43666885c49785d9383
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Nov 21 08:44:26 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Nov 21 08:49:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b8e1f97

media-gfx/prusaslicer: fixes and improvements

improved handling of eigen3
(thanks to jmickelin: https://github.com/prusa3d/PrusaSlicer/issues/13608)
fixed libsoup double linking
(thanks to Alexander Golubev  gmail.com>)

Closes: https://github.com/gentoo/gentoo/pull/39379
Closes: https://bugs.gentoo.org/940182
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...saslicer-2.8.1-fix-libsoup-double-linking.patch | 11 ++
 .../files/prusaslicer-2.8.1-fixed-linking.patch| 25 --
 ...er-2.8.1.ebuild => prusaslicer-2.8.1-r1.ebuild} |  6 --
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  6 --
 4 files changed, 19 insertions(+), 29 deletions(-)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch
 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch
new file mode 100644
index ..dbb0aa36727a
--- /dev/null
+++ 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fix-libsoup-double-linking.patch
@@ -0,0 +1,11 @@
+--- a/src/slic3r/CMakeLists.txt
 b/src/slic3r/CMakeLists.txt
+@@ -465,7 +465,7 @@ if (UNIX AND NOT APPLE)
+ find_package(GTK${SLIC3R_GTK} REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ 
+-pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.0 
webkit2gtk-4.1)
++pkg_search_module(WEBKIT2GTK REQUIRED IMPORTED_TARGET webkit2gtk-4.1)
+ target_link_libraries(libslic3r_gui PUBLIC ${GTK${SLIC3R_GTK}_LIBRARIES} 
fontconfig PkgConfig::WEBKIT2GTK)
+ endif ()
+ 

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
index b7fc95554591..9d387a07993d 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fixed-linking.patch
@@ -1,28 +1,3 @@
 a/bundled_deps/admesh/CMakeLists.txt
-+++ b/bundled_deps/admesh/CMakeLists.txt
-@@ -13,4 +13,3 @@ add_library(admesh STATIC
- 
- target_include_directories(admesh PUBLIC .)
- target_link_libraries(admesh PRIVATE boost_headeronly localesutils)
--target_link_libraries(admesh PUBLIC Eigen3::Eigen)
 a/src/clipper/CMakeLists.txt
-+++ b/src/clipper/CMakeLists.txt
-@@ -10,5 +10,4 @@ add_library(clipper STATIC
- )
- 
- target_link_libraries(clipper PRIVATE TBB::tbb TBB::tbbmalloc int128)
--target_link_libraries(clipper PUBLIC Eigen3::Eigen)
- target_include_directories(clipper PUBLIC .)
 a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -629,7 +629,6 @@ target_link_libraries(libslic3r PRIVATE
- int128
- )
- target_link_libraries(libslic3r PUBLIC
--Eigen3::Eigen
- semver
- admesh
- localesutils
 --- a/src/slic3r/CMakeLists.txt
 +++ b/src/slic3r/CMakeLists.txt
 @@ -383,6 +383,7 @@ set(SLIC3R_GUI_SOURCES

diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild
similarity index 92%
rename from media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild
index ee32a6be8059..6b3be9ea12e5 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.1-r1.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
media-libs/qhull:=
+   net-libs/webkit-gtk:4.1
sci-libs/libigl
sci-libs/nlopt
sci-libs/opencascade:=
@@ -66,6 +67,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.8.1-fixed-linking.patch"
"${FILESDIR}/${PN}-2.8.1-cgal-6.0.patch"
"${FILESDIR}/${PN}-2.8.1-fstream.patch"
+   "${FILESDIR}/${PN}-2.8.1-fix-libsoup-double-linking.patch"
 )
 
 src_prepare() {
@@ -78,8 +80,8 @@ src_prepare() {
sed -i -e 's/find_package(OpenCASCADE 7.6.[0-9] 
REQUIRED)/find_package(OpenCASCADE REQUIRED)/g' \
src/occt_wrapper/CMakeLists.txt || die
 
-   find . -type f \( -name '*.cpp' -o -name '*.h' -o -name '*.hpp' \) 
-exec \
-   sed -i 's|#include https://github.com/prusa3d/PrusaSlicer/issues/13608
+   rm cmake/modules/FindEigen3.cmake || die
 
cmake_src_prepare
 }

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index fbf13e9d7d66..66c1089c97e8 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -43,6 +43,7 @@ RDEPEND="
media-libs/libjpeg-turbo:=
media-libs/libpng:0=
media-libs/qhull:=
+   net-libs/webkit-gtk:4.1
sci-libs/libigl
sci-libs/nlopt
sci-libs/opencascade:=
@@ -66,6 +67,7 @@ PATCHES=(

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-11-21 Thread Miroslav Šulc
commit: 3420ec3f1586db787474cf15a617bedcc15580a8
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Nov 21 08:02:56 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Nov 21 08:49:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3420ec3f

media-gfx/prusaslicer: dropped obsolete 2.8.0-r1

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 -
 .../prusaslicer-2.7.2-opencascade-7.8.0.patch  |  16 --
 .../files/prusaslicer-2.8.0-cgal-6.0.patch | 189 -
 .../files/prusaslicer-2.8.0-fixed-linking.patch|  19 ---
 media-gfx/prusaslicer/prusaslicer-2.8.0-r1.ebuild  | 108 
 5 files changed, 333 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index a1d14e59d466..070d14534a75 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1 @@
-DIST prusaslicer-2.8.0.tar.gz 69806919 BLAKE2B 
b87c63ae411814dbffc8ae96c243bf06018d600db732ef32f7c766ce6bdf156b0aca6da90868482f39b9c6421c6a386bccc9f69e23218dadc07f1bcdb21b9793
 SHA512 
d98b43e9e1a6da9cbab46b2564da02fc0f8521d84a4df915d0ffd0878ee1a25afebe7078e38b124ec8565782379c51a7f9564462652ef1a7d9819d29297c1937
 DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B 
dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453
 SHA512 
0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8dab19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
deleted file mode 100644
index 296c0366e34a..
--- a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
+++ /dev/null
@@ -1,16 +0,0 @@
 a/src/occt_wrapper/CMakeLists.txt
-+++ b/src/occt_wrapper/CMakeLists.txt
-@@ -22,11 +22,8 @@ generate_export_header(OCCTWrapper)
- find_package(OpenCASCADE REQUIRED)
- 
- set(OCCT_LIBS
--TKXDESTEP
--TKSTEP
--TKSTEP209
--TKSTEPAttr
--TKSTEPBase
-+TKDESTEP
-+TKDESTL
- TKXCAF
- TKXSBase
- TKVCAF

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
deleted file mode 100644
index 52013146b1c3..
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From a9283c62cec2b802aa2133c92b7ff5bf320c0bb6 Mon Sep 17 00:00:00 2001
-From: Laurent Rineau 
-Date: Sat, 13 Jul 2024 01:19:21 +0200
-Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x)
-
 a/src/libslic3r/CutSurface.cpp
-+++ b/src/libslic3r/CutSurface.cpp
-@@ -4,6 +4,14 @@
- ///|/
- #include "CutSurface.hpp"
- 
-+template 
-+auto access_pmap(std::optional opt) -> T {
-+return opt.value();
-+}
-+
-+template 
-+auto access_pmap(Pair pair) { return pair.first; }
-+
- /// models_input.obj - Check transormation of model to each others
- /// projection_center.obj - circle representing center of projection with 
correct distance
- /// {M} .. model index
-@@ -33,6 +41,7 @@ using namespace Slic3r;
- #include 
- #include 
- #include 
-+#include 
- #include 
- 
- // libslic3r
-@@ -997,8 +1006,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons  &shapes,
- if (shapes.empty()) return {};
- 
- CutMesh result;
--EdgeShapeMap edge_shape_map = result.add_property_map(edge_shape_map_name).first;
--FaceShapeMap face_shape_map = result.add_property_map(face_shape_map_name).first;
-+EdgeShapeMap edge_shape_map  = access_pmap((result.add_property_map(edge_shape_map_name)));
-+FaceShapeMap face_shape_map  = access_pmap((result.add_property_map(face_shape_map_name)));
- 
- std::vector indices;
- auto insert_contour = [&projection, &indices, &result, 
-@@ -1408,17 +1417,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh 
   &cgal_model,
-const ExPolygonsIndices &s2i)
- {
- // pointer to edge or face shape_map
--VertexShapeMap vert_shape_map = cgal_model.add_property_map(vert_shape_map_name, nullptr).first;
-+VertexShapeMap vert_shape_map  = 
access_pmap((cgal_model.add_property_map(vert_shape_map_name, nullptr)));
- 
- // detect anomalities in visitor.
- bool is_valid = true;
- // NOTE: map are created when convert shapes to cgal model
--const EdgeShapeMap& edge_shape_map = cgal_shape.property_map(edge_shape_map_name).first;
--const FaceShapeMap& face_shape_map = cgal_shape.property_map(face_shape_map_name).first;
-+const EdgeShapeMap& edge_shape_map  = 
access_pmap((cgal_shape.property_map(edge_shape_map_name)));
-+const FaceShapeMap& face_shape_map  = 
access_pmap((cgal_shape.property_map(face_shape_map_name)));
- Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-10-30 Thread Miroslav Šulc
commit: 4318b29a80317ea6e2959b7ef258b3b5cf843c19
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed Oct 30 11:47:57 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed Oct 30 11:47:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4318b29a

media-gfx/prusaslicer: amd64 stable

Closes: https://bugs.gentoo.org/942053
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
index fbf13e9d7d66..ee32a6be8059 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
 else

SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~x86"
S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-09-19 Thread Miroslav Šulc
commit: 1bd21a2a22e2f535b7959cf3fbc3aeadf1427ea0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Sep 19 11:42:23 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Sep 19 11:42:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bd21a2a

media-gfx/prusaslicer: bump to 2.8.1

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 +
 .../files/prusaslicer-2.8.1-fstream.patch  |  13 +--
 media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild | 113 +
 3 files changed, 117 insertions(+), 10 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 1d0a10b8a015..a1d14e59d466 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1 +1,2 @@
 DIST prusaslicer-2.8.0.tar.gz 69806919 BLAKE2B 
b87c63ae411814dbffc8ae96c243bf06018d600db732ef32f7c766ce6bdf156b0aca6da90868482f39b9c6421c6a386bccc9f69e23218dadc07f1bcdb21b9793
 SHA512 
d98b43e9e1a6da9cbab46b2564da02fc0f8521d84a4df915d0ffd0878ee1a25afebe7078e38b124ec8565782379c51a7f9564462652ef1a7d9819d29297c1937
+DIST prusaslicer-2.8.1.tar.gz 69409077 BLAKE2B 
dd3ee810ea00d03f1790386d1fe1fd044c038429700cd33f21299abdf5def12902f7a07c23aa3d2a6cfc5e18d1e2534080889d4a33beefb493a504978a742453
 SHA512 
0471fa579a494d66e6b49c0bc1a9fa91f3a5f9147d8b7fa8133c6f03391f8dab19ed222d1be44f6f22e2de3021f3fb839331e3c3ccdf5643caa8a61d6912

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch
index b4a92de67ab6..f550c53d3f42 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-fstream.patch
@@ -11,7 +11,7 @@
  
 --- a/src/slic3r/GUI/PresetArchiveDatabase.cpp
 +++ b/src/slic3r/GUI/PresetArchiveDatabase.cpp
-@@ -514,7 +514,7 @@ void PresetArchiveDatabase::load_app_manifest_json()
+@@ -515,7 +515,7 @@ void PresetArchiveDatabase::load_app_manifest_json()
if (!fs::exists(path, ec) || ec) {
copy_initial_manifest();
}
@@ -20,7 +20,7 @@
std::string data;
if (file.is_open()) {
std::string line;
-@@ -681,7 +681,7 @@ void PresetArchiveDatabase::save_app_manifest_json() const
+@@ -682,7 +682,7 @@ void PresetArchiveDatabase::save_app_manifest_json() const
data += "]";
  
std::string path = get_stored_manifest_path().string();
@@ -29,16 +29,9 @@
if (file.is_open()) {
file << data;
file.close();
-@@ -916,4 +916,4 @@ void PresetArchiveDatabase::sync_blocking()
-   read_server_manifest(std::move(manifest));
- }
- 
--}} // Slic3r::GUI
-\ No newline at end of file
-+}} // Slic3r::GUI
 --- a/src/slic3r/Utils/Http.cpp
 +++ b/src/slic3r/Utils/Http.cpp
-@@ -301,7 +301,7 @@ void Http::priv::form_add_file(const char *name, const 
fs::path &path, const cha
+@@ -302,7 +302,7 @@ void Http::priv::form_add_file(const char *name, const 
fs::path &path, const cha
  //FIXME may throw! Is the caller aware of it?
  void Http::priv::set_post_body(const fs::path &path)
  {

diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
new file mode 100644
index ..fbf13e9d7d66
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.1.ebuild
@@ -0,0 +1,113 @@
+# 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
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
+else
+   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+fi
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+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,webkit]
+   media-libs/nanosvg:=
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+   t

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-09-13 Thread Miroslav Šulc
commit: 1866dd34bc4caf98b06e25d177f9cbc1b062e097
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Sep 13 10:58:22 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep 13 10:58:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1866dd34

media-gfx/prusaslicer: fixed live ebuild

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.8.0-cgal-6.0.patch |  6 ---
 ...-6.0.patch => prusaslicer-2.8.1-cgal-6.0.patch} | 44 +--
 .../files/prusaslicer-2.8.1-eigen3.patch   | 11 -
 .../files/prusaslicer-2.8.1-fixed-linking.patch| 37 +++-
 .../files/prusaslicer-2.8.1-fstream.patch  | 49 ++
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  8 ++--
 6 files changed, 108 insertions(+), 47 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
index 31c98bd75580..52013146b1c3 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
@@ -3,12 +3,6 @@ From: Laurent Rineau 
 Date: Sat, 13 Jul 2024 01:19:21 +0200
 Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x)
 

- src/libslic3r/CutSurface.cpp | 53 +---
- 1 file changed, 31 insertions(+), 22 deletions(-)
-
-diff --git a/src/libslic3r/CutSurface.cpp b/src/libslic3r/CutSurface.cpp
-index b2cf3d96596..5e66d41a8f1 100644
 --- a/src/libslic3r/CutSurface.cpp
 +++ b/src/libslic3r/CutSurface.cpp
 @@ -4,6 +4,14 @@

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch
similarity index 89%
copy from media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
copy to media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch
index 31c98bd75580..3aac479197bb 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal-6.0.patch
@@ -3,12 +3,8 @@ From: Laurent Rineau 
 Date: Sat, 13 Jul 2024 01:19:21 +0200
 Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x)
 

- src/libslic3r/CutSurface.cpp | 53 +---
- 1 file changed, 31 insertions(+), 22 deletions(-)
+updated for 2.8.1
 
-diff --git a/src/libslic3r/CutSurface.cpp b/src/libslic3r/CutSurface.cpp
-index b2cf3d96596..5e66d41a8f1 100644
 --- a/src/libslic3r/CutSurface.cpp
 +++ b/src/libslic3r/CutSurface.cpp
 @@ -4,6 +4,14 @@
@@ -26,15 +22,15 @@ index b2cf3d96596..5e66d41a8f1 100644
  /// models_input.obj - Check transormation of model to each others
  /// projection_center.obj - circle representing center of projection with 
correct distance
  /// {M} .. model index
-@@ -33,6 +41,7 @@ using namespace Slic3r;
+@@ -31,6 +39,7 @@ using namespace Slic3r;
  #include 
  #include 
  #include 
 +#include 
- #include 
- 
- // libslic3r
-@@ -997,8 +1006,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons  &shapes,
+ #include 
+ #include 
+ #include 
+@@ -1021,8 +1030,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons  &shapes,
  if (shapes.empty()) return {};
  
  CutMesh result;
@@ -45,7 +41,7 @@ index b2cf3d96596..5e66d41a8f1 100644
  
  std::vector indices;
  auto insert_contour = [&projection, &indices, &result, 
-@@ -1408,17 +1417,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh 
   &cgal_model,
+@@ -1432,17 +1441,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh 
   &cgal_model,
 const ExPolygonsIndices &s2i)
  {
  // pointer to edge or face shape_map
@@ -67,7 +63,7 @@ index b2cf3d96596..5e66d41a8f1 100644
  const auto &p = CGAL::parameters::visitor(visitor)
  .edge_is_constrained_map(ecm)
  .throw_on_self_intersection(false);
-@@ -1427,7 +1436,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh   
 &cgal_model,
+@@ -1451,7 +1460,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh   
 &cgal_model,
  
  if (!is_valid) return {};
  
@@ -76,7 +72,7 @@ index b2cf3d96596..5e66d41a8f1 100644
  
  // Select inside and outside face in model
  set_face_type(face_type_map, cgal_model, vert_shape_map, ecm, cgal_shape, 
s2i);
-@@ -1563,8 +1572,8 @@ void priv::collect_surface_data(std::queue  &process,
+@@ -1587,8 +1596,8 @@ void priv::collect_surface_data(std::queue  &process,
  
  void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh)
  {
@@ -87,7 +83,7 @@ index b2cf3d96596..5e66d41a8f1 100644
  
  // check if vertex was made by edge_2 which is diagonal of quad
  auto is_reducible_vertex = [&vert_shape_map](VI reduction_from) -> bool {
-@@ -1749,10 +1758,10 @@ priv::VDistances priv::calc_distances(const 
SurfacePatches &patches,
+@@ -1773,10 +1782,10 @@ priv::VDistances priv::calc_distances(const 
S

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2024-09-13 Thread Miroslav Šulc
commit: 5681a3ea5fd57a267ed634971decbad2970e27b0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Sep 13 09:19:53 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep 13 09:19:53 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5681a3ea

media-gfx/prusaslicer: fixed compilation with cgal 6.0

Closes: https://bugs.gentoo.org/937456
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.8.0-cgal-6.0.patch | 195 +
 .../prusaslicer/files/prusaslicer-2.8.1-cgal.patch |  84 -
 ...er-2.8.0.ebuild => prusaslicer-2.8.0-r1.ebuild} |   1 +
 media-gfx/prusaslicer/prusaslicer-.ebuild  |   2 +-
 4 files changed, 197 insertions(+), 85 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
new file mode 100644
index ..31c98bd75580
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-cgal-6.0.patch
@@ -0,0 +1,195 @@
+From a9283c62cec2b802aa2133c92b7ff5bf320c0bb6 Mon Sep 17 00:00:00 2001
+From: Laurent Rineau 
+Date: Sat, 13 Jul 2024 01:19:21 +0200
+Subject: [PATCH] compatibility with CGAL-6.0 (and 5.6.x)
+
+---
+ src/libslic3r/CutSurface.cpp | 53 +---
+ 1 file changed, 31 insertions(+), 22 deletions(-)
+
+diff --git a/src/libslic3r/CutSurface.cpp b/src/libslic3r/CutSurface.cpp
+index b2cf3d96596..5e66d41a8f1 100644
+--- a/src/libslic3r/CutSurface.cpp
 b/src/libslic3r/CutSurface.cpp
+@@ -4,6 +4,14 @@
+ ///|/
+ #include "CutSurface.hpp"
+ 
++template 
++auto access_pmap(std::optional opt) -> T {
++return opt.value();
++}
++
++template 
++auto access_pmap(Pair pair) { return pair.first; }
++
+ /// models_input.obj - Check transormation of model to each others
+ /// projection_center.obj - circle representing center of projection with 
correct distance
+ /// {M} .. model index
+@@ -33,6 +41,7 @@ using namespace Slic3r;
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ // libslic3r
+@@ -997,8 +1006,8 @@ priv::CutMesh priv::to_cgal(const ExPolygons  &shapes,
+ if (shapes.empty()) return {};
+ 
+ CutMesh result;
+-EdgeShapeMap edge_shape_map = result.add_property_map(edge_shape_map_name).first;
+-FaceShapeMap face_shape_map = result.add_property_map(face_shape_map_name).first;
++EdgeShapeMap edge_shape_map  = access_pmap((result.add_property_map(edge_shape_map_name)));
++FaceShapeMap face_shape_map  = access_pmap((result.add_property_map(face_shape_map_name)));
+ 
+ std::vector indices;
+ auto insert_contour = [&projection, &indices, &result, 
+@@ -1408,17 +1417,17 @@ priv::CutAOIs priv::cut_from_model(CutMesh 
   &cgal_model,
+const ExPolygonsIndices &s2i)
+ {
+ // pointer to edge or face shape_map
+-VertexShapeMap vert_shape_map = cgal_model.add_property_map(vert_shape_map_name, nullptr).first;
++VertexShapeMap vert_shape_map  = 
access_pmap((cgal_model.add_property_map(vert_shape_map_name, nullptr)));
+ 
+ // detect anomalities in visitor.
+ bool is_valid = true;
+ // NOTE: map are created when convert shapes to cgal model
+-const EdgeShapeMap& edge_shape_map = cgal_shape.property_map(edge_shape_map_name).first;
+-const FaceShapeMap& face_shape_map = cgal_shape.property_map(face_shape_map_name).first;
++const EdgeShapeMap& edge_shape_map  = 
access_pmap((cgal_shape.property_map(edge_shape_map_name)));
++const FaceShapeMap& face_shape_map  = 
access_pmap((cgal_shape.property_map(face_shape_map_name)));
+ Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map, 
vert_shape_map, &is_valid};
+ 
+ // a property map containing the constrained-or-not status of each edge
+-EdgeBoolMap ecm = cgal_model.add_property_map(is_constrained_edge_name, false).first;
++EdgeBoolMap ecm  = access_pmap((cgal_model.add_property_map(is_constrained_edge_name, false)));
+ const auto &p = CGAL::parameters::visitor(visitor)
+ .edge_is_constrained_map(ecm)
+ .throw_on_self_intersection(false);
+@@ -1427,7 +1436,7 @@ priv::CutAOIs priv::cut_from_model(CutMesh   
 &cgal_model,
+ 
+ if (!is_valid) return {};
+ 
+-FaceTypeMap face_type_map = cgal_model.add_property_map(face_type_map_name, FaceType::not_constrained).first;
++FaceTypeMap face_type_map  = access_pmap((cgal_model.add_property_map(face_type_map_name, FaceType::not_constrained)));
+ 
+ // Select inside and outside face in model
+ set_face_type(face_type_map, cgal_model, vert_shape_map, ecm, cgal_shape, 
s2i);
+@@ -1563,8 +1572,8 @@ void priv::collect_surface_data(std::queue  &process,
+ 
+ void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh)
+ {
+-const VertexShapeMap &vert_shape_map = mesh.property_map(vert_shape_map_name).first;
+-cons

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-09-13 Thread Miroslav Šulc
commit: a649fadef849ee3a6fb4e2c516aa6e2ee5eee1f5
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Sep 13 08:57:20 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Sep 13 08:57:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a649fade

media-gfx/prusaslicer: fixed compilation with wxgtk 3.2.5

Closes: https://bugs.gentoo.org/938508
Bug: https://bugs.gentoo.org/938508
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch  | 28 ++
 media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild |  1 +
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  1 +
 3 files changed, 30 insertions(+)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch
new file mode 100644
index ..d7c700662b72
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-wxwidgets-3.2.4.patch
@@ -0,0 +1,28 @@
+From f67a877d583eba5472003f0ea4df3f7420d70734 Mon Sep 17 00:00:00 2001
+From: Gregor Riepl 
+Date: Mon, 27 Nov 2023 13:01:55 +0100
+Subject: [PATCH] Make initializers explicit to avoid ambiguous wxArrayString
+ overloads
+
+--- a/src/slic3r/GUI/PhysicalPrinterDialog.cpp
 b/src/slic3r/GUI/PhysicalPrinterDialog.cpp
+@@ -606,7 +606,7 @@ void 
PhysicalPrinterDialog::build_printhost_settings(ConfigOptionsGroup* m_optgr
+ // Always fill in the "printhost_port" combo box from the config and 
select it.
+ {
+ Choice* choice = 
dynamic_cast(m_optgroup->get_field("printhost_port"));
+-choice->set_values({ m_config->opt_string("printhost_port") });
++choice->set_values(std::vector({ 
m_config->opt_string("printhost_port") }));
+ choice->set_selection();
+ }
+ 
+--- a/src/slic3r/GUI/Plater.cpp
 b/src/slic3r/GUI/Plater.cpp
+@@ -4048,7 +4048,7 @@ void Plater::load_project(const wxString& filename)
+ 
+ p->reset();
+ 
+-if (! load_files({ into_path(filename) }).empty()) {
++if (! load_files(std::vector({ 
into_path(filename) })).empty()) {
+ // At least one file was loaded.
+ p->set_project_filename(filename);
+ // Save the names of active presets and project specific config into 
ProjectDirtyStateManager.

diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
index ed23b287f530..b9b50e84c4d5 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
@@ -63,6 +63,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
"${FILESDIR}/${PN}-2.8.0-fixed-linking.patch"
+   "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
 )
 
 src_prepare() {

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index e1c44c35352b..4ecd39373186 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -62,6 +62,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
+   "${FILESDIR}/${PN}-2.8.0-wxwidgets-3.2.4.patch"
"${FILESDIR}/${PN}-2.8.1-fixed-linking.patch"
"${FILESDIR}/${PN}-2.8.1-eigen3.patch"
"${FILESDIR}/${PN}-2.8.1-cgal.patch"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2024-09-12 Thread Miroslav Šulc
commit: cc07fdfc6286c7066eacb8a73775337ec70fd130
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Sep 12 20:57:47 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Sep 12 20:58:04 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc07fdfc

media-gfx/prusaslicer: partially fixed live for 2.8.1 rc1

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../prusaslicer/files/prusaslicer-2.8.1-cgal.patch | 84 ++
 .../files/prusaslicer-2.8.1-eigen3.patch   | 11 +++
 .../files/prusaslicer-2.8.1-fixed-linking.patch| 10 +++
 .../prusaslicer-2.8.1-opencascade-7.8.0.patch  | 20 ++
 media-gfx/prusaslicer/prusaslicer-.ebuild  | 14 +++-
 5 files changed, 136 insertions(+), 3 deletions(-)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal.patch
new file mode 100644
index ..53267f1243ff
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.1-cgal.patch
@@ -0,0 +1,84 @@
+--- a/src/libslic3r/CutSurface.cpp
 b/src/libslic3r/CutSurface.cpp
+@@ -1437,8 +1437,8 @@ priv::CutAOIs priv::cut_from_model(CutMesh   
 &cgal_model,
+ // detect anomalities in visitor.
+ bool is_valid = true;
+ // NOTE: map are created when convert shapes to cgal model
+-const EdgeShapeMap& edge_shape_map = cgal_shape.property_map(edge_shape_map_name).first;
+-const FaceShapeMap& face_shape_map = cgal_shape.property_map(face_shape_map_name).first;
++EdgeShapeMap& edge_shape_map = cgal_shape.property_map(edge_shape_map_name).value();
++FaceShapeMap& face_shape_map = cgal_shape.property_map(face_shape_map_name).value();
+ Visitor visitor{cgal_model, cgal_shape, edge_shape_map, face_shape_map, 
vert_shape_map, &is_valid};
+ 
+ // a property map containing the constrained-or-not status of each edge
+@@ -1587,8 +1587,8 @@ void priv::collect_surface_data(std::queue  &process,
+ 
+ void priv::create_reduce_map(ReductionMap &reduction_map, const CutMesh &mesh)
+ {
+-const VertexShapeMap &vert_shape_map = mesh.property_map(vert_shape_map_name).first;
+-const EdgeBoolMap &ecm = mesh.property_map(is_constrained_edge_name).first;
++VertexShapeMap &vert_shape_map = mesh.property_map(vert_shape_map_name).value();
++EdgeBoolMap &ecm = mesh.property_map(is_constrained_edge_name).value();
+ 
+ // check if vertex was made by edge_2 which is diagonal of quad
+ auto is_reducible_vertex = [&vert_shape_map](VI reduction_from) -> bool {
+@@ -1772,11 +1772,11 @@ priv::VDistances priv::calc_distances(const 
SurfacePatches &patches,
+ priv::VDistances result(count_shapes_points);
+ for (const SurfacePatch &patch : patches) {
+ // map is created during intersection by corefine visitor
+-const VertexShapeMap &vert_shape_map = 
+-models[patch.model_id].property_map(vert_shape_map_name).first;
++VertexShapeMap &vert_shape_map = 
++models[patch.model_id].property_map(vert_shape_map_name).value();
+ uint32_t patch_index = &patch - &patches.front();
+ // map is created during patch creation / dividing
+-const CvtVI2VI& cvt = patch.mesh.property_map(patch_source_name).first;
++CvtVI2VI& cvt = patch.mesh.property_map(patch_source_name).value();
+ // for each point on outline
+ for (const Loop &loop : patch.loops) 
+ for (const VI &vi_patch : loop) {
+@@ -2785,7 +2785,7 @@ using BBS = std::vector;
+ BBS create_bbs(const VCutAOIs &cuts, const CutMeshes &cut_models);
+ 
+ using Primitive = CGAL::AABB_face_graph_triangle_primitive;
+-using Traits= CGAL::AABB_traits;
++using Traits= CGAL::AABB_traits_3;
+ using Ray   = EpicKernel::Ray_3;
+ using Tree  = CGAL::AABB_tree;
+ using Trees = std::vector;
+@@ -2939,7 +2939,7 @@ bool priv::is_patch_inside_of_model(const SurfacePatch 
&patch,
+ uint32_t priv::get_shape_point_index(const CutAOI &cut, const CutMesh &model)
+ {
+ // map is created during intersection by corefine visitor
+-const VertexShapeMap &vert_shape_map = model.property_map(vert_shape_map_name).first;
++VertexShapeMap &vert_shape_map = model.property_map(vert_shape_map_name).value();
+ // for each half edge of outline
+ for (HI hi : cut.second) {
+ VI vi = model.source(hi);
+@@ -2964,7 +2964,7 @@ priv::SurfacePatch priv::separate_patch(const 
std::vector& fis,
+ patch_new.model_id = patch.model_id;
+ patch_new.shape_id = patch.shape_id;
+ // fix cvt
+-CvtVI2VI cvt = patch_new.mesh.property_map(patch_source_name).first;
++CvtVI2VI cvt = patch_new.mesh.property_map(patch_source_name).value();
+ for (VI &vi : cvt) {
+ if (!vi.is_valid()) continue;
+ vi = cvt_from[vi];
+@@ -2984,7 +2984,7 @@ void priv::divide_patch(size_t i, SurfacePatchesEx 
&patches)
+ std::string patch_number_name = "f:patch_number";
+ CutMesh::Pr

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-08-06 Thread Miroslav Šulc
commit: 1139705e7e2422c3798b3f1070491745e5e34c0b
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Aug  6 09:15:41 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Aug  6 09:15:52 2024 +
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  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..
--- 
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 
-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..
--- 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 
- #include 
- #include 
-+#include 
- #include 
- 
- #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 
- 
- #include 
-+#include 
- #include 
- 
- #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 
- #include 
- #include 
--#include 
- #include 
- #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..
--- 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:=
-  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-08-04 Thread Miroslav Šulc
commit: 991e00b3d75ae763f3fce40c8df086a4cf32ef00
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sun Aug  4 15:40:17 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sun Aug  4 15:40:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991e00b3

media-gfx/prusaslicer: 2.8.0 amd64 stable

Closes: https://bugs.gentoo.org/936874
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
index 2bb72a7c183f..ed23b287f530 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == ** ]]; then
EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
 else

SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~x86"
S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 fi
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-06-29 Thread Miroslav Šulc
commit: d27eb9f7ea1a3ebd611efd600c612fff641ae7b3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 29 11:19:21 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 29 11:19:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d27eb9f7

media-gfx/prusaslicer: added wayland/x11 patch to 2.8.0 and live

Closes: https://bugs.gentoo.org/935117
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild | 1 +
 media-gfx/prusaslicer/prusaslicer-.ebuild  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
index 71ea154eda73..2bb72a7c183f 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
@@ -60,6 +60,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
"${FILESDIR}/${PN}-2.8.0-fixed-linking.patch"
 )

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 71ea154eda73..2bb72a7c183f 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -60,6 +60,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
"${FILESDIR}/${PN}-2.8.0-fixed-linking.patch"
 )



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-06-27 Thread Miroslav Šulc
commit: 9beacb7ca1db465001356c31fb06984d1a6a1825
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Jun 27 13:45:35 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Jun 27 13:45:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9beacb7c

media-gfx/prusaslicer: bump to 2.8.0

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 +
 media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild | 105 +
 2 files changed, 106 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index ff8ebdecd89c..96bff41a9c8d 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1 +1,2 @@
 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/prusaslicer-2.8.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
new file mode 100644
index ..71ea154eda73
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.8.0.ebuild
@@ -0,0 +1,105 @@
+# 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
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
+else
+   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+fi
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+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,webkit]
+   media-libs/nanosvg:=
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+   test? ( =dev-cpp/catch-2* )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
+   "${FILESDIR}/${PN}-2.8.0-fixed-linking.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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

2024-06-25 Thread Miroslav Šulc
commit: 6a9be4fcabb498522b8e5c5be5b964eac099d4bf
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Jun 25 12:40:12 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Jun 25 12:40:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a9be4fc

media-gfx/prusaslicer: updated live ebuild patch

Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.8.0-missing-includes.patch | 23 --
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
index f92813b6b335..9d13876b607b 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
@@ -8,27 +8,12 @@
  #include 
  
  #include "libslic3r/libslic3r.h"
 a/src/slic3r/GUI/RulerForDoubleSlider.cpp
-+++ b/src/slic3r/GUI/RulerForDoubleSlider.cpp
-@@ -4,6 +4,12 @@
- ///|/
- #include "RulerForDoubleSlider.hpp"
- #include "libslic3r/CustomGCode.hpp"
-+#include "../../libslic3r/libslic3r.h"
-+
-+#include 
-+#include 
-+#include 
-+#include 
- 
- using namespace Slic3r;
- using namespace CustomGCode;
 --- a/src/slic3r/GUI/UserAccountCommunication.cpp
 +++ b/src/slic3r/GUI/UserAccountCommunication.cpp
-@@ -9,6 +9,7 @@
- #include 
- #include 
- #include 
+@@ -13,6 +13,7 @@
+ #include 
+ #include 
+ #include 
 +#include 
  #include 
  #include 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2024-06-22 Thread Miroslav Šulc
commit: ee0ba87fa87c80bebf89a6c63709f27fe1796b72
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 22 10:14:45 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 22 10:15:01 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0ba87f

media-gfx/prusaslicer: fixed linking

Closes: https://bugs.gentoo.org/934358
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.8.0-fixed-linking.patch   | 19 +++
 media-gfx/prusaslicer/prusaslicer-.ebuild |  1 +
 2 files changed, 20 insertions(+)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch
new file mode 100644
index ..33ab6256d6b0
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-fixed-linking.patch
@@ -0,0 +1,19 @@
+--- a/src/slic3r/CMakeLists.txt
 b/src/slic3r/CMakeLists.txt
+@@ -376,6 +376,7 @@ set(SLIC3R_GUI_SOURCES
+ )
+ 
+ find_package(NanoSVG REQUIRED)
++find_package(OpenSSL REQUIRED)
+ 
+ if (APPLE)
+ list(APPEND SLIC3R_GUI_SOURCES
+@@ -404,7 +405,7 @@ endforeach()
+ 
+ encoding_check(libslic3r_gui)
+ 
+-target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui 
libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} 
NanoSVG::nanosvg NanoSVG::nanosvgrast)
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui 
libvgcode GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES} 
NanoSVG::nanosvg NanoSVG::nanosvgrast OpenSSL::SSL OpenSSL::Crypto)
+ 
+ if (MSVC)
+ target_link_libraries(libslic3r_gui Setupapi.lib)

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index c76b9ee39612..71ea154eda73 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -61,6 +61,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
+   "${FILESDIR}/${PN}-2.8.0-fixed-linking.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

2024-06-22 Thread Miroslav Šulc
commit: ab7b5b95175622e75943b3b8892337a597ad8a46
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 22 09:44:06 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 22 09:44:27 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab7b5b95

media-gfx/prusaslicer: added more missing includes

Bug: https://bugs.gentoo.org/934358
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.8.0-missing-includes.patch| 15 +++
 1 file changed, 15 insertions(+)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
index 997ad9ab8a0f..f92813b6b335 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
@@ -8,6 +8,21 @@
  #include 
  
  #include "libslic3r/libslic3r.h"
+--- a/src/slic3r/GUI/RulerForDoubleSlider.cpp
 b/src/slic3r/GUI/RulerForDoubleSlider.cpp
+@@ -4,6 +4,12 @@
+ ///|/
+ #include "RulerForDoubleSlider.hpp"
+ #include "libslic3r/CustomGCode.hpp"
++#include "../../libslic3r/libslic3r.h"
++
++#include 
++#include 
++#include 
++#include 
+ 
+ using namespace Slic3r;
+ using namespace CustomGCode;
 --- a/src/slic3r/GUI/UserAccountCommunication.cpp
 +++ b/src/slic3r/GUI/UserAccountCommunication.cpp
 @@ -9,6 +9,7 @@



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2024-06-22 Thread Miroslav Šulc
commit: 641229ac59f451844879fbd6fc1b14f8555ac7d0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 22 09:16:45 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 22 09:16:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641229ac

media-gfx/prusaslicer: added another missing include

Bug: https://bugs.gentoo.org/934358
Signed-off-by: Miroslav Šulc  gentoo.org>

 ...-include.patch => prusaslicer-2.8.0-missing-includes.patch} | 10 ++
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-include.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
similarity index 54%
rename from media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-include.patch
rename to media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
index 4d71ef87357f..997ad9ab8a0f 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-include.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-includes.patch
@@ -1,3 +1,13 @@
+--- a/src/slic3r/Config/Version.cpp
 b/src/slic3r/Config/Version.cpp
+@@ -7,6 +7,7 @@
+ #include 
+ 
+ #include 
++#include 
+ #include 
+ 
+ #include "libslic3r/libslic3r.h"
 --- a/src/slic3r/GUI/UserAccountCommunication.cpp
 +++ b/src/slic3r/GUI/UserAccountCommunication.cpp
 @@ -9,6 +9,7 @@

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index d3a4f5c3f101..c76b9ee39612 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -60,7 +60,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-   "${FILESDIR}/${PN}-2.8.0-missing-include.patch"
+   "${FILESDIR}/${PN}-2.8.0-missing-includes.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-06-22 Thread Miroslav Šulc
commit: 498ab9eba86dcad16e049286075e64dc2e51f105
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 22 08:55:35 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 22 08:55:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=498ab9eb

media-gfx/prusaslicer: added missing include

Bug: https://bugs.gentoo.org/934358
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../prusaslicer/files/prusaslicer-2.8.0-missing-include.patch  | 10 ++
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  4 
 2 files changed, 14 insertions(+)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-include.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-include.patch
new file mode 100644
index ..4d71ef87357f
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.8.0-missing-include.patch
@@ -0,0 +1,10 @@
+--- a/src/slic3r/GUI/UserAccountCommunication.cpp
 b/src/slic3r/GUI/UserAccountCommunication.cpp
+@@ -9,6 +9,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ 

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 9a3c3a3c6ee5..d3a4f5c3f101 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -59,6 +59,10 @@ DEPEND="${RDEPEND}
test? ( =dev-cpp/catch-2* )
 "
 
+PATCHES=(
+   "${FILESDIR}/${PN}-2.8.0-missing-include.patch"
+)
+
 src_prepare() {
if has_version ">=sci-libs/opencascade-7.8.0"; then
eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-06-22 Thread Miroslav Šulc
commit: 7cabaa07d403bf19ce37f522ec8a7880028327e2
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 22 08:32:38 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 22 08:32:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cabaa07

media-gfx/prusaslicer: fixed deps

Bug: https://bugs.gentoo.org/934358
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 124181307e1c..9a3c3a3c6ee5 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -51,7 +51,7 @@ RDEPEND="
sys-libs/zlib:=
virtual/opengl
x11-libs/gtk+:3
-   >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl]
+   >=x11-libs/wxGTK-3.2.2.1-r3:${WX_GTK_VER}[X,opengl,webkit]
media-libs/nanosvg:=
 "
 DEPEND="${RDEPEND}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-06-15 Thread Miroslav Šulc
commit: 47ffd2be64a139c6f218bf9b07c250274f20ae56
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Jun 15 10:31:37 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Jun 15 10:32:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47ffd2be

media-gfx/prusaslicer: dropped patches from live ebuild

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-.ebuild | 6 --
 1 file changed, 6 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
index 72b48171933c..124181307e1c 100644
--- a/media-gfx/prusaslicer/prusaslicer-.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -59,12 +59,6 @@ DEPEND="${RDEPEND}
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"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2024-05-22 Thread Miroslav Šulc
commit: 3dc903a2ced6a6344ebb4083f8b3b168eb3b9033
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed May 22 10:34:27 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed May 22 10:34:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dc903a2

media-gfx/prusaslicer: dropped obsolete 2.6.1 & 2.7.1

Bug: https://bugs.gentoo.org/932283
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |  2 -
 .../prusaslicer-2.6.0-disable-noisy-asserts.patch  | 12 ---
 media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild | 92 --
 media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild | 92 --
 4 files changed, 198 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index de04fd64840a..ff8ebdecd89c 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1 @@
-DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B 
d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9
 SHA512 
2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
-DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 
7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f
 SHA512 
20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d
 DIST prusaslicer-2.7.4.tar.gz 65396083 BLAKE2B 
658c9c623e9b25ba2590f3b816987776050b25849dab2b52500ed1673434f016007b6f40944afe412df4a517351785db15de8c8b8e633d7765d656e35014aa69
 SHA512 
fa876160ec641ecaed20339d66c01971ca1ad73fdfba3b19bae4169e81020175aa5b99a8a7f4f01bf15d112b817cde8226c01bb4bdfb077f387a2d27f92e5d6b

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
deleted file mode 100644
index d7c5f25a1651..
--- a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-disable-noisy-asserts.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 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/prusaslicer-2.6.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
deleted file mode 100644
index 89862b5ef9ad..
--- a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
+++ /dev/null
@@ -1,92 +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"
-
-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}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
-   "${FILESDIR}/${PN}-2.6.0-disable-noisy-asserts.patch"
-   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.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() {
- 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-05-22 Thread Miroslav Šulc
commit: c40afc02f6ca69a637b4ffcadffc8640eaf553cc
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Wed May 22 10:31:26 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Wed May 22 10:34:51 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40afc02

media-gfx/prusaslicer: fixed building with boost 1.85

Closes: https://bugs.gentoo.org/932291
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../prusaslicer-2.6.0-disable-noisy-asserts.patch  |  2 --
 ...-2.6.0-dont-force-link-to-wayland-and-x11.patch |  2 --
 ...icer-2.6.0-libexpat-double-definition-fix.patch |  6 -
 .../prusaslicer-2.7.2-opencascade-7.8.0.patch  |  2 --
 .../files/prusaslicer-2.7.4-boost-1.85.patch   | 30 ++
 media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild |  1 +
 media-gfx/prusaslicer/prusaslicer-.ebuild  |  1 +
 7 files changed, 32 insertions(+), 12 deletions(-)

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
index 0e3d1d340572..d7c5f25a1651 100644
--- 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
@@ -1,5 +1,3 @@
-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()

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
 
b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
index b949d3b5a897..1d36fcbb7b57 100644
--- 
a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
+++ 
b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
@@ -1,5 +1,3 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 50eccfc84..d0f9205b3 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -115,9 +115,6 @@ if (SLIC3R_GUI)

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
index 23006a2ceedf..4a93da994bd7 100644
--- 
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
@@ -3,12 +3,6 @@ From: Malte kleine Piening 
 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)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
index 3c97ead5c6b2..296c0366e34a 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
@@ -1,5 +1,3 @@
-diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
-index d8dd8e1..d27055f 100644
 --- a/src/occt_wrapper/CMakeLists.txt
 +++ b/src/occt_wrapper/CMakeLists.txt
 @@ -22,11 +22,8 @@ generate_export_header(OCCTWrapper)

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
new file mode 100644
index ..4ccaff8f6b17
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.7.4-boost-1.85.patch
@@ -0,0 +1,30 @@
+--- 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 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ #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 
+ 
+ #include 
++#include 
+ #include 
+ 
+ #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 
+ #include 
+ #include 
+-#include 
+ #include 
+ #endif
+ 

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
index 2bc5d574fed6..3745d41a4e8d 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
@@ -57,6 +57,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-2.6.

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-05-21 Thread Miroslav Šulc
commit: e42be6e227f70db7e1813e9c9c803e4c30dc19c5
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue May 21 17:34:14 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue May 21 17:34:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e42be6e2

media-gfx/prusaslicer: 2.7.4 amd64 stable

Closes: https://bugs.gentoo.org/932283
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
index 48092fb26071..2bc5d574fed6 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-05-20 Thread Miroslav Šulc
commit: c8afdfdb59a521bf90348d754e909ba69cd670c6
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon May 20 09:06:16 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon May 20 09:06:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8afdfdb

media-gfx/prusaslicer: added live ebuild

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-.ebuild | 105 ++
 1 file changed, 105 insertions(+)

diff --git a/media-gfx/prusaslicer/prusaslicer-.ebuild 
b/media-gfx/prusaslicer/prusaslicer-.ebuild
new file mode 100644
index ..5f7e18907896
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-.ebuild
@@ -0,0 +1,105 @@
+# 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
+
+if [[ ${PV} == ** ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/prusa3d/prusaslicer.git";
+else
+   
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~arm64 ~x86"
+   S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
+fi
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication 
(3D printers)"
+HOMEPAGE="https://www.prusa3d.com/prusaslicer/";
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+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"
+)
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-05-20 Thread Miroslav Šulc
commit: 95294f81a5615427b4009d556a7a9f81e41d5859
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Mon May 20 08:51:53 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Mon May 20 08:52:14 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95294f81

media-gfx/prusaslicer: added missing test dep to 2.7.4

Bug: https://bugs.gentoo.org/927841
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
index a4ea9747ee33..48092fb26071 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
@@ -51,6 +51,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
media-libs/qhull[static-libs]
+   test? ( =dev-cpp/catch-2* )
 "
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-05-10 Thread Miroslav Šulc
commit: e58c588b049f5e80f7d84f864b0dd3e551c637fa
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri May 10 09:09:17 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri May 10 09:09:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58c588b

media-gfx/prusaslicer: dropped obsolete 2.7.2

Bug: https://bugs.gentoo.org/927925
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 -
 media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild | 99 --
 2 files changed, 100 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 6e339d81f0a9..de04fd64840a 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,4 +1,3 @@
 DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B 
d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9
 SHA512 
2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
 DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 
7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f
 SHA512 
20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d
-DIST prusaslicer-2.7.2.tar.gz 64915607 BLAKE2B 
25f531df0e1ed941cd5f15f6e30938dceb89148d4166b4042db60e587b5277d02e310738a9b368e9f3b88aea3abb9c9d5e2be89b5774b42191b7cae0589ce5c8
 SHA512 
74467cc353fd611133b0b0bc7b8026dc67bce0c7f1d14a47368dd5bac6c33b6400f73e2ecc46b7b43e8c724f0ec6e5f509bafed04c2c7349e5ffb1022af2f4db
 DIST prusaslicer-2.7.4.tar.gz 65396083 BLAKE2B 
658c9c623e9b25ba2590f3b816987776050b25849dab2b52500ed1673434f016007b6f40944afe412df4a517351785db15de8c8b8e633d7765d656e35014aa69
 SHA512 
fa876160ec641ecaed20339d66c01971ca1ad73fdfba3b19bae4169e81020175aa5b99a8a7f4f01bf15d112b817cde8226c01bb4bdfb077f387a2d27f92e5d6b

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
deleted file mode 100644
index a4ea9747ee33..
--- a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
+++ /dev/null
@@ -1,99 +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]
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
-   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.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
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-04-05 Thread Miroslav Šulc
commit: fe14159cac378e03b37cfd739077eca9691cfba0
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Apr  5 12:15:25 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr  5 12:15:25 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe14159c

media-gfx/prusaslicer: bump to 2.7.4, dropped 2.7.3

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest  | 2 +-
 .../prusaslicer/{prusaslicer-2.7.3.ebuild => prusaslicer-2.7.4.ebuild}  | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 6076309ac8a0..6e339d81f0a9 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,4 +1,4 @@
 DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B 
d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9
 SHA512 
2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
 DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 
7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f
 SHA512 
20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d
 DIST prusaslicer-2.7.2.tar.gz 64915607 BLAKE2B 
25f531df0e1ed941cd5f15f6e30938dceb89148d4166b4042db60e587b5277d02e310738a9b368e9f3b88aea3abb9c9d5e2be89b5774b42191b7cae0589ce5c8
 SHA512 
74467cc353fd611133b0b0bc7b8026dc67bce0c7f1d14a47368dd5bac6c33b6400f73e2ecc46b7b43e8c724f0ec6e5f509bafed04c2c7349e5ffb1022af2f4db
-DIST prusaslicer-2.7.3.tar.gz 65398513 BLAKE2B 
0aa135a7106061978a2c5f5d874ad1885e42a976a9a7834f6dd9fea4e80f4224b781b6abe7e680e4c6826f90f95ecfcc547f9dcca645b885a082e32a3efc504a
 SHA512 
aef22b742d93d4b3348f17809403e579fa187c1a27813a79b729cd2576db3f3ff9a73676b7815f8fff469e967e880e51de378ec24f36d5e35d73a7fc6850e0c8
+DIST prusaslicer-2.7.4.tar.gz 65396083 BLAKE2B 
658c9c623e9b25ba2590f3b816987776050b25849dab2b52500ed1673434f016007b6f40944afe412df4a517351785db15de8c8b8e633d7765d656e35014aa69
 SHA512 
fa876160ec641ecaed20339d66c01971ca1ad73fdfba3b19bae4169e81020175aa5b99a8a7f4f01bf15d112b817cde8226c01bb4bdfb077f387a2d27f92e5d6b

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.3.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild
similarity index 100%
rename from media-gfx/prusaslicer/prusaslicer-2.7.3.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.7.4.ebuild



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-03-29 Thread Miroslav Šulc
commit: a05bc36d0b5c3d28287be0eebdc1c67e2a2cf335
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Mar 29 09:04:41 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Mar 29 09:04:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a05bc36d

media-gfx/prusaslicer: bump to 2.7.3

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 media-gfx/prusaslicer/prusaslicer-2.7.3.ebuild | 99 ++
 2 files changed, 100 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index b0a40cbe994d..6076309ac8a0 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1,4 @@
 DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B 
d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9
 SHA512 
2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
 DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 
7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f
 SHA512 
20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d
 DIST prusaslicer-2.7.2.tar.gz 64915607 BLAKE2B 
25f531df0e1ed941cd5f15f6e30938dceb89148d4166b4042db60e587b5277d02e310738a9b368e9f3b88aea3abb9c9d5e2be89b5774b42191b7cae0589ce5c8
 SHA512 
74467cc353fd611133b0b0bc7b8026dc67bce0c7f1d14a47368dd5bac6c33b6400f73e2ecc46b7b43e8c724f0ec6e5f509bafed04c2c7349e5ffb1022af2f4db
+DIST prusaslicer-2.7.3.tar.gz 65398513 BLAKE2B 
0aa135a7106061978a2c5f5d874ad1885e42a976a9a7834f6dd9fea4e80f4224b781b6abe7e680e4c6826f90f95ecfcc547f9dcca645b885a082e32a3efc504a
 SHA512 
aef22b742d93d4b3348f17809403e579fa187c1a27813a79b729cd2576db3f3ff9a73676b7815f8fff469e967e880e51de378ec24f36d5e35d73a7fc6850e0c8

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.3.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.3.ebuild
new file mode 100644
index ..a4ea9747ee33
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.3.ebuild
@@ -0,0 +1,99 @@
+# 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]
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-03-25 Thread Sam James
commit: 0c8d22fd3b4f568ccf86c225b214b4d2581ebbae
Author: Paul Zander  gmail  com>
AuthorDate: Mon Mar 25 18:11:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 25 18:54:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c8d22fd

media-gfx/prusaslicer: 2.7.2 re-enable tests

Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35915
Signed-off-by: Sam James  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
index 9eb191278e1c..a4ea9747ee33 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
@@ -20,7 +20,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
-RESTRICT="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
dev-cpp/eigen:3
@@ -90,3 +90,10 @@ src_configure() {
 
cmake_src_configure
 }
+
+src_test() {
+   CMAKE_SKIP_TESTS=(
+   "^libslic3r_tests$"
+   )
+   cmake_src_test
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-03-25 Thread Sam James
commit: 5a345e202892c9358921d7a70cd54624bf17e42c
Author: Paul Zander  gmail  com>
AuthorDate: Mon Mar 25 18:10:59 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 25 18:54:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a345e20

media-gfx/prusaslicer: fix build with opencascade-7.8.0

Closes: https://bugs.gentoo.org/927774
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../files/prusaslicer-2.7.2-opencascade-7.8.0.patch| 18 ++
 media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild |  6 +-
 media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild |  4 
 media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild |  4 
 4 files changed, 31 insertions(+), 1 deletion(-)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
new file mode 100644
index ..3c97ead5c6b2
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.7.2-opencascade-7.8.0.patch
@@ -0,0 +1,18 @@
+diff --git a/src/occt_wrapper/CMakeLists.txt b/src/occt_wrapper/CMakeLists.txt
+index d8dd8e1..d27055f 100644
+--- a/src/occt_wrapper/CMakeLists.txt
 b/src/occt_wrapper/CMakeLists.txt
+@@ -22,11 +22,8 @@ generate_export_header(OCCTWrapper)
+ find_package(OpenCASCADE REQUIRED)
+ 
+ set(OCCT_LIBS
+-TKXDESTEP
+-TKSTEP
+-TKSTEP209
+-TKSTEPAttr
+-TKSTEPBase
++TKDESTEP
++TKDESTL
+ TKXCAF
+ TKXSBase
+ TKVCAF

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
index 4908a2557257..c2fcc93980c9 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -59,6 +59,10 @@ PATCHES=(
 S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 
 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' \

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
index 52f7bd2d1548..e835e7b55b23 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
@@ -59,6 +59,10 @@ PATCHES=(
 S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 
 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' \

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
index 2a926a3e0102..53be447d2fa0 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
@@ -59,6 +59,10 @@ PATCHES=(
 S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
 
 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' \



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-03-25 Thread Sam James
commit: e601066d6e4adf2e6bc88cfe1a4b239ad9833287
Author: Paul Zander  gmail  com>
AuthorDate: Mon Mar 25 18:11:28 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 25 18:54:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e601066d

media-gfx/prusaslicer: move definition of S

Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild | 4 ++--
 media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild | 4 ++--
 media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
index c2fcc93980c9..89862b5ef9ad 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
@@ -13,6 +13,8 @@ DESCRIPTION="A mesh slicer to generate G-code for 
fused-filament-fabrication (3D
 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"
@@ -56,8 +58,6 @@ PATCHES=(
"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
 )
 
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-
 src_prepare() {
if has_version ">=sci-libs/opencascade-7.8.0"; then
eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
index e835e7b55b23..4784511aea1f 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
@@ -13,6 +13,8 @@ DESCRIPTION="A mesh slicer to generate G-code for 
fused-filament-fabrication (3D
 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"
@@ -56,8 +58,6 @@ PATCHES=(
"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
 )
 
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-
 src_prepare() {
if has_version ">=sci-libs/opencascade-7.8.0"; then
eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
index 53be447d2fa0..9eb191278e1c 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
@@ -13,6 +13,8 @@ DESCRIPTION="A mesh slicer to generate G-code for 
fused-filament-fabrication (3D
 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"
@@ -56,8 +58,6 @@ PATCHES=(
"${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.patch"
 )
 
-S="${WORKDIR}/${MY_PN}-version_${MY_PV}"
-
 src_prepare() {
if has_version ">=sci-libs/opencascade-7.8.0"; then
eapply "${FILESDIR}/prusaslicer-2.7.2-opencascade-7.8.0.patch"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-03-04 Thread Sam James
commit: 692580461ac900356d6383fd350e74fd9b400550
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  4 21:02:54 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  4 21:02:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69258046

media-gfx/prusaslicer: Stabilize 2.7.1 amd64, #926089

Signed-off-by: Sam James  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
index 2a926a3e0102..52f7bd2d1548 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2024-03-01 Thread Miroslav Šulc
commit: f80a2d1e422c98c6c02ac9b5c7ec9524ecb14ca4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Mar  1 10:50:18 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Mar  1 10:50:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f80a2d1e

media-gfx/prusaslicer: dropped obsolete 2.5.2-r1 & 2.6.0-r1

Closes: https://bugs.gentoo.org/917697
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |  2 -
 .../prusaslicer-2.5.0_alpha2-boost-fixes.patch | 93 --
 0_boost-1.81-std-wxString-to-std-wstring.patch | 40 --
 .../files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch | 48 ---
 .../files/prusaslicer-2.5.0_rc1-fix-tests.patch| 14 
 .../files/prusaslicer-2.5.2-fix-slicing.patch  | 76 --
 media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild  | 89 -
 media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild  | 88 
 8 files changed, 450 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 759b683902f4..b0a40cbe994d 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,5 +1,3 @@
-DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B 
f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8
 SHA512 
7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2
-DIST prusaslicer-2.6.0.tar.gz 56430180 BLAKE2B 
7d6a0344f558d5788676364262f9e2b878a01e199fa8c95cda87c801c84fd02d5fc9df5a16096d36ec2e02ea54c8189165d524d8e7f73f66526fba6e5c60e55b
 SHA512 
c6133f09ccee5c3c6f1e6e3aebfee749fb0138e830d93ed42b19063b89738162095fa7c017695643b736099750bb56d6bd8174f8bf18a6f0703811703bfb508c
 DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B 
d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9
 SHA512 
2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
 DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 
7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f
 SHA512 
20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d
 DIST prusaslicer-2.7.2.tar.gz 64915607 BLAKE2B 
25f531df0e1ed941cd5f15f6e30938dceb89148d4166b4042db60e587b5277d02e310738a9b368e9f3b88aea3abb9c9d5e2be89b5774b42191b7cae0589ce5c8
 SHA512 
74467cc353fd611133b0b0bc7b8026dc67bce0c7f1d14a47368dd5bac6c33b6400f73e2ecc46b7b43e8c724f0ec6e5f509bafed04c2c7349e5ffb1022af2f4db

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
deleted file mode 100644
index 9418707c1065..
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
+++ /dev/null
@@ -1,93 +0,0 @@
 a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -1,6 +1,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -9,7 +10,7 @@
- 
- bool write_to_pot(boost::filesystem::path path, const 
std::vector>& data)
- {
--  boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
-+  boost::nowide::ofstream file(std::move(path), std::ios_base::app);
-   for (const auto& element : data)
-   {
-   //Example of .pot element 
 a/src/libslic3r/Preset.cpp
-+++ b/src/libslic3r/Preset.cpp
-@@ -25,6 +25,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
-@@ -84,7 +85,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
- VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, 
bool load_all)
- {
- ptree tree;
--boost::filesystem::ifstream ifs(path);
-+boost::nowide::ifstream ifs(path);
- boost::property_tree::read_ini(ifs, tree);
- return VendorProfile::from_ini(tree, path, load_all);
- }
 a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include 
- #include 
- #include 
- #include 
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
 a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -13,6 +13,7 @@
- #include 
- #include 
- #include 
-+#include 
- #include 
- #include 
- #include 
 a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -15,6 +15,7 @@
- #include "libslic3r/PrintConfig.hpp"
- 
- #include 
-+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-02-29 Thread Miroslav Šulc
commit: 5c1a65806bd40a1e33925a7e27316ba6fdc5bb7a
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Feb 29 18:46:14 2024 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Feb 29 18:46:28 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c1a6580

media-gfx/prusaslicer: bump to 2.7.2

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index a55b73005349..759b683902f4 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -2,3 +2,4 @@ DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B 
f1489cac7f23977da30da130faab15336
 DIST prusaslicer-2.6.0.tar.gz 56430180 BLAKE2B 
7d6a0344f558d5788676364262f9e2b878a01e199fa8c95cda87c801c84fd02d5fc9df5a16096d36ec2e02ea54c8189165d524d8e7f73f66526fba6e5c60e55b
 SHA512 
c6133f09ccee5c3c6f1e6e3aebfee749fb0138e830d93ed42b19063b89738162095fa7c017695643b736099750bb56d6bd8174f8bf18a6f0703811703bfb508c
 DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B 
d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9
 SHA512 
2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
 DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 
7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f
 SHA512 
20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d
+DIST prusaslicer-2.7.2.tar.gz 64915607 BLAKE2B 
25f531df0e1ed941cd5f15f6e30938dceb89148d4166b4042db60e587b5277d02e310738a9b368e9f3b88aea3abb9c9d5e2be89b5774b42191b7cae0589ce5c8
 SHA512 
74467cc353fd611133b0b0bc7b8026dc67bce0c7f1d14a47368dd5bac6c33b6400f73e2ecc46b7b43e8c724f0ec6e5f509bafed04c2c7349e5ffb1022af2f4db

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
new file mode 100644
index ..2a926a3e0102
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.2.ebuild
@@ -0,0 +1,88 @@
+# 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"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~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:=
+   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]
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2024-02-01 Thread Alexey Shvetsov
commit: bf0b0fc0730c2da427db8ccb228c5b0aaf9cb78a
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Thu Feb  1 13:00:44 2024 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Thu Feb  1 13:02:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0b0fc0

media-gfx/prusaslicer: add 2.7.1

Signed-off-by: Alexey Shvetsov  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index e0b6484d7d81..a55b73005349 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1,4 @@
 DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B 
f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8
 SHA512 
7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2
 DIST prusaslicer-2.6.0.tar.gz 56430180 BLAKE2B 
7d6a0344f558d5788676364262f9e2b878a01e199fa8c95cda87c801c84fd02d5fc9df5a16096d36ec2e02ea54c8189165d524d8e7f73f66526fba6e5c60e55b
 SHA512 
c6133f09ccee5c3c6f1e6e3aebfee749fb0138e830d93ed42b19063b89738162095fa7c017695643b736099750bb56d6bd8174f8bf18a6f0703811703bfb508c
 DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B 
d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9
 SHA512 
2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0
+DIST prusaslicer-2.7.1.tar.gz 64975776 BLAKE2B 
7683e2c97458da6b6f2b0e826f538d556f011e4580246277a926df55a71c5a4668089235b8b13379646e1730d301c446cd5d9116e236986cb29bb322390ba94f
 SHA512 
20037164b8a8853e2f30a5ed613e0da1d02d6fa581c21ef67a51e90af3c33a98eb75e0b3a203adfb8ed7bc67f32de7ea598f3f0ab9c68341738db0c1c1974b3d

diff --git a/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
new file mode 100644
index ..2a926a3e0102
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.7.1.ebuild
@@ -0,0 +1,88 @@
+# 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"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~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:=
+   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]
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-12-27 Thread Sam James
commit: fbde84407d072e01eaf67cd5ce378653cdb5a4e6
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 27 13:31:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 27 13:31:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbde8440

media-gfx/prusaslicer: Stabilize 2.6.1 amd64, #917636

Signed-off-by: Sam James  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
index 6661c356d72e..4908a2557257 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-10-24 Thread Alexey Shvetsov
commit: 864a3afe25cc83722526bd2cec62abe002c433af
Author: Alexey Shvetsov  gentoo  org>
AuthorDate: Tue Oct 24 20:58:23 2023 +
Commit: Alexey Shvetsov  gentoo  org>
CommitDate: Tue Oct 24 20:58:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=864a3afe

media-gfx/prusaslicer: add 2.6.1

Closes: https://bugs.gentoo.org/914756
Signed-off-by: Alexey Shvetsov  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 967e72f1d40f..e0b6484d7d81 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1,3 @@
 DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B 
f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8
 SHA512 
7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2
 DIST prusaslicer-2.6.0.tar.gz 56430180 BLAKE2B 
7d6a0344f558d5788676364262f9e2b878a01e199fa8c95cda87c801c84fd02d5fc9df5a16096d36ec2e02ea54c8189165d524d8e7f73f66526fba6e5c60e55b
 SHA512 
c6133f09ccee5c3c6f1e6e3aebfee749fb0138e830d93ed42b19063b89738162095fa7c017695643b736099750bb56d6bd8174f8bf18a6f0703811703bfb508c
+DIST prusaslicer-2.6.1.tar.gz 58479800 BLAKE2B 
d5bfe09a76c5e1e5d3f5fae350db27db61e1f90465db42b5573314c58d77c89d3c04e67b45c449374570b7c1a0ee13bf7984b011f751a71e3b1414759cc921e9
 SHA512 
2b04eeff4feca2afd560b2fb6a5bbdaae6cabed2180d1416f2e4c7c385a50f859ec334c864a737b7c09eb3fd88f80af68655a0ef25ce9216b16549b16b3020b0

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
new file mode 100644
index ..6661c356d72e
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.1.ebuild
@@ -0,0 +1,88 @@
+# 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 ~arm64 ~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}/${PN}-2.6.0-libexpat-double-definition-fix.patch"
+   "${FILESDIR}/${PN}-2.6.0-disable-noisy-asserts.patch"
+   "${FILESDIR}/${PN}-2.6.0-dont-force-link-to-wayland-and-x11.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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-08-08 Thread Yixun Lan
commit: 86496b4c53c0c858527fdcedb3683fa31a3619d6
Author: Yixun Lan  gentoo  org>
AuthorDate: Wed Aug  9 05:56:44 2023 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Wed Aug  9 05:57:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86496b4c

media-gfx/prusaslicer: Keyword 2.6.0-r1 arm64, #910748

Signed-off-by: Yixun Lan  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
index 281398381412..92abbdc12468 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="test"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2023-08-01 Thread Piotr Karbowski
commit: 856aa99efca751cb4f0eb232e5323c50994cd5ee
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Tue Aug  1 18:21:04 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Tue Aug  1 18:22:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=856aa99e

media-gfx/prusaslicer: 2.6.0-r1: patch out hard dep on wayland (and X11).

Closes: https://bugs.gentoo.org/910751
Signed-off-by: Piotr Karbowski  gentoo.org>

 ...saslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch | 14 ++
 ...rusaslicer-2.6.0.ebuild => prusaslicer-2.6.0-r1.ebuild} |  1 +
 2 files changed, 15 insertions(+)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
 
b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
new file mode 100644
index ..b949d3b5a897
--- /dev/null
+++ 
b/media-gfx/prusaslicer/files/prusaslicer-2.6.0-dont-force-link-to-wayland-and-x11.patch
@@ -0,0 +1,14 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 50eccfc84..d0f9205b3 100644
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
+@@ -115,9 +115,6 @@ if (SLIC3R_GUI)
+ # libslic3r_gui will link to opengl anyway, so lets override wx
+ list(FILTER wxWidgets_LIBRARIES EXCLUDE REGEX OpenGL)
+ 
+-if (UNIX AND NOT APPLE)
+-list(APPEND wxWidgets_LIBRARIES X11 wayland-client wayland-egl EGL)
+-endif ()
+ #list(REMOVE_ITEM wxWidgets_LIBRARIES oleacc)
+ message(STATUS "wx libs: ${wxWidgets_LIBRARIES}")
+ 

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
similarity index 96%
rename from media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
index fcbc39930483..281398381412 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0-r1.ebuild
@@ -53,6 +53,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}/${P}-libexpat-double-definition-fix.patch"
"${FILESDIR}/${P}-disable-noisy-asserts.patch"
+   "${FILESDIR}/${P}-dont-force-link-to-wayland-and-x11.patch"
 )
 
 S="${WORKDIR}/${MY_PN}-version_${MY_PV}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2023-07-23 Thread Piotr Karbowski
commit: 04f9e528e0391790bcedd3222b1ddf89886d878f
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Jul 23 16:24:04 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Jul 23 16:40:45 2023 +
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  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 ..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 ..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 
+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 ..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/op

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-05-06 Thread Miroslav Šulc
commit: e45d7445a311725a48d67f455e20066b162291b3
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat May  6 09:37:31 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat May  6 09:37:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45d7445

media-gfx/prusaslicer: dropped obsolete 2.5.0-r1

Bug: https://bugs.gentoo.org/904820
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest|  1 -
 media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild | 88 ---
 2 files changed, 89 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 4ec9e6eb81e6..0a912e0ff23f 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1 @@
-DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B 
e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431
 SHA512 
b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
 DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B 
f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8
 SHA512 
7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild
deleted file mode 100644
index 125fcf20ac70..
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-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-8.2:=
-   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-7.6*:=
-   >=sci-mathematics/cgal-5.0:=
-   sys-apps/dbus
-   sys-libs/zlib:=
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
-   "${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
-   "${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
-   "${FILESDIR}/${PN}-2.5.0_boost-1.81-std-wxString-to-std-wstring.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
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-05-06 Thread Arthur Zamarin
commit: d522f7892597b8bd1168eadb57582a72a294f04b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sat May  6 09:23:38 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sat May  6 09:23:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d522f789

media-gfx/prusaslicer: Stabilize 2.5.2-r1 amd64, #904820

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild
index e0a2d4fd7cfd..6c02da88bcab 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.2-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2023-04-22 Thread Miroslav Šulc
commit: ca86126321ec717b0bc04009904515dbc447e4e4
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Apr 22 10:59:42 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Apr 22 11:03:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca861263

media-gfx/prusaslicer: fixed crash during slicing

thanks to Caleb Jorden for the fix

Bug: https://bugs.gentoo.org/900340
Signed-off-by: Miroslav Šulc  gentoo.org>

 .../files/prusaslicer-2.5.2-fix-slicing.patch  | 76 ++
 ...er-2.5.2.ebuild => prusaslicer-2.5.2-r1.ebuild} |  1 +
 2 files changed, 77 insertions(+)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch
new file mode 100644
index ..ae85057f10bd
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.2-fix-slicing.patch
@@ -0,0 +1,76 @@
+diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
+index f8fc2e5a7..c74ee32dd 100644
+--- a/src/libslic3r/GCode.cpp
 b/src/libslic3r/GCode.cpp
+@@ -1551,27 +1551,27 @@ void GCode::process_layers(
+ }
+ });
+ const auto spiral_vase = tbb::make_filter(slic3r_tbb_filtermode::serial_in_order,
+-[&spiral_vase = *this->m_spiral_vase](LayerResult in) -> LayerResult {
++[spiral_vase = this->m_spiral_vase.get()](LayerResult in) -> 
LayerResult {
+ if (in.nop_layer_result)
+ return in;
+ 
+-spiral_vase.enable(in.spiral_vase_enable);
+-return { spiral_vase.process_layer(std::move(in.gcode)), 
in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush};
++spiral_vase->enable(in.spiral_vase_enable);
++return { spiral_vase->process_layer(std::move(in.gcode)), 
in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush};
+ });
+ const auto pressure_equalizer = tbb::make_filter(slic3r_tbb_filtermode::serial_in_order,
+-[&pressure_equalizer = *this->m_pressure_equalizer](LayerResult in) 
-> LayerResult {
+-return pressure_equalizer.process_layer(std::move(in));
++[pressure_equalizer = this->m_pressure_equalizer.get()](LayerResult 
in) -> LayerResult {
++return pressure_equalizer->process_layer(std::move(in));
+ });
+ const auto cooling = tbb::make_filter(slic3r_tbb_filtermode::serial_in_order,
+-[&cooling_buffer = *this->m_cooling_buffer](LayerResult in) -> 
std::string {
++[cooling_buffer = this->m_cooling_buffer.get()](LayerResult in) -> 
std::string {
+  if (in.nop_layer_result)
+ return in.gcode;
+ 
+- return cooling_buffer.process_layer(std::move(in.gcode), 
in.layer_id, in.cooling_buffer_flush);
++ return cooling_buffer->process_layer(std::move(in.gcode), 
in.layer_id, in.cooling_buffer_flush);
+ });
+ const auto find_replace = tbb::make_filter(slic3r_tbb_filtermode::serial_in_order,
+-[&self = *this->m_find_replace](std::string s) -> std::string {
+-return self.process_layer(std::move(s));
++[find_replace = this->m_find_replace.get()](std::string s) -> 
std::string {
++return find_replace->process_layer(std::move(s));
+ });
+ const auto output = tbb::make_filter(slic3r_tbb_filtermode::serial_in_order,
+ [&output_stream](std::string s) { output_stream.write(s); }
+@@ -1633,25 +1633,25 @@ void GCode::process_layers(
+ }
+ });
+ const auto spiral_vase = tbb::make_filter(slic3r_tbb_filtermode::serial_in_order,
+-[&spiral_vase = *this->m_spiral_vase](LayerResult in)->LayerResult {
++[spiral_vase = this->m_spiral_vase.get()](LayerResult 
in)->LayerResult {
+ if (in.nop_layer_result)
+ return in;
+-spiral_vase.enable(in.spiral_vase_enable);
+-return { spiral_vase.process_layer(std::move(in.gcode)), 
in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush };
++spiral_vase->enable(in.spiral_vase_enable);
++return { spiral_vase->process_layer(std::move(in.gcode)), 
in.layer_id, in.spiral_vase_enable, in.cooling_buffer_flush };
+ });
+ const auto pressure_equalizer = tbb::make_filter(slic3r_tbb_filtermode::serial_in_order,
+-[&pressure_equalizer = *this->m_pressure_equalizer](LayerResult in) 
-> LayerResult {
+- return pressure_equalizer.process_layer(std::move(in));
++[pressure_equalizer = this->m_pressure_equalizer.get()](LayerResult 
in) -> LayerResult {
++ return pressure_equalizer->process_layer(std::move(in));
+ });
+ const auto cooling = tbb::make_filter(slic3r_tbb_filtermode::serial_in_order,
+-[&cooling_buffer = *this->m_cooling_buffer](LayerResult 
in)->std::string {
++[cooling_buffer = this->m_cooling_buffer.get()](LayerResult 
in)->std::string {
+ if (in.nop

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-04-22 Thread Miroslav Šulc
commit: a4ba410657eeec7662d7f912b976b0790108baa1
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Sat Apr 22 11:01:32 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Apr 22 11:03:24 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4ba4106

media-gfx/prusaslicer: dropped obsolete 2.5.0-r2 & 2.5.1

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest|  1 -
 media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild | 88 ---
 media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild| 88 ---
 3 files changed, 177 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 028a3ffe1e61..4ec9e6eb81e6 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1,2 @@
 DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B 
e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431
 SHA512 
b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
-DIST prusaslicer-2.5.1.tar.gz 4707 BLAKE2B 
2d976cdb7a72e14fba3bdef044b317dca059549b300ea327fe396ace121441260f6bc29dfcd4e7e8d0624ea90d3014cdea1af8a970abac4b1c0c91fa291d0b3c
 SHA512 
7326f5e2ce5316b9afd9387f616a489d2f0e5d256ff27efbd91baa5a1755f8ccdb6ec14139f0074ead330d11674c20bb2d22b77f866ac26e5ec170223ced4af6
 DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B 
f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8
 SHA512 
7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild
deleted file mode 100644
index 65d30cb77442..
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-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-8.2:=
-   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-7.6.2:=
-   >=sci-mathematics/cgal-5.0:=
-   sys-apps/dbus
-   sys-libs/zlib:=
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
-   "${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
-   "${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
-   "${FILESDIR}/${PN}-2.5.0_boost-1.81-std-wxString-to-std-wstring.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
-}

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild
deleted file mode 100644
index 09476833706a..
--- a/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-MY_PN="PrusaSlicer"
-MY_PV="$(ver_rs 3 -)"
-
-inherit cmake wxwidgets xdg
-
-DESCRIPTION="A 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-04-07 Thread Miroslav Šulc
commit: e31fbb7dcada27c8a6ac8334328c8bd2bcf98991
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Apr  7 16:01:44 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr  7 16:02:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e31fbb7d

media-gfx/prusaslicer: bump to 2.5.2

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 media-gfx/prusaslicer/prusaslicer-2.5.2.ebuild | 88 ++
 2 files changed, 89 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 4a975acb001b..028a3ffe1e61 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1,3 @@
 DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B 
e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431
 SHA512 
b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
 DIST prusaslicer-2.5.1.tar.gz 4707 BLAKE2B 
2d976cdb7a72e14fba3bdef044b317dca059549b300ea327fe396ace121441260f6bc29dfcd4e7e8d0624ea90d3014cdea1af8a970abac4b1c0c91fa291d0b3c
 SHA512 
7326f5e2ce5316b9afd9387f616a489d2f0e5d256ff27efbd91baa5a1755f8ccdb6ec14139f0074ead330d11674c20bb2d22b77f866ac26e5ec170223ced4af6
+DIST prusaslicer-2.5.2.tar.gz 49039089 BLAKE2B 
f1489cac7f23977da30da130faab15336c0f31eee8f197804122e46e62e030a17baf97f744019673e3adc9aff7413380f5c0513fa3d9e3044d56c32d4c95e5b8
 SHA512 
7d17ce358f742ef44725b0b4160be3ddc522d2160d0b467589a1def82b2f478108e4934efb80feff043435b69fe7e81f18146277f67ec1819d9a0150fa9942a2

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.2.ebuild
new file mode 100644
index ..09476833706a
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-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:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
+   "${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
+   "${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
+   "${FILESDIR}/${PN}-2.5.0_boost-1.81-std-wxString-to-std-wstring.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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2023-03-22 Thread Miroslav Šulc
commit: 117d89049960722e3ff11df0f69c60722dd367b6
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Thu Mar 23 06:47:14 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Thu Mar 23 06:48:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=117d8904

media-gfx/prusaslicer: bump to 2.5.1

dropped obsolete versions from deps + scrubbed patches

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 .../prusaslicer-2.5.0_alpha2-boost-fixes.patch | 10 ---
 0_boost-1.81-std-wxString-to-std-wstring.patch |  4 +-
 media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild | 88 ++
 4 files changed, 91 insertions(+), 12 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 6b14dcd25eb3..4a975acb001b 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1 +1,2 @@
 DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B 
e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431
 SHA512 
b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
+DIST prusaslicer-2.5.1.tar.gz 4707 BLAKE2B 
2d976cdb7a72e14fba3bdef044b317dca059549b300ea327fe396ace121441260f6bc29dfcd4e7e8d0624ea90d3014cdea1af8a970abac4b1c0c91fa291d0b3c
 SHA512 
7326f5e2ce5316b9afd9387f616a489d2f0e5d256ff27efbd91baa5a1755f8ccdb6ec14139f0074ead330d11674c20bb2d22b77f866ac26e5ec170223ced4af6

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
index 749f3c06289a..9418707c1065 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
@@ -1,5 +1,3 @@
-diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
-index 7c8029c..d75f8c5 100644
 --- a/src/hints/HintsToPot.cpp
 +++ b/src/hints/HintsToPot.cpp
 @@ -1,6 +1,7 @@
@@ -19,8 +17,6 @@ index 7c8029c..d75f8c5 100644
for (const auto& element : data)
{
//Example of .pot element 
-diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
-index 4664cff..41dd374 100644
 --- a/src/libslic3r/Preset.cpp
 +++ b/src/libslic3r/Preset.cpp
 @@ -25,6 +25,7 @@
@@ -40,8 +36,6 @@ index 4664cff..41dd374 100644
  boost::property_tree::read_ini(ifs, tree);
  return VendorProfile::from_ini(tree, path, load_all);
  }
-diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp 
b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-index 81c681b..7f99a50 100644
 --- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
 +++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
 @@ -10,6 +10,7 @@
@@ -59,8 +53,6 @@ index 81c681b..7f99a50 100644
 -#endif // __linux__
 \ No newline at end of file
 +#endif // __linux__
-diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
-index 5bc770b..d566e91 100644
 --- a/src/slic3r/GUI/GUI_App.cpp
 +++ b/src/slic3r/GUI/GUI_App.cpp
 @@ -13,6 +13,7 @@
@@ -71,8 +63,6 @@ index 5bc770b..d566e91 100644
  #include 
  #include 
  #include 
-diff --git a/src/slic3r/GUI/HintNotification.cpp 
b/src/slic3r/GUI/HintNotification.cpp
-index 14ebbc6..2de896c 100644
 --- a/src/slic3r/GUI/HintNotification.cpp
 +++ b/src/slic3r/GUI/HintNotification.cpp
 @@ -15,6 +15,7 @@

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
index 1cb0d9f1afff..becab0a88355 100644
--- 
a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
+++ 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
@@ -1,5 +1,5 @@
 a/src/slic3r/GUI/PrintHostDialogs.cpp  2022-12-21 10:21:43.583075853 
+1100
-+++ b/src/slic3r/GUI/PrintHostDialogs.cpp  2022-12-21 10:23:03.902694287 
+1100
+--- a/src/slic3r/GUI/PrintHostDialogs.cpp
 b/src/slic3r/GUI/PrintHostDialogs.cpp
 @@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog
  if (size_t extension_start = recent_path.find_last_of('.'); 
extension_start != std::string::npos)
  m_valid_suffix = recent_path.substr(extension_start);

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild
new file mode 100644
index ..09476833706a
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-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="ht

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

2023-02-23 Thread Alfredo Tupone
commit: 5b93b811ad529bf91091e94bfe160cbad5a779a7
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Wed Feb  8 16:54:43 2023 +
Commit: Alfredo Tupone  gentoo  org>
CommitDate: Thu Feb 23 21:03:30 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b93b811

media-gfx/prusaslicer: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29494
Signed-off-by: Alfredo Tupone  gentoo.org>

 ...aslicer-2.4.0-fix-build-with-cereal-1.3.1.patch | 47 --
 1 file changed, 47 deletions(-)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
 
b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
deleted file mode 100644
index d57eb8a31728..
--- 
a/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-https://bugs.gentoo.org/834005
-https://github.com/prusa3d/PrusaSlicer/commit/0ffcfd8393457fd035576436752267c9a1e6bbcc
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -506,6 +506,9 @@ endif ()
- 
- # Find the Cereal serialization library
- find_package(cereal REQUIRED)
-+if (NOT TARGET cereal::cereal)
-+add_library(cereal::cereal ALIAS cereal)
-+endif ()
- 
- # l10n
- set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")
 a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -126,7 +126,7 @@ if (NOT WIN32 AND NOT APPLE)
- set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
- endif ()
- 
--target_link_libraries(PrusaSlicer libslic3r cereal)
-+target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
- if (APPLE)
- #add_compile_options(-stdlib=libc++)
- #add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO 
-DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
 a/src/libslic3r/CMakeLists.txt
-+++ b/src/libslic3r/CMakeLists.txt
-@@ -358,7 +358,7 @@ find_package(JPEG REQUIRED)
- target_link_libraries(libslic3r
- libnest2d
- admesh
--cereal
-+cereal::cereal
- libigl
- miniz
- boost_libs
 a/src/slic3r/CMakeLists.txt
-+++ b/src/slic3r/CMakeLists.txt
-@@ -270,7 +270,7 @@ endforeach()
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW 
OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui 
GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
- target_link_libraries(libslic3r_gui Setupapi.lib)



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-01-30 Thread Piotr Karbowski
commit: 0c353e4eeb41bedc59f8f69c649d60ed6ff08a8f
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Mon Jan 30 21:51:13 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Mon Jan 30 21:53:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c353e4e

media-gfx/prusaslicer: 2.5.0-r2: relax opencascade dep.

Closes: https://bugs.gentoo.org/892647
Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild | 88 +++
 1 file changed, 88 insertions(+)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild
new file mode 100644
index ..65d30cb77442
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-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-8.2:=
+   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-7.6.2:=
+   >=sci-mathematics/cgal-5.0:=
+   sys-apps/dbus
+   sys-libs/zlib:=
+   virtual/opengl
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
+   "${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
+   "${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.patch"
+   "${FILESDIR}/${PN}-2.5.0_boost-1.81-std-wxString-to-std-wstring.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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-01-30 Thread Piotr Karbowski
commit: 42adb2d5aeb08239822470731f95c5477a84c5f6
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Mon Jan 30 21:52:05 2023 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Mon Jan 30 21:53:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42adb2d5

media-gfx/prusaslicer: drop old.

Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/Manifest |  2 -
 media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild | 87 --
 .../prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild | 83 -
 media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild | 87 --
 4 files changed, 259 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index fb1b02237103..6b14dcd25eb3 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1 @@
 DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B 
e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431
 SHA512 
b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
-DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 
161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e
 SHA512 
8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
-DIST prusaslicer-2.5.0_rc2.tar.gz 48596343 BLAKE2B 
41df2c34929ee6797604f87d5444f252c6f751cef1de2f5275b67d675217ff2fe7bf98ecad3a551528be1f18bf926d3660cddce2ab07911a3f8c154499dd918e
 SHA512 
94ce4b335cc89ce7c8949cdc35013bd6166ed09aa8bda556328630d7977be5d293e6ba7a143af2d1485ea7a6f6b613514ed874287793e7edcaba3453d63e37f3

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
deleted file mode 100644
index 0340bc2f5bbe..
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-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-8.2:=
-   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-7.6*:=
-   >=sci-mathematics/cgal-5.0:=
-   sys-apps/dbus
-   sys-libs/zlib:=
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
-   "${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
-   "${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.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
-}

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
deleted file mode 100644
index fb35f87e8787..
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-MY_PN="PrusaSlicer"
-MY_PV="${PV//_/-}"
-
-inherit cmake wxwidgets xdg
-
-DESCRIPT

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2023-01-19 Thread Sam James
commit: 2a191abc97120377c6cb6b2d605ba4af7bb06394
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 20 03:54:08 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 20 03:54:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a191abc

media-gfx/prusaslicer: Stabilize 2.5.0-r1 amd64, #891413

Signed-off-by: Sam James  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild
index 2e02b49090b4..125fcf20ac70 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-12-28 Thread Sam James
commit: a478377c667173277efeb419b1254062b25a9786
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 28 15:00:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 28 15:00:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a478377c

media-gfx/prusaslicer: Stabilize 2.5.0 amd64, #881417

Signed-off-by: Sam James  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
index 394c4b628493..0340bc2f5bbe 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_${MY_P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/, media-gfx/prusaslicer/

2022-12-27 Thread Piotr Karbowski
commit: 6a714bb602a25290d2aedf74eb1232fb9efd5979
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Tue Dec 27 20:11:19 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Tue Dec 27 20:12:28 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a714bb6

media-gfx/prusaslicer: fix building with boost-1.81.

Patch contributed by Bradley Jarvis.

Closes: https://bugs.gentoo.org/887055
Signed-off-by: Piotr Karbowski  gentoo.org>

 0_boost-1.81-std-wxString-to-std-wstring.patch | 40 ++
 media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild  | 88 ++
 2 files changed, 128 insertions(+)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
new file mode 100644
index ..1cb0d9f1afff
--- /dev/null
+++ 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_boost-1.81-std-wxString-to-std-wstring.patch
@@ -0,0 +1,40 @@
+--- a/src/slic3r/GUI/PrintHostDialogs.cpp  2022-12-21 10:21:43.583075853 
+1100
 b/src/slic3r/GUI/PrintHostDialogs.cpp  2022-12-21 10:23:03.902694287 
+1100
+@@ -79,8 +79,8 @@ PrintHostSendDialog::PrintHostSendDialog
+ if (size_t extension_start = recent_path.find_last_of('.'); 
extension_start != std::string::npos)
+ m_valid_suffix = recent_path.substr(extension_start);
+ // .gcode suffix control
+-auto validate_path = [this](const wxString &path) -> bool {
+-if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
++auto validate_path = [this](const std::wstring &path) -> bool {
++if (! wxString(path).Lower().EndsWith(m_valid_suffix.Lower())) {
+ MessageDialog msg_wingow(this, wxString::Format(_L("Upload 
filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), 
wxString(SLIC3R_APP_NAME), wxYES | wxNO);
+ if (msg_wingow.ShowModal() == wxID_NO)
+ return false;
+@@ -90,7 +90,7 @@ PrintHostSendDialog::PrintHostSendDialog
+ 
+ auto* btn_ok = add_button(wxID_OK, true, _L("Upload"));
+ btn_ok->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+-if (validate_path(txt_filename->GetValue())) {
++if (validate_path(txt_filename->GetValue().ToStdWstring())) {
+ post_upload_action = PrintHostPostUploadAction::None;
+ EndDialog(wxID_OK);
+ }
+@@ -100,7 +100,7 @@ PrintHostSendDialog::PrintHostSendDialog
+ if (post_actions.has(PrintHostPostUploadAction::StartPrint)) {
+ auto* btn_print = add_button(wxID_YES, false, _L("Upload and Print"));
+ btn_print->Bind(wxEVT_BUTTON, [this, validate_path](wxCommandEvent&) {
+-if (validate_path(txt_filename->GetValue())) {
++if (validate_path(txt_filename->GetValue().ToStdWstring())) {
+ post_upload_action = PrintHostPostUploadAction::StartPrint;
+ EndDialog(wxID_OK);
+ }
+@@ -111,7 +111,7 @@ PrintHostSendDialog::PrintHostSendDialog
+ // Using wxID_MORE as a button identifier to be different from the 
other buttons, wxID_MORE has no other meaning here.
+ auto* btn_simulate = add_button(wxID_MORE, false, _L("Upload and 
Simulate"));
+ btn_simulate->Bind(wxEVT_BUTTON, [this, 
validate_path](wxCommandEvent&) {
+-if (validate_path(txt_filename->GetValue())) {
++if (validate_path(txt_filename->GetValue().ToStdWstring())) {
+ post_upload_action = 
PrintHostPostUploadAction::StartSimulation;
+ EndDialog(wxID_OK);
+ }

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild
new file mode 100644
index ..2e02b49090b4
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-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-8.2:=
+   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-7.6*:=
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-10-04 Thread Dennis Lamm
commit: c91924ca93942ce257115e54a394fc3b604af7ed
Author: Nils Schlupp  gmail  com>
AuthorDate: Sun Sep 25 07:06:25 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Wed Oct  5 04:41:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c91924ca

media-gfx/prusaslicer: add 2.5.0

Signed-off-by: Nils Schlupp  gmail.com>
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild | 87 ++
 2 files changed, 88 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 10ec5ac8fc95..fb1b02237103 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1,3 @@
+DIST prusaslicer-2.5.0.tar.gz 48591956 BLAKE2B 
e353e30d91b5bb60d8885783fcba8e5fc412f388f80c35df4b20733090cb19b54a851e00b9fb6a2a813a3c734da7fccc73259c5e6033de182a73eaaf4599f431
 SHA512 
b31c1bf5c0692ce34e965e356cc27a07819712a524a514100bcb9372a08d3c4c9200a097b72f6b4e3efd0d3e9253bc3d813a9fe24d1f8a3d5a2933c9e3712665
 DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 
161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e
 SHA512 
8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
 DIST prusaslicer-2.5.0_rc2.tar.gz 48596343 BLAKE2B 
41df2c34929ee6797604f87d5444f252c6f751cef1de2f5275b67d675217ff2fe7bf98ecad3a551528be1f18bf926d3660cddce2ab07911a3f8c154499dd918e
 SHA512 
94ce4b335cc89ce7c8949cdc35013bd6166ed09aa8bda556328630d7977be5d293e6ba7a143af2d1485ea7a6f6b613514ed874287793e7edcaba3453d63e37f3

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
new file mode 100644
index ..fa1e70770d8a
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-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/"FastSweepingDomain
+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-8.2:=
+   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-7.6*:=
+   >=sci-mathematics/cgal-5.0:=
+   sys-apps/dbus
+   sys-libs/zlib:=
+   virtual/opengl
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
+   "${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
+   "${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-10-04 Thread Dennis Lamm
commit: e2e0436e481b4b09e9ce1ac74d0c7b574fadb838
Author: Nils Schlupp  gmail  com>
AuthorDate: Wed Oct  5 02:20:01 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Wed Oct  5 04:41:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2e0436e

media-gfx/prusaslicer: update HOMEPAGE

Signed-off-by: Nils Schlupp  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27437
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
index fa1e70770d8a..394c4b628493 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0.ebuild
@@ -10,7 +10,7 @@ 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/"FastSweepingDomain
+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"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-09-01 Thread Dennis Lamm
commit: 00427856fc30f81dc6f8f565d0e9995ebd9d3a6a
Author: Dennis Lamm  gentoo  org>
AuthorDate: Thu Sep  1 07:33:36 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Thu Sep  1 09:16:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00427856

media-gfx/prusaslicer: drop old

Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/27102
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 -
 media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild | 87 --
 2 files changed, 88 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 4229ead3b9ee..10ec5ac8fc95 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1,2 @@
 DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 
161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e
 SHA512 
8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
-DIST prusaslicer-2.5.0_rc1.tar.gz 48525654 BLAKE2B 
7853246d9fbc0709bc88cf3693b088edf70da9adf3d1015f79248f7edbed03b1fff21a396bea485812f08a0927e86797d77c30f150c550665ff2bf0fd660619d
 SHA512 
5a5c2afa3f245ae6fb2486cee72ac78c6905be3e322cbdbd552de88c5220f6b18ae9db03a8e7e5c6e85e5639474d5e564c1b9a63d1e7ad9268fd8f579ba14b90
 DIST prusaslicer-2.5.0_rc2.tar.gz 48596343 BLAKE2B 
41df2c34929ee6797604f87d5444f252c6f751cef1de2f5275b67d675217ff2fe7bf98ecad3a551528be1f18bf926d3660cddce2ab07911a3f8c154499dd918e
 SHA512 
94ce4b335cc89ce7c8949cdc35013bd6166ed09aa8bda556328630d7977be5d293e6ba7a143af2d1485ea7a6f6b613514ed874287793e7edcaba3453d63e37f3

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
deleted file mode 100644
index 81537f23cff6..
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-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/"FastSweepingDomain
-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-1.73.0:=[nls,threads(+)]
-   dev-libs/cereal
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/gmp:=
-   dev-libs/mpfr:=
-   >=media-gfx/openvdb-8.2:=
-   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-7.6*:=
-   >=sci-mathematics/cgal-5.0:=
-   sys-apps/dbus
-   sys-libs/zlib:=
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
-   "${FILESDIR}/${P}-cereal-1.3.1.patch"
-   "${FILESDIR}/${P}-fix-tests.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
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-09-01 Thread Dennis Lamm
commit: 7903f758e20dec6c6f2311f6db74b94ac7abd801
Author: Dennis Lamm  gentoo  org>
AuthorDate: Thu Sep  1 07:30:34 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Thu Sep  1 09:16:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7903f758

media-gfx/prusaslicer: bump to 2.5.0-rc2

Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild | 87 ++
 2 files changed, 88 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 89a7b1db4bb9..4229ead3b9ee 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1,3 @@
 DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 
161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e
 SHA512 
8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
 DIST prusaslicer-2.5.0_rc1.tar.gz 48525654 BLAKE2B 
7853246d9fbc0709bc88cf3693b088edf70da9adf3d1015f79248f7edbed03b1fff21a396bea485812f08a0927e86797d77c30f150c550665ff2bf0fd660619d
 SHA512 
5a5c2afa3f245ae6fb2486cee72ac78c6905be3e322cbdbd552de88c5220f6b18ae9db03a8e7e5c6e85e5639474d5e564c1b9a63d1e7ad9268fd8f579ba14b90
+DIST prusaslicer-2.5.0_rc2.tar.gz 48596343 BLAKE2B 
41df2c34929ee6797604f87d5444f252c6f751cef1de2f5275b67d675217ff2fe7bf98ecad3a551528be1f18bf926d3660cddce2ab07911a3f8c154499dd918e
 SHA512 
94ce4b335cc89ce7c8949cdc35013bd6166ed09aa8bda556328630d7977be5d293e6ba7a143af2d1485ea7a6f6b613514ed874287793e7edcaba3453d63e37f3

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild
new file mode 100644
index ..a7890eb5a290
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-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/"FastSweepingDomain
+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-1.73.0:=[nls,threads(+)]
+   dev-libs/cereal
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/gmp:=
+   dev-libs/mpfr:=
+   >=media-gfx/openvdb-8.2:=
+   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-7.6*:=
+   >=sci-mathematics/cgal-5.0:=
+   sys-apps/dbus
+   sys-libs/zlib:=
+   virtual/opengl
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
+   "${FILESDIR}/${PN}-2.5.0_rc1-cereal-1.3.1.patch"
+   "${FILESDIR}/${PN}-2.5.0_rc1-fix-tests.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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2022-08-31 Thread Dennis Lamm
commit: ce2d738142d09d57c9a957bc5419dee49121a7e5
Author: Dennis Lamm  gentoo  org>
AuthorDate: Wed Aug 31 17:59:06 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Wed Aug 31 18:26:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce2d7381

media-gfx/prusaslicer: fixed failing tests

Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Lamm  gentoo.org>

 .../files/prusaslicer-2.5.0_rc1-fix-tests.patch| 14 ++
 media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild |  1 +
 2 files changed, 15 insertions(+)

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch
new file mode 100644
index ..c86c585926ab
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-fix-tests.patch
@@ -0,0 +1,14 @@
+--- a/tests/fff_print/test_data.cpp
 b/tests/fff_print/test_data.cpp
+@@ -4,10 +4,9 @@
+ #include "libslic3r/GCodeReader.hpp"
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/Print.hpp"
+-#include "libslic3r/Format/OBJ.hpp"
+-#include "libslic3r/Format/STL.hpp"
+
+ #include 
++#include 
+ #include 
+
+ #include 

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
index f99c7d8cc487..82c03988b3a8 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
@@ -52,6 +52,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}/${PN}-2.5.0_alpha2-boost-fixes.patch"
"${FILESDIR}/${P}-cereal-1.3.1.patch"
+   "${FILESDIR}/${P}-fix-tests.patch"
 )
 
 S="${WORKDIR}/${MY_PN}-version_${MY_PV}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-08-31 Thread Dennis Lamm
commit: 205c11fa0a4555a97fad6552783075864d4f0d38
Author: Dennis Lamm  gentoo  org>
AuthorDate: Wed Aug 31 18:01:52 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Wed Aug 31 18:26:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=205c11fa

media-gfx/prusaslicer: fixed dependencies

Bug: https://bugs.gentoo.org/867301
Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/27090
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
index c43ffddc4b0c..81537f23cff6 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
@@ -29,10 +29,10 @@ RDEPEND="
dev-libs/glib:2
dev-libs/gmp:=
dev-libs/mpfr:=
-   dev-libs/imath:=
>=media-gfx/openvdb-8.2:=
net-misc/curl[adns]
media-libs/glew:0=
+   media-libs/libjpeg-turbo:=
media-libs/libpng:0=
media-libs/qhull:=
sci-libs/libigl
@@ -41,7 +41,6 @@ RDEPEND="
>=sci-mathematics/cgal-5.0:=
sys-apps/dbus
sys-libs/zlib:=
-   virtual/glu
virtual/opengl
x11-libs/gtk+:3
x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-08-31 Thread Dennis Lamm
commit: c6bad8fa7b2984dff874092bf5204f2d1d415d18
Author: Dennis Lamm  gentoo  org>
AuthorDate: Wed Aug 31 18:00:44 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Wed Aug 31 18:26:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6bad8fa

media-gfx/prusaslicer: added opencascade-7.6.x dependency

Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
index 82c03988b3a8..c43ffddc4b0c 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
@@ -37,6 +37,7 @@ RDEPEND="
media-libs/qhull:=
sci-libs/libigl
sci-libs/nlopt
+   =sci-libs/opencascade-7.6*:=
>=sci-mathematics/cgal-5.0:=
sys-apps/dbus
sys-libs/zlib:=
@@ -59,6 +60,9 @@ 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
 }
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/files/

2022-08-31 Thread Dennis Lamm
commit: 5c5e7975edee5370b7bab429e495c69fe5fbb222
Author: Dennis Lamm  gentoo  org>
AuthorDate: Tue Aug 30 05:38:05 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Wed Aug 31 18:26:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c5e7975

media-gfx/prusaslicer: fixed for cereal <1.3.1

Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Lamm  gentoo.org>

 .../files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch | 22 +++---
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
index 29e01422b41f..056c6150a7b0 100644
--- a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
@@ -1,38 +1,38 @@
 a/src/CMakeLists.txt   (revision 
6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/CMakeLists.txt   (date 1661704655632)
+--- a/src/CMakeLists.txt
 b/src/CMakeLists.txt
 @@ -127,7 +127,7 @@
  set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
  endif ()
 
 -target_link_libraries(PrusaSlicer libslic3r cereal)
-+target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
++target_link_libraries(PrusaSlicer libslic3r libcereal)
 
  if (APPLE)
  #add_compile_options(-stdlib=libc++)
 a/src/slic3r/CMakeLists.txt(revision 
6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/slic3r/CMakeLists.txt(date 1661704724566)
+--- a/src/slic3r/CMakeLists.txt
 b/src/slic3r/CMakeLists.txt
 @@ -260,7 +260,7 @@
 
  encoding_check(libslic3r_gui)
 
 -target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW 
OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui 
GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude libcereal imgui 
GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
 
  if (MSVC)
  target_link_libraries(libslic3r_gui Setupapi.lib)
 a/src/libslic3r/CMakeLists.txt (revision 
6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/src/libslic3r/CMakeLists.txt (date 1661704699199)
+--- a/src/libslic3r/CMakeLists.txt
 b/src/libslic3r/CMakeLists.txt
 @@ -395,7 +395,7 @@
  target_link_libraries(libslic3r
  libnest2d
  admesh
 -cereal
-+cereal::cereal
++libcereal
  libigl
  miniz
  boost_libs
 a/CMakeLists.txt   (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
-+++ b/CMakeLists.txt   (date 1661704556468)
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -446,6 +446,12 @@
 
  # Find the Cereal serialization library



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2022-08-28 Thread Dennis Lamm
commit: d3a3f8078f655fc5c9ddc05ddd1069de302ba075
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sun Aug 28 17:53:00 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Mon Aug 29 04:45:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3a3f807

media-gfx/prusaslicer: version bump to 2.5.0-rc1

Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/27046
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 .../files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch | 48 +
 media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild | 83 ++
 3 files changed, 132 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 0aa6f5851865..89a7b1db4bb9 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1 +1,2 @@
 DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 
161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e
 SHA512 
8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
+DIST prusaslicer-2.5.0_rc1.tar.gz 48525654 BLAKE2B 
7853246d9fbc0709bc88cf3693b088edf70da9adf3d1015f79248f7edbed03b1fff21a396bea485812f08a0927e86797d77c30f150c550665ff2bf0fd660619d
 SHA512 
5a5c2afa3f245ae6fb2486cee72ac78c6905be3e322cbdbd552de88c5220f6b18ae9db03a8e7e5c6e85e5639474d5e564c1b9a63d1e7ad9268fd8f579ba14b90

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
new file mode 100644
index ..29e01422b41f
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_rc1-cereal-1.3.1.patch
@@ -0,0 +1,48 @@
+--- a/src/CMakeLists.txt   (revision 
6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
 b/src/CMakeLists.txt   (date 1661704655632)
+@@ -127,7 +127,7 @@
+ set_target_properties(PrusaSlicer PROPERTIES OUTPUT_NAME "prusa-slicer")
+ endif ()
+
+-target_link_libraries(PrusaSlicer libslic3r cereal)
++target_link_libraries(PrusaSlicer libslic3r cereal::cereal)
+
+ if (APPLE)
+ #add_compile_options(-stdlib=libc++)
+--- a/src/slic3r/CMakeLists.txt(revision 
6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
 b/src/slic3r/CMakeLists.txt(date 1661704724566)
+@@ -260,7 +260,7 @@
+
+ encoding_check(libslic3r_gui)
+
+-target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW 
OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
++target_link_libraries(libslic3r_gui libslic3r avrdude cereal::cereal imgui 
GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
+
+ if (MSVC)
+ target_link_libraries(libslic3r_gui Setupapi.lib)
+--- a/src/libslic3r/CMakeLists.txt (revision 
6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
 b/src/libslic3r/CMakeLists.txt (date 1661704699199)
+@@ -395,7 +395,7 @@
+ target_link_libraries(libslic3r
+ libnest2d
+ admesh
+-cereal
++cereal::cereal
+ libigl
+ miniz
+ boost_libs
+--- a/CMakeLists.txt   (revision 6690d49beacd48f74bdc75633cb1e7a2280bbcfd)
 b/CMakeLists.txt   (date 1661704556468)
+@@ -446,6 +446,12 @@
+
+ # Find the Cereal serialization library
+ find_package(cereal REQUIRED)
++add_library(libcereal INTERFACE)
++if (NOT TARGET cereal::cereal)
++target_link_libraries(libcereal INTERFACE cereal)
++else()
++target_link_libraries(libcereal INTERFACE cereal::cereal)
++endif()
+
+ # l10n
+ set(L10N_DIR "${SLIC3R_RESOURCES_DIR}/localization")

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
new file mode 100644
index ..f99c7d8cc487
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_rc1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-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/"FastSweepingDomain
+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-1.73.0:=[nls,threads(+)]
+   dev-libs/cereal
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/gmp:=
+   dev-libs/mpfr:=
+   dev-libs/imath:=
+   >=media-gfx/openvdb-8.2:=
+   net-misc/curl[adns]
+   media-libs/glew:0=
+   media-libs/libpng:0=
+   media-libs/qhull:=
+   sci-libs/libigl
+   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-08-16 Thread Piotr Karbowski
commit: b5369b00bdec372e80a90957620c364cf0ca15f1
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Tue Aug 16 09:03:19 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Tue Aug 16 09:03:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5369b00

media-gfx/prusaslicer: drop unfortunate tagged 2.6.0_pre*

Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/Manifest |  2 -
 .../prusaslicer-2.6.0_pre20220601-r2.ebuild| 76 --
 .../prusaslicer-2.6.0_pre20220620-r2.ebuild| 76 --
 3 files changed, 154 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index cf0d605a0d71..0aa6f5851865 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1 @@
 DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 
161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e
 SHA512 
8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
-DIST prusaslicer-2.6.0_pre20220601.tar.xz 29096924 BLAKE2B 
d1bb1733528a817384583c203fa84bd41daee97f24698fd421967838a8c4ec7a8705de39ad065ac1778c7e67289a491c298d063a4a53e5276256a3f230cba43c
 SHA512 
d8581c292f4b6085992046a3063d90b151746690df9d7eea01bf68e72508f1b54e7547c1fcc0dd493712a752dcd158deed037559bd8825fc521e5b6aa5b199f8
-DIST prusaslicer-2.6.0_pre20220620.tar.xz 29309256 BLAKE2B 
2b2dda3f1efa05e674574812b50773b0f6c6d0c1dcfa0095deab7b80e62c5ed9f5837bc6141993ed41bcf985c598c11cf2741e17623309dbf8d7612c7af24a50
 SHA512 
7ad510b1e0db1774500049b76547e73b62976be897d47d118844c996939f843c9c0699c96bdf9569992a4d170a900e302566aa45ec8abee9ee4742104fb5deea

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r2.ebuild
deleted file mode 100644
index a434e9143e10..
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit cmake desktop 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://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz";
-
-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-1.73.0:=[nls,threads(+)]
-   dev-libs/cereal
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/gmp:=
-   dev-libs/mpfr:=
-   dev-libs/imath:=
-   >=media-gfx/openvdb-8.2:=
-   net-misc/curl[adns]
-   media-libs/glew:0=
-   media-libs/libpng:0=
-   media-libs/qhull:=
-   sci-libs/libigl
-   sci-libs/nlopt
-   >=sci-mathematics/cgal-5.0:=
-   sys-apps/dbus
-   sys-libs/zlib:=
-   virtual/glu
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-"
-
-S="${WORKDIR}"
-
-src_prepare() {
-   sed -i -e 
's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g'
 version.inc || 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
-}

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r2.ebuild
deleted file mode 100644
index 6bd9f864a81b..
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-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://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz";
-
-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-1.73.0:=[nls,threads(+)]
-   dev-libs/cereal
-  

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-08-05 Thread Agostino Sarubbo
commit: 3100ed66ab34126ba38959781966bca3dd28eed6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Aug  5 11:33:48 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Aug  5 11:33:48 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3100ed66

media-gfx/prusaslicer: amd64 stable wrt bug #862345

Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
index 8f23b0f55fbf..6fb192759df2 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/prusa3d/PrusaSlicer/archive/refs/tags/version_2.5.0-
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-07-06 Thread Piotr Karbowski
commit: 4affbff1644fa09e286957bd246a00b3c9dc5799
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed Jul  6 21:01:43 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed Jul  6 21:25:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4affbff1

media-gfx/prusaslicer: depend on curl with async DNS support.

Closes: https://bugs.gentoo.org/853973
Signed-off-by: Piotr Karbowski  gentoo.org>

 ...usaslicer-2.5.0_alpha2.ebuild => prusaslicer-2.5.0_alpha2-r1.ebuild} | 2 +-
 0_pre20220601-r1.ebuild => prusaslicer-2.6.0_pre20220601-r2.ebuild} | 2 +-
 0_pre20220620-r1.ebuild => prusaslicer-2.6.0_pre20220620-r2.ebuild} | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
similarity index 98%
rename from media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
index adcc79140a37..8f23b0f55fbf 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.5.0_alpha2-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
dev-libs/mpfr:=
dev-libs/imath:=
>=media-gfx/openvdb-8.2:=
-   net-misc/curl
+   net-misc/curl[adns]
media-libs/glew:0=
media-libs/libpng:0=
media-libs/qhull:=

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r2.ebuild
similarity index 98%
rename from media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r1.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r2.ebuild
index e1175d1591a4..a434e9143e10 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r2.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-libs/mpfr:=
dev-libs/imath:=
>=media-gfx/openvdb-8.2:=
-   net-misc/curl
+   net-misc/curl[adns]
media-libs/glew:0=
media-libs/libpng:0=
media-libs/qhull:=

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r2.ebuild
similarity index 98%
rename from media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r1.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r2.ebuild
index e90d15a4423e..6bd9f864a81b 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r1.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r2.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-libs/mpfr:=
dev-libs/imath:=
>=media-gfx/openvdb-8.2:=
-   net-misc/curl
+   net-misc/curl[adns]
media-libs/glew:0=
media-libs/libpng:0=
media-libs/qhull:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2022-07-02 Thread Piotr Karbowski
commit: 0094c528b4e54cb6f6096d68443c66a7e83c0d00
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sat Jul  2 10:18:34 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sat Jul  2 10:19:05 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0094c528

media-gfx/prusaslicer: 2.5.0_alpha2 added.

Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/Manifest |   1 +
 .../prusaslicer-2.5.0_alpha2-boost-fixes.patch | 103 +
 .../files/prusaslicer-boost-1.79.0-fixes.patch |  52 ---
 .../prusaslicer/prusaslicer-2.5.0_alpha2.ebuild|  83 +
 4 files changed, 187 insertions(+), 52 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 665768040b96..cf0d605a0d71 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1,3 @@
+DIST prusaslicer-2.5.0_alpha2.tar.gz 48053741 BLAKE2B 
161462ee4dc061ee1816c165b0e85688bcce1ee010451f3d6d724a71526ccea4eb006c9610124ec006ff19b030af2fcb74993016658069222d98152f29660c7e
 SHA512 
8c29d79349e834df284374131659b863d1df592ee5304f2bae7cdbe1825feac465eaf78e0932d4184f4077a44d6add3194db31f12c5202cb064020fbaf4beecd
 DIST prusaslicer-2.6.0_pre20220601.tar.xz 29096924 BLAKE2B 
d1bb1733528a817384583c203fa84bd41daee97f24698fd421967838a8c4ec7a8705de39ad065ac1778c7e67289a491c298d063a4a53e5276256a3f230cba43c
 SHA512 
d8581c292f4b6085992046a3063d90b151746690df9d7eea01bf68e72508f1b54e7547c1fcc0dd493712a752dcd158deed037559bd8825fc521e5b6aa5b199f8
 DIST prusaslicer-2.6.0_pre20220620.tar.xz 29309256 BLAKE2B 
2b2dda3f1efa05e674574812b50773b0f6c6d0c1dcfa0095deab7b80e62c5ed9f5837bc6141993ed41bcf985c598c11cf2741e17623309dbf8d7612c7af24a50
 SHA512 
7ad510b1e0db1774500049b76547e73b62976be897d47d118844c996939f843c9c0699c96bdf9569992a4d170a900e302566aa45ec8abee9ee4742104fb5deea

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
new file mode 100644
index ..749f3c06289a
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.5.0_alpha2-boost-fixes.patch
@@ -0,0 +1,103 @@
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029c..d75f8c5 100644
+--- a/src/hints/HintsToPot.cpp
 b/src/hints/HintsToPot.cpp
+@@ -1,6 +1,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -9,7 +10,7 @@
+ 
+ bool write_to_pot(boost::filesystem::path path, const 
std::vector>& data)
+ {
+-  boost::filesystem::ofstream file(std::move(path), std::ios_base::app);
++  boost::nowide::ofstream file(std::move(path), std::ios_base::app);
+   for (const auto& element : data)
+   {
+   //Example of .pot element 
+diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
+index 4664cff..41dd374 100644
+--- a/src/libslic3r/Preset.cpp
 b/src/libslic3r/Preset.cpp
+@@ -25,6 +25,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -84,7 +85,7 @@ ConfigFileType guess_config_file_type(const ptree &tree)
+ VendorProfile VendorProfile::from_ini(const boost::filesystem::path &path, 
bool load_all)
+ {
+ ptree tree;
+-boost::filesystem::ifstream ifs(path);
++boost::nowide::ifstream ifs(path);
+ boost::property_tree::read_ini(ifs, tree);
+ return VendorProfile::from_ini(tree, path, load_all);
+ }
+diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp 
b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+index 81c681b..7f99a50 100644
+--- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
 b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+@@ -10,6 +10,7 @@
+ #include "libslic3r/Platform.hpp"
+ #include "libslic3r/Config.hpp"
+ 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
+ 
+ } // namespace GUI
+ } // namespace Slic3r
+-#endif // __linux__
+\ No newline at end of file
++#endif // __linux__
+diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
+index 5bc770b..d566e91 100644
+--- a/src/slic3r/GUI/GUI_App.cpp
 b/src/slic3r/GUI/GUI_App.cpp
+@@ -13,6 +13,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/slic3r/GUI/HintNotification.cpp 
b/src/slic3r/GUI/HintNotification.cpp
+index 14ebbc6..2de896c 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
 b/src/slic3r/GUI/HintNotification.cpp
+@@ -15,6 +15,7 @@
+ #include "libslic3r/PrintConfig.hpp"
+ 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -65,7 +66,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& 
col, bool fading_out, f
+ 
+ void write_used_binary(const std::vector& ids)
+ {
+-  boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / 
"cache" / "hints.cereal"), std::ios::binary);
++  boost::nowide::ofstream file((bo

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-06-26 Thread Piotr Karbowski
commit: 21d4ab0fc804d1e1b887a844a7303fbbec848f9d
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Jun 26 20:21:07 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Jun 26 20:21:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d4ab0f

media-gfx/prusaslicer: Regenerate manifest after drop old.

Who will be faster, me or CI?

Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/Manifest | 4 
 1 file changed, 4 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 14c0dee9cad3..665768040b96 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,6 +1,2 @@
-DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 
686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47
 SHA512 
e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
-DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 
8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7
 SHA512 
895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
-DIST prusaslicer-2.4.2.tar.gz 47752224 BLAKE2B 
27b00b766890f8675246eded75c51a671832a3abf518adf7b825dbe8396cbfd2d4b48f76d646675634af49ddbe4cd48ea8e533d66a131d14bff4e76bdd357545
 SHA512 
d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f
-DIST prusaslicer-2.4.2_p20220506.tar.xz 29109336 BLAKE2B 
c8430b355a3d161c1aa9ab421edf1f291a7898d4fd2831fe924dc2d742bdb611d58d4e9f581c00fc37f18b6c54df2d82ca063091958ccb0859254014972a9477
 SHA512 
bf525e12fbc5a471fc28ffa048ec8628de892bfc7e65cb708266ef5d05692cf9c0755eae879b8fad0572d6af7368e2c251361941157ab2c9be73cb38c8962f72
 DIST prusaslicer-2.6.0_pre20220601.tar.xz 29096924 BLAKE2B 
d1bb1733528a817384583c203fa84bd41daee97f24698fd421967838a8c4ec7a8705de39ad065ac1778c7e67289a491c298d063a4a53e5276256a3f230cba43c
 SHA512 
d8581c292f4b6085992046a3063d90b151746690df9d7eea01bf68e72508f1b54e7547c1fcc0dd493712a752dcd158deed037559bd8825fc521e5b6aa5b199f8
 DIST prusaslicer-2.6.0_pre20220620.tar.xz 29309256 BLAKE2B 
2b2dda3f1efa05e674574812b50773b0f6c6d0c1dcfa0095deab7b80e62c5ed9f5837bc6141993ed41bcf985c598c11cf2741e17623309dbf8d7612c7af24a50
 SHA512 
7ad510b1e0db1774500049b76547e73b62976be897d47d118844c996939f843c9c0699c96bdf9569992a4d170a900e302566aa45ec8abee9ee4742104fb5deea



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-06-26 Thread Piotr Karbowski
commit: 147c21715d8e926e556681cce16139c39e117cec
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sun Jun 26 20:18:45 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sun Jun 26 20:20:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=147c2171

media-gfx/prusaslicer: drop old.

Closes: https://bugs.gentoo.org/829874
Closes: https://bugs.gentoo.org/824854
Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild  | 82 --
 media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild | 82 --
 media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild | 82 --
 .../prusaslicer/prusaslicer-2.4.2_p20220506.ebuild | 80 -
 4 files changed, 326 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
deleted file mode 100644
index 6965a84a96a9..
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit cmake desktop wxwidgets xdg
-
-MY_PN="PrusaSlicer"
-
-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/${MY_PN}/archive/version_${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? ( test )"
-
-RDEPEND="
-   dev-cpp/eigen:3
-   >=dev-cpp/tbb-2021.4.0:=
-   >=dev-libs/boost-1.73.0:=[nls,threads(+)]
-   dev-libs/cereal
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/gmp:=
-   dev-libs/mpfr:=
-   dev-libs/imath:=
-   >=media-gfx/openvdb-8.2:=
-   net-misc/curl
-   media-libs/glew:0=
-   media-libs/libpng:0=
-   media-libs/qhull:=
-   sci-libs/libigl
-   sci-libs/nlopt
-   >=sci-mathematics/cgal-5.0:=
-   sys-apps/dbus
-   sys-libs/zlib:=
-   virtual/glu
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-fix-build-with-cereal-1.3.1.patch
-)
-
-S="${WORKDIR}/${MY_PN}-version_${PV}"
-
-src_prepare() {
-   sed -i -e 
's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g'
 version.inc || 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
-}

diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
deleted file mode 100644
index c402f1a876fd..
--- a/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit cmake desktop wxwidgets xdg
-
-MY_PN="PrusaSlicer"
-
-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/${MY_PN}/archive/version_${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? ( test )"
-
-RDEPEND="
-   dev-cpp/eigen:3
-   >=dev-cpp/tbb-2021.4.0:=
-   >=dev-libs/boost-1.73.0:=[nls,threads(+)]
-   dev-libs/cereal
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/gmp:=
-   dev-libs/mpfr:=
-   dev-libs/imath:=
-   >=media-gfx/openvdb-8.2:=
-   net-misc/curl
-   media-libs/glew:0=
-   media-libs/libpng:0=
-   media-libs/qhull:=
-   sci-libs/libigl
-   sci-libs/nlopt
-   >=sci-mathematics/cgal-5.0:=
-   sys-apps/dbus
-   sys-libs/zlib:=
-   virtual/glu
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-2.4.0-fix-build-with-cereal-1.3.1.patch
-)
-
-S="${WORKDIR}/${MY_PN}-version_${PV}"
-
-src_prepare() {
-   sed -i -e 
's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g'
 version.inc || die
-   cmake_src_prepare
-}
-
-src_configure() {
-   CMAKE_

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-06-25 Thread Sam James
commit: 727efd129ea9ab3726e101fdfb39be35317b8149
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun 25 23:51:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun 25 23:51:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727efd12

media-gfx/prusaslicer: relax TBB dep

Closes: https://bugs.gentoo.org/851783
Signed-off-by: Sam James  gentoo.org>

 ...2.6.0_pre20220601.ebuild => prusaslicer-2.6.0_pre20220601-r1.ebuild} | 2 +-
 ...2.6.0_pre20220620.ebuild => prusaslicer-2.6.0_pre20220620-r1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r1.ebuild
similarity index 98%
rename from media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r1.ebuild
index 380cd394c637..e1175d1591a4 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601-r1.ebuild
@@ -20,7 +20,7 @@ RESTRICT="test"
 
 RDEPEND="
dev-cpp/eigen:3
-   >=dev-cpp/tbb-2021.4.0:=
+   dev-cpp/tbb:=
>=dev-libs/boost-1.73.0:=[nls,threads(+)]
dev-libs/cereal
dev-libs/expat

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r1.ebuild
similarity index 98%
rename from media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild
rename to media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r1.ebuild
index a3e72276b58d..e90d15a4423e 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620-r1.ebuild
@@ -20,7 +20,7 @@ RESTRICT="test"
 
 RDEPEND="
dev-cpp/eigen:3
-   >=dev-cpp/tbb-2021.4.0:=
+   dev-cpp/tbb:=
>=dev-libs/boost-1.73.0:=[nls,threads(+)]
dev-libs/cereal
dev-libs/expat



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-06-23 Thread Piotr Karbowski
commit: 960aba0a6ecb778757b92d879da2ccc95921d205
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Thu Jun 23 22:08:53 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Jun 23 22:09:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=960aba0a

media-gfx/prusaslicer: 2.6.0_pre20220620 version bump.

Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 .../prusaslicer-2.6.0_pre20220620.ebuild   | 76 ++
 2 files changed, 77 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index b3c110bd9c16..14c0dee9cad3 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -3,3 +3,4 @@ DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 
8c6030560926e53c780847e7b8a058205
 DIST prusaslicer-2.4.2.tar.gz 47752224 BLAKE2B 
27b00b766890f8675246eded75c51a671832a3abf518adf7b825dbe8396cbfd2d4b48f76d646675634af49ddbe4cd48ea8e533d66a131d14bff4e76bdd357545
 SHA512 
d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f
 DIST prusaslicer-2.4.2_p20220506.tar.xz 29109336 BLAKE2B 
c8430b355a3d161c1aa9ab421edf1f291a7898d4fd2831fe924dc2d742bdb611d58d4e9f581c00fc37f18b6c54df2d82ca063091958ccb0859254014972a9477
 SHA512 
bf525e12fbc5a471fc28ffa048ec8628de892bfc7e65cb708266ef5d05692cf9c0755eae879b8fad0572d6af7368e2c251361941157ab2c9be73cb38c8962f72
 DIST prusaslicer-2.6.0_pre20220601.tar.xz 29096924 BLAKE2B 
d1bb1733528a817384583c203fa84bd41daee97f24698fd421967838a8c4ec7a8705de39ad065ac1778c7e67289a491c298d063a4a53e5276256a3f230cba43c
 SHA512 
d8581c292f4b6085992046a3063d90b151746690df9d7eea01bf68e72508f1b54e7547c1fcc0dd493712a752dcd158deed037559bd8825fc521e5b6aa5b199f8
+DIST prusaslicer-2.6.0_pre20220620.tar.xz 29309256 BLAKE2B 
2b2dda3f1efa05e674574812b50773b0f6c6d0c1dcfa0095deab7b80e62c5ed9f5837bc6141993ed41bcf985c598c11cf2741e17623309dbf8d7612c7af24a50
 SHA512 
7ad510b1e0db1774500049b76547e73b62976be897d47d118844c996939f843c9c0699c96bdf9569992a4d170a900e302566aa45ec8abee9ee4742104fb5deea

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild
new file mode 100644
index ..a3e72276b58d
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220620.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+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://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz";
+
+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-2021.4.0:=
+   >=dev-libs/boost-1.73.0:=[nls,threads(+)]
+   dev-libs/cereal
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/gmp:=
+   dev-libs/mpfr:=
+   dev-libs/imath:=
+   >=media-gfx/openvdb-8.2:=
+   net-misc/curl
+   media-libs/glew:0=
+   media-libs/libpng:0=
+   media-libs/qhull:=
+   sci-libs/libigl
+   sci-libs/nlopt
+   >=sci-mathematics/cgal-5.0:=
+   sys-apps/dbus
+   sys-libs/zlib:=
+   virtual/glu
+   virtual/opengl
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+   sed -i -e 
's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g'
 version.inc || 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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-06-09 Thread Sam James
commit: 3309b3db0c33d3ba117b9ac3448c82b12e6bb614
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 10 03:15:50 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 10 03:15:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3309b3db

media-gfx/prusaslicer: Stabilize 2.6.0_pre20220601 amd64, #843353

Signed-off-by: Sam James  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
index aecea64d8cd9..380cd394c637 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz";
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-06-02 Thread Piotr Karbowski
commit: c371846e13bf7188fb452bc9f2453e5802eaf65a
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Thu Jun  2 22:26:59 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Thu Jun  2 22:28:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c371846e

media-gfx/prusaslicer: skip tests due to fff tests hanging.

Bug: https://github.com/prusa3d/PrusaSlicer/issues/8379
Closes: https://bugs.gentoo.org/843410
Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
index e096571e5c42..aecea64d8cd9 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-RESTRICT="!test? ( test )"
+RESTRICT="test"
 
 RDEPEND="
dev-cpp/eigen:3



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-06-01 Thread Piotr Karbowski
commit: d650834618ae05f39617970cf6123bec68a27c66
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed Jun  1 22:38:36 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed Jun  1 22:39:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6508346

media-gfx/prusaslicer: 2.6.0_pre20220601 version added.

Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 .../prusaslicer-2.6.0_pre20220601.ebuild   | 76 ++
 2 files changed, 77 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 3066ed61a1a7..b3c110bd9c16 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -2,3 +2,4 @@ DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 
686232fddd3e2105db1325ab085b49f6f
 DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 
8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7
 SHA512 
895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
 DIST prusaslicer-2.4.2.tar.gz 47752224 BLAKE2B 
27b00b766890f8675246eded75c51a671832a3abf518adf7b825dbe8396cbfd2d4b48f76d646675634af49ddbe4cd48ea8e533d66a131d14bff4e76bdd357545
 SHA512 
d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f
 DIST prusaslicer-2.4.2_p20220506.tar.xz 29109336 BLAKE2B 
c8430b355a3d161c1aa9ab421edf1f291a7898d4fd2831fe924dc2d742bdb611d58d4e9f581c00fc37f18b6c54df2d82ca063091958ccb0859254014972a9477
 SHA512 
bf525e12fbc5a471fc28ffa048ec8628de892bfc7e65cb708266ef5d05692cf9c0755eae879b8fad0572d6af7368e2c251361941157ab2c9be73cb38c8962f72
+DIST prusaslicer-2.6.0_pre20220601.tar.xz 29096924 BLAKE2B 
d1bb1733528a817384583c203fa84bd41daee97f24698fd421967838a8c4ec7a8705de39ad065ac1778c7e67289a491c298d063a4a53e5276256a3f230cba43c
 SHA512 
d8581c292f4b6085992046a3063d90b151746690df9d7eea01bf68e72508f1b54e7547c1fcc0dd493712a752dcd158deed037559bd8825fc521e5b6aa5b199f8

diff --git a/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
new file mode 100644
index ..e096571e5c42
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.6.0_pre20220601.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake desktop 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://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz";
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   dev-cpp/eigen:3
+   >=dev-cpp/tbb-2021.4.0:=
+   >=dev-libs/boost-1.73.0:=[nls,threads(+)]
+   dev-libs/cereal
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/gmp:=
+   dev-libs/mpfr:=
+   dev-libs/imath:=
+   >=media-gfx/openvdb-8.2:=
+   net-misc/curl
+   media-libs/glew:0=
+   media-libs/libpng:0=
+   media-libs/qhull:=
+   sci-libs/libigl
+   sci-libs/nlopt
+   >=sci-mathematics/cgal-5.0:=
+   sys-apps/dbus
+   sys-libs/zlib:=
+   virtual/glu
+   virtual/opengl
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+"
+
+S="${WORKDIR}"
+
+src_prepare() {
+   sed -i -e 
's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g'
 version.inc || 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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2022-05-09 Thread Piotr Karbowski
commit: 2d3635b05d63dd83c51b18be613effb415f549ff
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Mon May  9 08:42:53 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Mon May  9 08:44:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3635b0

media-gfx/prusaslicer: 20220506 snapshot with Boost 1.79.0 patch.

Bug: https://github.com/prusa3d/PrusaSlicer/issues/8302
Fixes: https://bugs.gentoo.org/843284
Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 .../files/prusaslicer-boost-1.79.0-fixes.patch | 52 ++
 .../prusaslicer/prusaslicer-2.4.2_p20220506.ebuild | 80 ++
 3 files changed, 133 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 7244483c429b..3066ed61a1a7 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,3 +1,4 @@
 DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 
686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47
 SHA512 
e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
 DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 
8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7
 SHA512 
895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
 DIST prusaslicer-2.4.2.tar.gz 47752224 BLAKE2B 
27b00b766890f8675246eded75c51a671832a3abf518adf7b825dbe8396cbfd2d4b48f76d646675634af49ddbe4cd48ea8e533d66a131d14bff4e76bdd357545
 SHA512 
d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f
+DIST prusaslicer-2.4.2_p20220506.tar.xz 29109336 BLAKE2B 
c8430b355a3d161c1aa9ab421edf1f291a7898d4fd2831fe924dc2d742bdb611d58d4e9f581c00fc37f18b6c54df2d82ca063091958ccb0859254014972a9477
 SHA512 
bf525e12fbc5a471fc28ffa048ec8628de892bfc7e65cb708266ef5d05692cf9c0755eae879b8fad0572d6af7368e2c251361941157ab2c9be73cb38c8962f72

diff --git a/media-gfx/prusaslicer/files/prusaslicer-boost-1.79.0-fixes.patch 
b/media-gfx/prusaslicer/files/prusaslicer-boost-1.79.0-fixes.patch
new file mode 100644
index ..1026d1263552
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-boost-1.79.0-fixes.patch
@@ -0,0 +1,52 @@
+diff --git a/src/slic3r/GUI/DesktopIntegrationDialog.cpp 
b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+index 81c681bc3..7f99a505c 100644
+--- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
 b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
+@@ -10,6 +10,7 @@
+ #include "libslic3r/Platform.hpp"
+ #include "libslic3r/Config.hpp"
+ 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegrationDialog()
+ 
+ } // namespace GUI
+ } // namespace Slic3r
+-#endif // __linux__
+\ No newline at end of file
++#endif // __linux__
+diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp
+index 8533854f4..4435f836b 100644
+--- a/src/slic3r/GUI/GUI_App.cpp
 b/src/slic3r/GUI/GUI_App.cpp
+@@ -13,6 +13,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #include 
+diff --git a/src/slic3r/Utils/AppUpdater.cpp b/src/slic3r/Utils/AppUpdater.cpp
+index 60739ccb3..80f31f69f 100644
+--- a/src/slic3r/Utils/AppUpdater.cpp
 b/src/slic3r/Utils/AppUpdater.cpp
+@@ -5,6 +5,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include  
+ #include 
+@@ -242,7 +243,7 @@ boost::filesystem::path 
AppUpdater::priv::download_file(const DownloadAppData& d
+   tmp_path += format(".%1%%2%", get_current_pid(), 
".download");
+   try
+   {
+-  boost::filesystem::fstream file(tmp_path, 
std::ios::out | std::ios::binary | std::ios::trunc);
++  boost::nowide::fstream file(tmp_path, 
std::ios::out | std::ios::binary | std::ios::trunc);
+   file.write(body.c_str(), body.size());
+   file.close();
+   boost::filesystem::rename(tmp_path, dest_path);

diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.2_p20220506.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.4.2_p20220506.ebuild
new file mode 100644
index ..26052c4ee910
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.2_p20220506.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake desktop 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://dev.ge

[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-05-04 Thread Piotr Karbowski
commit: f847ab77cd5a4b6560fb1809056e51e9121f4f66
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Wed May  4 21:53:32 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Wed May  4 21:53:53 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f847ab77

media-gfx/prusaslicer: 2.4.2 version bump.

Signed-off-by: Piotr Karbowski  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild | 82 ++
 2 files changed, 83 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 4c9c480f1b37..7244483c429b 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1,3 @@
 DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 
686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47
 SHA512 
e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
 DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 
8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7
 SHA512 
895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a
+DIST prusaslicer-2.4.2.tar.gz 47752224 BLAKE2B 
27b00b766890f8675246eded75c51a671832a3abf518adf7b825dbe8396cbfd2d4b48f76d646675634af49ddbe4cd48ea8e533d66a131d14bff4e76bdd357545
 SHA512 
d480c608eadb58b53ee220317a749c0363db580759322ed7a9aebe2ea5c1acc30dbd3bdf9ed9849c23ba5c125ee6f923de6ac01987bf85abf7aeb3f91c2ae23f

diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild
new file mode 100644
index ..c402f1a876fd
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake desktop wxwidgets xdg
+
+MY_PN="PrusaSlicer"
+
+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/${MY_PN}/archive/version_${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? ( test )"
+
+RDEPEND="
+   dev-cpp/eigen:3
+   >=dev-cpp/tbb-2021.4.0:=
+   >=dev-libs/boost-1.73.0:=[nls,threads(+)]
+   dev-libs/cereal
+   dev-libs/expat
+   dev-libs/glib:2
+   dev-libs/gmp:=
+   dev-libs/mpfr:=
+   dev-libs/imath:=
+   >=media-gfx/openvdb-8.2:=
+   net-misc/curl
+   media-libs/glew:0=
+   media-libs/libpng:0=
+   media-libs/qhull:=
+   sci-libs/libigl
+   sci-libs/nlopt
+   >=sci-mathematics/cgal-5.0:=
+   sys-apps/dbus
+   sys-libs/zlib:=
+   virtual/glu
+   virtual/opengl
+   x11-libs/gtk+:3
+   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+"
+DEPEND="${RDEPEND}
+   media-libs/qhull[static-libs]
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.4.0-fix-build-with-cereal-1.3.1.patch
+)
+
+S="${WORKDIR}/${MY_PN}-version_${PV}"
+
+src_prepare() {
+   sed -i -e 
's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g'
 version.inc || 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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-03-21 Thread Agostino Sarubbo
commit: 5c9d9986aea8caa857d03428570f5920961be57c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 21 15:20:18 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 21 15:20:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c9d9986

media-gfx/prusaslicer: amd64 stable wrt bug #835628

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
index f0e766df6b30..6965a84a96a9 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
@@ -15,7 +15,7 @@ 
SRC_URI="https://github.com/prusa3d/${MY_PN}/archive/version_${PV}.tar.gz -> ${P
 
 LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RESTRICT="!test? ( test )"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/

2022-03-13 Thread Dennis Lamm
commit: 934fb95d915c92846893bc2c43a6e0d1cb3d0bb5
Author: Dennis Lamm  gentoo  org>
AuthorDate: Mon Mar 14 06:30:59 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Mon Mar 14 06:51:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=934fb95d

media-gfx/prusaslicer: drop old

Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Closes: https://github.com/gentoo/gentoo/pull/24546
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild | 76 ---
 1 file changed, 76 deletions(-)

diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild
deleted file mode 100644
index 51a5b4378a17..
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-
-inherit cmake desktop wxwidgets xdg
-
-MY_PN="PrusaSlicer"
-
-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/${MY_PN}/archive/version_${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? ( test )"
-
-RDEPEND="
-   dev-cpp/eigen:3
-   >=dev-cpp/tbb-2021.4.0
-   >=dev-libs/boost-1.73.0:=[nls,threads(+)]
-   dev-libs/cereal
-   dev-libs/expat
-   dev-libs/glib:2
-   dev-libs/gmp:=
-   dev-libs/mpfr:=
-   >=media-gfx/openvdb-8.2
-   net-misc/curl
-   media-libs/glew:0=
-   media-libs/ilmbase:=
-   media-libs/libpng:0=
-   media-libs/qhull:=
-   sci-libs/libigl
-   sci-libs/nlopt
-   >=sci-mathematics/cgal-5.0:=
-   sys-apps/dbus
-   sys-libs/zlib:=
-   virtual/glu
-   virtual/opengl
-   x11-libs/gtk+:3
-   x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-"
-DEPEND="${RDEPEND}
-   media-libs/qhull[static-libs]
-"
-
-S="${WORKDIR}/${MY_PN}-version_${PV}"
-
-src_prepare() {
-   sed -i -e 
's/PrusaSlicer-${SLIC3R_VERSION}+UNKNOWN/PrusaSlicer-${SLIC3R_VERSION}+Gentoo/g'
 version.inc || die
-   cmake_src_prepare
-}
-
-src_configure() {
-   CMAKE_BUILD_TYPE="Release"
-
-   setup-wxwidgets
-
-   local mycmakeargs=(
-   -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
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/prusaslicer/, media-gfx/prusaslicer/files/

2022-03-13 Thread Dennis Lamm
commit: 82d3469a592e7e27dd434ad2697c1ca0094e5d35
Author: Dennis Lamm  gentoo  org>
AuthorDate: Mon Mar 14 06:29:44 2022 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Mon Mar 14 06:51:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d3469a

media-gfx/prusaslicer: 2.4.1 version bump

Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/Manifest  | 1 +
 ...-1.3.1.patch => prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch} | 0
 media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild   | 2 +-
 .../{prusaslicer-2.4.0-r2.ebuild => prusaslicer-2.4.1.ebuild}   | 2 +-
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index d7c9689e19a8..4c9c480f1b37 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1 +1,2 @@
 DIST prusaslicer-2.4.0.tar.gz 46397442 BLAKE2B 
686232fddd3e2105db1325ab085b49f6f7a028a24ab90120daf94c53255f09b19411e0ff075bfe7abff138d3c276e8b5341ff6d59e267087bcd4568ac1113c47
 SHA512 
e923e4e6273dbcfc3e2bc0e28f9eb8cda8530747c0a834f48aea715d75ba1d02be9cfee043689efccdaee40de00114f7964e43accad245b9acd801b997868e3c
+DIST prusaslicer-2.4.1.tar.gz 55572739 BLAKE2B 
8c6030560926e53c780847e7b8a0582055b59c6b8355a2bfff19552d730cc31fc929437aa6ed93fd38d024699129bd550a1b250523387658117d1f2764cfd2b7
 SHA512 
895388ec39e46e30ea7bdecba42793e898ceb6c6b331dad815a726ed2f7e2e8719c71c32c6ce7fff1781fa06aac8e9afb615784d3b2001bd0d6e24ba23f0866a

diff --git 
a/media-gfx/prusaslicer/files/2.4.0-fix-build-with-cereal-1.3.1.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch
similarity index 100%
rename from media-gfx/prusaslicer/files/2.4.0-fix-build-with-cereal-1.3.1.patch
rename to 
media-gfx/prusaslicer/files/prusaslicer-2.4.0-fix-build-with-cereal-1.3.1.patch

diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
index e3318ba01834..f0e766df6b30 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PV}-fix-build-with-cereal-1.3.1.patch
+   "${FILESDIR}"/${P}-fix-build-with-cereal-1.3.1.patch
 )
 
 S="${WORKDIR}/${MY_PN}-version_${PV}"

diff --git a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
similarity index 96%
copy from media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
copy to media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
index e3318ba01834..c402f1a876fd 100644
--- a/media-gfx/prusaslicer/prusaslicer-2.4.0-r2.ebuild
+++ b/media-gfx/prusaslicer/prusaslicer-2.4.1.ebuild
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PV}-fix-build-with-cereal-1.3.1.patch
+   "${FILESDIR}"/${PN}-2.4.0-fix-build-with-cereal-1.3.1.patch
 )
 
 S="${WORKDIR}/${MY_PN}-version_${PV}"



  1   2   >