[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=(

[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/, 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 )
- VendorProfile VendorProfile::from_ini(const boost::filesystem::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 
-+#include

[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:=
+

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

2023-03-23 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)"

[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/, 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/, 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 )
+ VendorProfile VendorProfile::from_ini(const boost::filesystem::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

[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/;

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

2022-03-14 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}"

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

2021-02-07 Thread Dennis Lamm 
commit: 8957d845a5aa219acf1a63a1b6bfb0743423836f
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sun Feb  7 19:13:00 2021 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sun Feb  7 21:30:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8957d845

media-gfx/prusaslicer: drop old

Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 -
 .../files/prusaslicer-2.2.0-atomic.patch   | 10 ---
 .../files/prusaslicer-2.2.0-boost-1.73.patch   | 60 
 media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild  | 79 --
 4 files changed, 150 deletions(-)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index 4dcbadca21f..33a0f438d35 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1,2 +1 @@
-DIST prusaslicer-2.2.0.tar.gz 30811929 BLAKE2B 
cde004add53ee025728d566cb7331cb7b1eac5412e9ad3bee037d13277c24dcdc6024c91f09bb9ef0653a12a3ee7c5cb5cec21e2a00825d185472ea7036e08f5
 SHA512 
5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d
 DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 
89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7
 SHA512 
2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch
deleted file mode 100644
index 4319ad0f146..000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-atomic.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/src/slic3r/GUI/Mouse3DController.hpp
-+++ b/src/slic3r/GUI/Mouse3DController.hpp
-@@ -8,6 +8,7 @@
-
- #include "hidapi.h"
-
-+#include 
- #include 
- #include 
- #include 

diff --git a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch
deleted file mode 100644
index 50abea11b32..000
--- a/media-gfx/prusaslicer/files/prusaslicer-2.2.0-boost-1.73.patch
+++ /dev/null
@@ -1,60 +0,0 @@
 a/src/admesh/stlinit.cpp
-+++ b/src/admesh/stlinit.cpp
-@@ -28,7 +28,6 @@
-
- #include 
- #include 
--#include 
-
- #include "stl.h"
-
-@@ -36,9 +35,9 @@
- #error "SEEK_SET not defined"
- #endif
-
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
- extern void stl_internal_reverse_quads(char *buf, size_t cnt);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
-
- static FILE* stl_open_count_facets(stl_file *stl, const char *file)
- {
-@@ -89,10 +88,10 @@
-   // Read the int following the header.  This should contain # of facets.
-   uint32_t header_num_facets;
-   bool header_num_faces_read = fread(_num_facets, 
sizeof(uint32_t), 1, fp) != 0;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
-   // Convert from little endian to big endian.
-   stl_internal_reverse_quads((char*)_num_facets, 4);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
-   if (! header_num_faces_read || num_facets != header_num_facets)
-   BOOST_LOG_TRIVIAL(info) << "stl_open_count_facets: 
Warning: File size doesn't match number of facets in the header: " << file;
-   }
-@@ -158,10 +157,10 @@
-   // Read a single facet from a binary .STL file. We 
assume little-endian architecture!
-   if (fread(, 1, SIZEOF_STL_FACET, fp) != 
SIZEOF_STL_FACET)
-   return false;
--#ifndef BOOST_LITTLE_ENDIAN
-+#if __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__
-   // Convert the loaded little endian data to big endian.
-   stl_internal_reverse_quads((char*), 48);
--#endif /* BOOST_LITTLE_ENDIAN */
-+#endif /* __BYTE_ORDER__ != __ORDER_LITTLE_ENDIAN__ */
-   } else {
-   // Read a single facet from an ASCII .STL file
-   // skip solid/endsolid
-
 a/CMakeLists.txt   (revision 3b2c51fd5ab04a72592bfdba1cd39cd6298b66c2)
-+++ b/CMakeLists.txt   (date 1607811414000)
-@@ -260,7 +260,7 @@
- # set(Boost_COMPILER "-mgw81")
- if(NOT WIN32)
- # boost::process was introduced first in version 1.64.0
--set(MINIMUM_BOOST_VERSION "1.64.0")
-+set(MINIMUM_BOOST_VERSION "1.72.0")
- endif()
- set(_boost_components 
"system;filesystem;thread;log;locale;regex;chrono;atomic;date_time")
- find_package(Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS 
${_boost_components})

diff --git a/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.2.0-r1.ebuild
deleted file mode 100644
index f7714afa61d..000
---

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

2021-02-04 Thread Sam James 
commit: 4fc943a7edd78e5ba3c0d42f053ca1e966e0032a
Author: Ionen Wolkens  gmail  com>
AuthorDate: Tue Jan 12 07:35:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb  5 02:06:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fc943a7

media-gfx/prusaslicer: 2.3.0 version bump + fixes

ebuild changes from 2.2.0-r1 to 2.3.0:
+ REQUIRED_USE on gui for tests (bug #760096)
+ patch to add missing miniz header (bug #761541)
+ qhull:=[static-libs] (qhull_r.so subslot + qhullcpp.a, bug #764338)
+ force GTK3 (bug #765031)
+ GUI deps optional with USE=-gui
+ hopefully all missing dependencies
- Release build type, not needed
- previous patches (applied upstream)
+ use .desktop files provided by the package
+ update licenses
+ minor cleanups

Closes: https://bugs.gentoo.org/760096
Closes: https://bugs.gentoo.org/761541
Closes: https://bugs.gentoo.org/764338
Closes: https://bugs.gentoo.org/765031
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Ionen Wolkens  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19059
Signed-off-by: Sam James  gentoo.org>

 media-gfx/prusaslicer/Manifest |  1 +
 .../files/prusaslicer-2.3.0-miniz-zip-header.patch |  9 +++
 media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild | 86 ++
 3 files changed, 96 insertions(+)

diff --git a/media-gfx/prusaslicer/Manifest b/media-gfx/prusaslicer/Manifest
index ac05bb7cb7d..4dcbadca21f 100644
--- a/media-gfx/prusaslicer/Manifest
+++ b/media-gfx/prusaslicer/Manifest
@@ -1 +1,2 @@
 DIST prusaslicer-2.2.0.tar.gz 30811929 BLAKE2B 
cde004add53ee025728d566cb7331cb7b1eac5412e9ad3bee037d13277c24dcdc6024c91f09bb9ef0653a12a3ee7c5cb5cec21e2a00825d185472ea7036e08f5
 SHA512 
5c8dc5b581e04208a1ae53771ef2607da189ee85aadf501ce1480008f5a6ddb10bb528ddc2608d3f04acd26c583ff895ad4148d6a1397f002292e20098971e1d
+DIST prusaslicer-2.3.0.tar.gz 34785471 BLAKE2B 
89691baf30ac2be901ebee594262a82e2c922ddae75b055561707fe152c392175766082844ad1ae2cb2fefb29a9d3abe03c0302ad84c347e94d127756429d0a7
 SHA512 
2bd3e7d384ba1c59007744f4aba89de9ca9864e4bdc7b6faa9a56f514212878d1d2e7d70fc0f08e39310af76c365d1a3f8f1df263e8656249483a5b33cab417d

diff --git 
a/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch 
b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
new file mode 100644
index 000..8fd587d3d48
--- /dev/null
+++ b/media-gfx/prusaslicer/files/prusaslicer-2.3.0-miniz-zip-header.patch
@@ -0,0 +1,9 @@
+https://bugs.gentoo.org/761541
+--- a/src/libslic3r/miniz_extension.hpp2021-01-11 08:01:51.0 
-0500
 b/src/libslic3r/miniz_extension.hpp2021-01-12 01:16:10.503404521 
-0500
+@@ -4,4 +4,5 @@
+ #include 
+ #include 
++#include 
+ 
+ namespace Slic3r {

diff --git a/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild 
b/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild
new file mode 100644
index 000..5cb1a4a2c4c
--- /dev/null
+++ b/media-gfx/prusaslicer/prusaslicer-2.3.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit xdg cmake desktop wxwidgets
+
+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="gui test"
+
+# tests fail to link with USE=-gui, bug #760096
+REQUIRED_USE="test? ( gui )"
+RESTRICT="!test? ( 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/gmp:=
+   dev-libs/miniz
+   dev-libs/mpfr:=
+   >=media-gfx/openvdb-5.0.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:=
+   gui? (
+   dev-libs/glib:2
+   media-libs/glew:0=
+   net-misc/curl
+   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}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-miniz-zip-header.patch"
+)
+
+src_configure() {
+   use gui && setup-wxwidgets
+
+   local mycmakeargs=(
+   -DSLIC3R_BUILD_TESTS=$(usex test)
+   -DSLIC3R_FHS=ON
+   -DSLIC3R_GTK=3
+   -DSLIC3R_GUI=$(usex gui)
+   -DSLIC3R_PCH=OFF
+   -DSLIC3R_WX_STABLE=ON
+   )
+
+   cmake_src_configure
+}
+
+src_install() {
+   cmake_src_install
+
+