[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
commit: 12895db94a8b7166dbcd7006ecfc05bcbc44dd39
Author: Pacho Ramos gentoo org>
AuthorDate: Sun Sep 15 12:12:18 2024 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sun Sep 15 12:25:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12895db9
media-gfx/superslicer: Fix boost headers and support wxGTK 3.2
Thanks-to: William Pettersson
Closes: https://bugs.gentoo.org/936146
Closes: https://bugs.gentoo.org/939115
Signed-off-by: Pacho Ramos gentoo.org>
.../superslicer-2.5.59.10-boost-headers.patch | 45 +
.../superslicer/superslicer-2.5.59.10-r1.ebuild| 110 +
2 files changed, 155 insertions(+)
diff --git
a/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch
new file mode 100644
index ..b6689d9a298e
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-headers.patch
@@ -0,0 +1,45 @@
+https://bugs.gentoo.org/936146
+--- a/src/slic3r/GUI/GLTexture.cpp 2024-08-10 11:05:17.663411745 +0100
b/src/slic3r/GUI/GLTexture.cpp 2024-08-10 11:05:34.463543701 +0100
+@@ -10,6 +10,8 @@
+
+ #include
+ #include
++#include
++#include
+
+ #include
+ #include
+--- a/src/slic3r/GUI/RemovableDriveManager.cpp 2024-08-10 11:24:53.572234573
+0100
b/src/slic3r/GUI/RemovableDriveManager.cpp 2024-08-10 11:28:24.393792051
+0100
+@@ -22,7 +22,7 @@
+ #include
+ #include
+ #include
+-#include
++//#include
+ #include
+ #endif
+
+--- a/src/slic3r/GUI/ScriptExecutor.cpp2024-08-10 11:28:32.423851365
+0100
b/src/slic3r/GUI/ScriptExecutor.cpp2024-08-10 11:28:41.893921315
+0100
+@@ -10,7 +10,7 @@
+ #include
+ #include
+ #include
+-#include
++//#include
+
+ #include
+ #include
+--- a/src/slic3r/GUI/BitmapCache.cpp.old 2024-08-10 12:00:52.538869133
+0100
b/src/slic3r/GUI/BitmapCache.cpp 2024-08-10 12:01:15.519040423 +0100
+@@ -6,6 +6,8 @@
+ #include "GUI_Utils.hpp"
+
+ #include
++#include
++#include
+
+ #ifdef __WXGTK2__
+ // Broken alpha workaround
diff --git a/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild
b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild
new file mode 100644
index ..a19e63212295
--- /dev/null
+++ b/media-gfx/superslicer/superslicer-2.5.59.10-r1.ebuild
@@ -0,0 +1,110 @@
+# 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="SuperSlicer"
+SLICER_PROFILES_COMMIT="ca25c7ec55dcc6073da61e39692c321cdb6497dc"
+
+inherit cmake wxwidgets xdg flag-o-matic
+
+DESCRIPTION="A mesh slicer to generate G-code for fused-filament-fabrication
(3D printers)"
+HOMEPAGE="https://github.com/supermerill/SuperSlicer/";
+SRC_URI="
+
https://github.com/supermerill/SuperSlicer/archive/refs/tags/${PV}.tar.gz ->
${P}.tar.gz
+
https://github.com/slic3r/slic3r-profiles/archive/${SLICER_PROFILES_COMMIT}.tar.gz
-> ${P}-profiles.tar.gz
+"
+
+LICENSE="AGPL-3 Boost-1.0 GPL-2 LGPL-3 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RESTRICT="test"
+
+# No dep on sci-libs/libigl, in-tree version cannot build
+# static library currently. Using bundled one.
+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:=
+ 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/nlopt
+ sci-libs/opencascade:=
+ >=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.5.59.2-boost.patch"
+ "${FILESDIR}/${PN}-2.5.59.2-cereal.patch"
+ "${FILESDIR}/${PN}-2.5.59.2-dont-install-angelscript.patch"
+ "${FILESDIR}/${PN}-2.5.59.2-gcodeviewer-symlink-fix.patch"
+ "${FILESDIR}/${PN}-2.5.59.2-missing-includes-fix.patch"
+ "${FILESDIR}/${PN}-2.5.59.2-openexr3.patch"
+ "${FILESDIR}/${PN}-2.5.59.2-wxgtk3-wayland-fix.patch"
+ "${FILESDIR}/${PN}-2.5.59.2-relax-OpenCASCADE-dep.patch"
+ "${FILESDIR}/${PN}-2.5.59.2-link-occtwrapper-statically.patch"
+ "${FILESDIR}/${PN}-2.5.59.8-additional-imports-fixes.patch"
+ "${FILESDIR}/${PN}-2.5.59.8-fix-compilation-error-gnu17.patch"
+ "${FILESDIR}/${PN}-2.5.59.8-libnest2d-link-xcb.patch"
+ "${FILESDIR}/${PN}-2.5.59.8-boost-replace-load-string-file.patch"
+ "${FILESDIR}/${PN}-2.5.59.10-boost-1.85.patch"
+ "${FILESDIR}/${PN}-2.5.59.10-boost-headers.patch"
+)
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_unpack() {
+ de
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
commit: 48aa1651c505a9a8bfc516e9eaeec8beb97065a7
Author: Sam James gentoo org>
AuthorDate: Tue Jul 16 07:52:34 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Jul 16 07:52:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48aa1651
media-gfx/superslicer: fix build w/ boost-1.85 (harder)
Closes: https://bugs.gentoo.org/936144
Signed-off-by: Sam James gentoo.org>
.../files/superslicer-2.5.59.10-boost-1.85.patch | 54 ++
media-gfx/superslicer/superslicer-2.5.59.10.ebuild | 1 +
2 files changed, 55 insertions(+)
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-1.85.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-1.85.patch
new file mode 100644
index ..8d9f11d3897d
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.10-boost-1.85.patch
@@ -0,0 +1,54 @@
+https://bugs.gentoo.org/936144
+https://github.com/supermerill/SuperSlicer/commit/75d4bee84740a8dcc9e4e2113795fd67107d03d1
+
+From 75d4bee84740a8dcc9e4e2113795fd67107d03d1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hejl?=
+Date: Wed, 3 Jan 2024 23:55:02 +0100
+Subject: [PATCH] Replace some deprecated boost functions.
+
+Actually, all those deprecated functions were internally called those new
functions. So there isn't any risk to use them directly.
+---
+ src/libslic3r/PrintBase.cpp | 2 +-
+ src/libslic3r/utils.cpp | 2 +-
+ src/slic3r/GUI/RemovableDriveManager.cpp | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libslic3r/PrintBase.cpp b/src/libslic3r/PrintBase.cpp
+index 29bdc1301d0..60e40644cb8 100644
+--- a/src/libslic3r/PrintBase.cpp
b/src/libslic3r/PrintBase.cpp
+@@ -123,7 +123,7 @@ std::string PrintBase::output_filename(const std::string
&format, const std::str
+ filepath = filename + extension;
+ }
+ if (filepath.extension().empty())
+-filepath = boost::filesystem::change_extension(filepath,
default_ext);
++filepath.replace_extension(default_ext);
+ return filepath.string();
+ } catch (std::runtime_error &err) {
+ throw Slic3r::PlaceholderParserError(L("Failed processing of the
output_filename_format template.") + "\n" + err.what());
+diff --git a/src/libslic3r/utils.cpp b/src/libslic3r/utils.cpp
+index 71089ceea64..6eac962b20e 100644
+--- a/src/libslic3r/utils.cpp
b/src/libslic3r/utils.cpp
+@@ -836,7 +836,7 @@ CopyFileResult copy_file_inner(const
boost::filesystem::path& source, const boos
+ // That may happen when copying on some exotic file system, for example
Linux on Chrome.
+ copy_file_linux(source, target, ec);
+ #else // __linux__
+- boost::filesystem::copy_file(source, target,
boost::filesystem::copy_option::overwrite_if_exists, ec);
++ boost::filesystem::copy_file(source, target,
boost::filesystem::copy_options::overwrite_existing, ec);
+ #endif // __linux__
+ if (ec) {
+ error_message = ec.message();
+diff --git a/src/slic3r/GUI/RemovableDriveManager.cpp
b/src/slic3r/GUI/RemovableDriveManager.cpp
+index 5fb8b013210..2f8ac96a1a2 100644
+--- a/src/slic3r/GUI/RemovableDriveManager.cpp
b/src/slic3r/GUI/RemovableDriveManager.cpp
+@@ -202,7 +202,7 @@ namespace search_for_drives_internal
+ stat(path.c_str(), &buf);
+ uid_t uid = buf.st_uid;
+ if (getuid() == uid)
+- out.emplace_back(DriveData{
boost::filesystem::basename(boost::filesystem::path(path)), path });
++out.emplace_back(DriveData{
boost::filesystem::path(path).stem().string(), path });
+ }
+ }
+ }
diff --git a/media-gfx/superslicer/superslicer-2.5.59.10.ebuild
b/media-gfx/superslicer/superslicer-2.5.59.10.ebuild
index 054295f8cc12..b1c347c004cc 100644
--- a/media-gfx/superslicer/superslicer-2.5.59.10.ebuild
+++ b/media-gfx/superslicer/superslicer-2.5.59.10.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.5.59.8-fix-compilation-error-gnu17.patch"
"${FILESDIR}/${PN}-2.5.59.8-libnest2d-link-xcb.patch"
"${FILESDIR}/${PN}-2.5.59.8-boost-replace-load-string-file.patch"
+ "${FILESDIR}/${PN}-2.5.59.10-boost-1.85.patch"
)
S="${WORKDIR}/${MY_PN}-${PV}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
commit: 318c82dd47bb625f131cfac6bb04b91542e4506e
Author: Piotr Karbowski gentoo org>
AuthorDate: Sat Apr 22 18:02:15 2023 +
Commit: Piotr Karbowski gentoo org>
CommitDate: Sat Apr 22 18:09:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=318c82dd
media-gfx/superslicer: 2.5.59.2-r1 revbump
- Fixes crash on enabling vase mode (superslicer PR #3736
- Links bundled OCCTWrapper statically
- Fix unique_ptr null pointer crash on slicing
- Adds missing dependency on OpenCASCADE
Closes: https://bugs.gentoo.org/904558
Closes: https://bugs.gentoo.org/904656
Closes: https://bugs.gentoo.org/904727
Bug: https://github.com/supermerill/SuperSlicer/issues/3731
Signed-off-by: Piotr Karbowski gentoo.org>
...ereferencing-in-std-unique_ptr-to-nullptr.patch | 82 +++
...cer-2.5.59.2-fix-spiral_vase-null-pointer.patch | 22 +
...icer-2.5.59.2-link-occtwrapper-statically.patch | 93 ++
59.2.ebuild => superslicer-2.5.59.2-r1.ebuild} | 4 +
4 files changed, 201 insertions(+)
diff --git
a/media-gfx/superslicer/files/superslicer-2.5.59.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch
new file mode 100644
index ..4e93fca55e08
--- /dev/null
+++
b/media-gfx/superslicer/files/superslicer-2.5.59.2-fix-dereferencing-in-std-unique_ptr-to-nullptr.patch
@@ -0,0 +1,82 @@
+diff --git a/src/libslic3r/GCode.cpp b/src/libslic3r/GCode.cpp
+index 68ec2ce..cd828a6 100644
+--- a/src/libslic3r/GCode.cpp
b/src/libslic3r/GCode.cpp
+@@ -2081,31 +2081,30 @@ 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;
+
+ CNumericLocalesSetter locales_setter;
+-spiral_vase.enable(in.spiral_vase_enable);
+-return LayerResult{
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;
+
+ CNumericLocalesSetter locales_setter;
+-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 {
+-CNumericLocalesSetter locales_setter;
+-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) {
+ CNumericLocalesSetter locales_setter;
+@@ -2183,25 +2182,26 @@ 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};
+ });
+
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
commit: ac53eaadee0299160e87fcee9f649cecbb1c40c6
Author: Piotr Karbowski gentoo org>
AuthorDate: Tue Apr 18 21:14:58 2023 +
Commit: Piotr Karbowski gentoo org>
CommitDate: Tue Apr 18 21:24:22 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac53eaad
media-gfx/superslicer: 2.5.59.2 version bump.
Signed-off-by: Piotr Karbowski gentoo.org>
media-gfx/superslicer/Manifest | 2 +
.../files/superslicer-2.5.59.2-boost.patch | 324 +
.../files/superslicer-2.5.59.2-cereal.patch| 53
...rslicer-2.5.59.2-dont-install-angelscript.patch | 13 +
...erslicer-2.5.59.2-gcodeviewer-symlink-fix.patch | 11 +
...superslicer-2.5.59.2-missing-includes-fix.patch | 74 +
.../files/superslicer-2.5.59.2-openexr3.patch | 77 +
...uperslicer-2.5.59.2-relax-OpenCASCADE-dep.patch | 13 +
.../superslicer-2.5.59.2-wxgtk3-wayland-fix.patch | 21 ++
media-gfx/superslicer/superslicer-2.5.59.2.ebuild | 101 +++
10 files changed, 689 insertions(+)
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index 80d31364ef86..006a776d5fba 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -1,2 +1,4 @@
DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B
cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939
SHA512
bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B
da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd
SHA512
1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c
+DIST superslicer-2.5.59.2-profiles.tar.gz 16253775 BLAKE2B
20c99b14ba8ee26ea2a210962e78ea21928a5f32b1e799cbdbe60a3ef587ae1368efce885f5d253468ee9974af6a4419890e56d7df33761732bcefe8dbbc019e
SHA512
c20ec66a95d5ec3e1e4fd8b1936bf1a4fc32fbad2c3d78774d5c2480be8a9dcacba5e561c57774a2c761d5189466083e7b6bd9b021a4ca7676e6a5e9676439d7
+DIST superslicer-2.5.59.2.tar.gz 45622782 BLAKE2B
ff2fecf233d2710d706b64eb2191bfac39df3f631634de5f9eb1bca6ca712e94b0283beb7c6e9f3b293dc308b50240871ef8651a5355a4d7c5ea6092ac1a836b
SHA512
af8878bd8e0c3e0dd5247ce01bdbd2b42b6766d81efbde11b71c6642787a12dfeaea91e653ac928066b9610cd911ea1f4dc77cf4823639030b3c104d955b8cbd
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.2-boost.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.2-boost.patch
new file mode 100644
index ..ba0870a480b0
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.2-boost.patch
@@ -0,0 +1,324 @@
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029c..4791f06 100644
+--- a/src/hints/HintsToPot.cpp
b/src/hints/HintsToPot.cpp
+@@ -9,7 +9,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(path.string(), std::ios_base::app);
+ for (const auto& element : data)
+ {
+ //Example of .pot element
+diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
+index e7c81f8..a626986 100644
+--- a/src/libslic3r/AppConfig.cpp
b/src/libslic3r/AppConfig.cpp
+@@ -1,3 +1,4 @@
++#include
+ #include "libslic3r/libslic3r.h"
+ #include "libslic3r/Utils.hpp"
+ #include "AppConfig.hpp"
+diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
+index 35e36c0..5e8059b 100644
+--- a/src/libslic3r/AppConfig.hpp
b/src/libslic3r/AppConfig.hpp
+@@ -5,6 +5,7 @@
+ #include
+ #include
+
++#include
+ #include
+
+ #include "libslic3r/Config.hpp"
+diff --git a/src/libslic3r/Flow.cpp b/src/libslic3r/Flow.cpp
+index 269c1cb..acea297 100644
+--- a/src/libslic3r/Flow.cpp
b/src/libslic3r/Flow.cpp
+@@ -6,6 +6,7 @@
+ #include
+
+ #include
++#include
+
+ // Mark string for localization and translate.
+ #define L(s) Slic3r::I18N::translate(s)
+diff --git a/src/libslic3r/GCode/WipeTower.cpp
b/src/libslic3r/GCode/WipeTower.cpp
+index 132c9a7..c311d05 100644
+--- a/src/libslic3r/GCode/WipeTower.cpp
b/src/libslic3r/GCode/WipeTower.cpp
+@@ -12,7 +12,9 @@
+ #include "LocalesUtils.hpp"
+ #include "Flow.hpp"
+
++
+ #include
++#include
+
+
+ namespace Slic3r
+diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
+index 5bf5205..7b87052 100644
+--- a/src/libslic3r/LocalesUtils.cpp
b/src/libslic3r/LocalesUtils.cpp
+@@ -1,3 +1,4 @@
++#include
+ #include "LocalesUtils.hpp"
+
+ #ifdef _WIN32
+diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
+index 106f26e..c81cd1d 100644
+--- a/src/libslic3r/Preset.cpp
b/src/libslic3r/Preset.cpp
+@@ -8
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
commit: 0cad19d769d7c1e9b0e521bd1c5d3a442464b0c1
Author: Piotr Karbowski gentoo org>
AuthorDate: Sat Aug 27 19:41:01 2022 +
Commit: Piotr Karbowski gentoo org>
CommitDate: Sat Aug 27 19:42:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cad19d7
media-gfx/superslicer: 2.5.59.0-r1 revbump
Fixes gcodeviewer symlink and no longer installs bundled
angelscript into system.
Closes: https://bugs.gentoo.org/865457
Signed-off-by: Piotr Karbowski gentoo.org>
...2.5.59.0-dont-install-bundled-angelscript.patch | 53 ++
...erslicer-2.5.59.0-fix-gcodeviewer-symlink.patch | 11 +
59.0.ebuild => superslicer-2.5.59.0-r1.ebuild} | 2 +
3 files changed, 66 insertions(+)
diff --git
a/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch
new file mode 100644
index ..603a96ac67a5
--- /dev/null
+++
b/media-gfx/superslicer/files/superslicer-2.5.59.0-dont-install-bundled-angelscript.patch
@@ -0,0 +1,53 @@
+diff --git a/src/angelscript/CMakeLists.txt b/src/angelscript/CMakeLists.txt
+index fed80a0ad..a65d9f8d5 100644
+--- a/src/angelscript/CMakeLists.txt
b/src/angelscript/CMakeLists.txt
+@@ -202,48 +202,3 @@ endif()
+
+ # Don't override the default runtime output path to avoid conflicts when
building for multiple target platforms
+ #set(RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
+-
+-#See
https://cmake.org/cmake/help/latest/manual/cmake-packages.7.html#creating-packages
for a detailed explanation about this part
+-install(TARGETS ${ANGELSCRIPT_LIBRARY_NAME} EXPORT AngelscriptTargets
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib
+- INCLUDES DESTINATION include
+-)
+-
+-install(FILES
+- ${CMAKE_CURRENT_SOURCE_DIR}/include/angelscript.h
+- DESTINATION include
+- COMPONENT Devel
+-)
+-
+-include(CMakePackageConfigHelpers)
+-write_basic_package_version_file(
+- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake"
+- VERSION ${PROJECT_VERSION}
+- COMPATIBILITY AnyNewerVersion
+-)
+-
+-export(EXPORT AngelscriptTargets
+- FILE "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptTargets.cmake"
+- NAMESPACE Angelscript::
+-)
+-configure_file(cmake/AngelscriptConfig.cmake
+- "${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfig.cmake"
+- COPYONLY
+-)
+-
+-set(ConfigPackageLocation lib/cmake/Angelscript)
+-install(EXPORT AngelscriptTargets
+- FILE AngelscriptTargets.cmake
+- NAMESPACE Angelscript::
+- DESTINATION ${ConfigPackageLocation}
+-)
+-install(
+- FILES
+- cmake/AngelscriptConfig.cmake
+-
"${CMAKE_CURRENT_BINARY_DIR}/Angelscript/AngelscriptConfigVersion.cmake"
+- DESTINATION ${ConfigPackageLocation}
+- COMPONENT Devel
+-)
+-
diff --git
a/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch
new file mode 100644
index ..5a5c9960cc00
--- /dev/null
+++
b/media-gfx/superslicer/files/superslicer-2.5.59.0-fix-gcodeviewer-symlink.patch
@@ -0,0 +1,11 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 9aae6dc11..75835903e 100644
+--- a/src/CMakeLists.txt
b/src/CMakeLists.txt
+@@ -299,5 +299,5 @@ else ()
+ install(TARGETS Slic3r RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}")
+
+ # Install the symlink for gcodeviewer
+-install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
slic3r ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY
\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
++install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
${SLIC3R_APP_CMD} ${GCODEVIEWER_APP_CMD} WORKING_DIRECTORY
\$ENV{DESTDIR}/${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})")
+ endif ()
diff --git a/media-gfx/superslicer/superslicer-2.5.59.0.ebuild
b/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild
similarity index 94%
rename from media-gfx/superslicer/superslicer-2.5.59.0.ebuild
rename to media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild
index 3024d92b17a4..ebd207c8f2d7 100644
--- a/media-gfx/superslicer/superslicer-2.5.59.0.ebuild
+++ b/media-gfx/superslicer/superslicer-2.5.59.0-r1.ebuild
@@ -58,6 +58,8 @@ PATCHES=(
"${FILESDIR}/${P}-cereal.patch"
"${FILESDIR}/${P}-boost.patch"
"${FILESDIR}/${P}-missing-includes.patch"
+ "${FILESDIR}/${P}-dont-install-bundled-angelscript.patch"
+ "${FILESDIR}/${P}-fix-gcodeviewer-symlink.patch"
)
S="${WORKDIR}/${MY_PN}-${PV}"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/superslicer/, media-gfx/superslicer/files/
commit: 91155f8d3564066a3ded9d66d60528b21858a4ad
Author: Piotr Karbowski gentoo org>
AuthorDate: Tue Aug 16 21:41:14 2022 +
Commit: Piotr Karbowski gentoo org>
CommitDate: Tue Aug 16 21:41:54 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91155f8d
media-gfx/superslicer: 2.5.59.0 version bump.
Signed-off-by: Piotr Karbowski gentoo.org>
media-gfx/superslicer/Manifest | 2 +
.../files/superslicer-2.5.59.0-boost.patch | 256 +
.../files/superslicer-2.5.59.0-cereal.patch| 53 +
.../superslicer-2.5.59.0-missing-includes.patch| 36 +++
.../files/superslicer-2.5.59.0-openexr3.patch | 77 +++
.../superslicer-2.5.59.0-wxgtk3-wayland.patch | 21 ++
media-gfx/superslicer/superslicer-2.5.59.0.ebuild | 96
7 files changed, 541 insertions(+)
diff --git a/media-gfx/superslicer/Manifest b/media-gfx/superslicer/Manifest
index bb7fbbc6ec07..ef2d980d92d4 100644
--- a/media-gfx/superslicer/Manifest
+++ b/media-gfx/superslicer/Manifest
@@ -1,2 +1,4 @@
DIST superslicer-2.4.58.3-profiles.tar.gz 15322406 BLAKE2B
cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939
SHA512
bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
DIST superslicer-2.4.58.3.tar.gz 45203382 BLAKE2B
822af2a1cb8978b21f8efdc0eb4841ec1d86517fd07782a8dfa6be2a58514dc3e772221dca40ff62808cb798fc4f51484b24e847328a7a6f154708431f0c4d3b
SHA512
00302fba9ada1cc5df3c58f42fdb7f98322f94de7b78876c6a54a2229ae289e785082ea7a69f67bee54321fc4d97811675eeb70932e5774ab78ca8859343dd4d
+DIST superslicer-2.5.59.0-profiles.tar.gz 15322406 BLAKE2B
cfa89697e832e0601746cb21250e258617bcc0966dd111c82ae43a9720b3ffb760f57827a1f35c8ad57a23a7ffb4c78e48ec76d6e40b364f321d0f83c4d10939
SHA512
bbdc6bfa8e21a4bdbca903a367f033f9cb5a1966bd0688bcc81314ba9ee45fee37cb892c82be35e865137c4df7c1fabceb8e6de46316338df2af4a590de91c76
+DIST superslicer-2.5.59.0.tar.gz 45360646 BLAKE2B
da65610270ed4c7d55b5bc495d9970812af94f424345088782b3a45b97fcf0f4b58bdc0417b89ed49e21d8c250535baa7cb74344f43438fbde8daf1b3acfacdd
SHA512
1d2c0316c91bf0d65fb366806e9ea868bc93fae33deb580a324ce065fd3789ff1b600e9ace400db4988b371b1c36ef0c3ea2b52cde0d48984f312dd8d7ef3a1c
diff --git a/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch
b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch
new file mode 100644
index ..4f847aaacb92
--- /dev/null
+++ b/media-gfx/superslicer/files/superslicer-2.5.59.0-boost.patch
@@ -0,0 +1,256 @@
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cde..4791f0612 100644
+--- a/src/hints/HintsToPot.cpp
b/src/hints/HintsToPot.cpp
+@@ -9,7 +9,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(path.string(), std::ios_base::app);
+ for (const auto& element : data)
+ {
+ //Example of .pot element
+diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
+index f029b3d72..18dc7396e 100644
+--- a/src/libslic3r/AppConfig.cpp
b/src/libslic3r/AppConfig.cpp
+@@ -1,3 +1,4 @@
++#include
+ #include "libslic3r/libslic3r.h"
+ #include "libslic3r/Utils.hpp"
+ #include "AppConfig.hpp"
+diff --git a/src/libslic3r/AppConfig.hpp b/src/libslic3r/AppConfig.hpp
+index d811ddcc2..1a7023061 100644
+--- a/src/libslic3r/AppConfig.hpp
b/src/libslic3r/AppConfig.hpp
+@@ -5,6 +5,7 @@
+ #include
+ #include
+
++#include
+ #include
+
+ #include "libslic3r/Config.hpp"
+diff --git a/src/libslic3r/LocalesUtils.cpp b/src/libslic3r/LocalesUtils.cpp
+index 5bf520568..7b870520b 100644
+--- a/src/libslic3r/LocalesUtils.cpp
b/src/libslic3r/LocalesUtils.cpp
+@@ -1,3 +1,4 @@
++#include
+ #include "LocalesUtils.hpp"
+
+ #ifdef _WIN32
+diff --git a/src/libslic3r/Preset.cpp b/src/libslic3r/Preset.cpp
+index 9e9fcda4f..d889e2abf 100644
+--- a/src/libslic3r/Preset.cpp
b/src/libslic3r/Preset.cpp
+@@ -84,7 +84,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.string());
+ boost::property_tree::read_ini(ifs, tree);
+ return VendorProfile::from_ini(tree, path, load_all);
+ }
+diff --git a/src/libslic3r/Utils.hpp b/src/libslic3r/Utils.hpp
+index f525c9837..839f0f5e9 100644
+--- a/src/libslic3r/Utils.hpp
b/src/libslic3r/Utils.hpp
+@@ -7,6 +7,7 @@
+ #include
+ #include
+
++#include
+ #include
+
+ #include "libslic3r.h"
+diff --git a/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
b/src/slic3r/GUI/CreateMMUTiledCanvas.cpp
+index 89212f27f..be157eafa 100644
+---
