* [PR PATCH] PrusaSlicer: update to 4.5.0.
@ 2023-01-09 16:16 sinetek
2023-01-09 16:21 ` [PR PATCH] [Updated] " sinetek
` (25 more replies)
0 siblings, 26 replies; 33+ messages in thread
From: sinetek @ 2023-01-09 16:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 690 bytes --]
There is a new pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 4.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 10644 bytes --]
From 6d760a1a63de3e37b5ab6b637297b68de2d05734 Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH] PrusaSlicer: update to 4.5.0.
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
srcpkgs/PrusaSlicer/patches/boost-1.81.patch | 6 +-
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
| 19 ++---
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
6 files changed, 109 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
deleted file mode 100644
index c759e84879aa..000000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 27 May 2019 18:54:59 -0700
-Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
-
----
- src/slic3r/Utils/Serial.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
-index 601719b50..43dab2390 100644
---- a/src/slic3r/Utils/Serial.cpp
-+++ b/src/slic3r/Utils/Serial.cpp
-@@ -42,7 +42,7 @@
- #ifndef _WIN32
- #include <sys/ioctl.h>
- #include <sys/time.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/select.h>
- #endif
-
---
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch b/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
index d320a3bfd66a..7c3caace77ea 100644
--- a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
+++ b/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
@@ -1,7 +1,7 @@
-Index: PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp
+Index: PrusaSlicer-2.5.0/src/slic3r/GUI/PrintHostDialogs.cpp
===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/GUI/PrintHostDialogs.cpp
-+++ PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp
+--- PrusaSlicer-2.5.0.orig/src/slic3r/GUI/PrintHostDialogs.cpp
++++ PrusaSlicer-2.5.0/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/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
--git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..c06aa681931b 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -1,7 +1,7 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/libslic3r/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/libslic3r/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/libslic3r/CMakeLists.txt
@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
target_link_libraries(libslic3r
libnest2d
@@ -10,23 +10,24 @@ Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
libigl
miniz
boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/CMakeLists.txt
@@ -125,7 +125,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)
+
if (APPLE)
# add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/slic3r/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/slic3r/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/slic3r/CMakeLists.txt
@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
encoding_check(libslic3r_gui)
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25e9738dabd2..da8020f1301e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=3
+version=2.5.0
+revision=4
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
@ 2023-01-09 16:21 ` sinetek
2023-01-09 16:24 ` sinetek
` (24 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-09 16:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 4.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 10924 bytes --]
From 5977663c8c896086255c8dcc6098c2926d904b90 Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH] PrusaSlicer: update to 4.5.0.
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
srcpkgs/PrusaSlicer/patches/boost-1.81.patch | 6 +-
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
| 19 ++---
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 10 +--
6 files changed, 110 insertions(+), 42 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
deleted file mode 100644
index c759e84879aa..000000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 27 May 2019 18:54:59 -0700
-Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
-
----
- src/slic3r/Utils/Serial.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
-index 601719b50..43dab2390 100644
---- a/src/slic3r/Utils/Serial.cpp
-+++ b/src/slic3r/Utils/Serial.cpp
-@@ -42,7 +42,7 @@
- #ifndef _WIN32
- #include <sys/ioctl.h>
- #include <sys/time.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/select.h>
- #endif
-
---
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch b/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
index d320a3bfd66a..7c3caace77ea 100644
--- a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
+++ b/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
@@ -1,7 +1,7 @@
-Index: PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp
+Index: PrusaSlicer-2.5.0/src/slic3r/GUI/PrintHostDialogs.cpp
===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/GUI/PrintHostDialogs.cpp
-+++ PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp
+--- PrusaSlicer-2.5.0.orig/src/slic3r/GUI/PrintHostDialogs.cpp
++++ PrusaSlicer-2.5.0/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/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
--git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..c06aa681931b 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -1,7 +1,7 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/libslic3r/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/libslic3r/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/libslic3r/CMakeLists.txt
@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
target_link_libraries(libslic3r
libnest2d
@@ -10,23 +10,24 @@ Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
libigl
miniz
boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/CMakeLists.txt
@@ -125,7 +125,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)
+
if (APPLE)
# add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/slic3r/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/slic3r/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/slic3r/CMakeLists.txt
@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
encoding_check(libslic3r_gui)
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 25e9738dabd2..2a4185cde6a2 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,23 +1,23 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=3
+version=2.5.0
+revision=5
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel mpfr-devel
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel imath-devel libopenexr-devel wxWidgets-gtk3-devel"
short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
2023-01-09 16:21 ` [PR PATCH] [Updated] " sinetek
@ 2023-01-09 16:24 ` sinetek
2023-01-10 5:02 ` [PR REVIEW] " sgn
` (23 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-09 16:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 4.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 10644 bytes --]
From 3f0b22233a2bf7fdb760d1a6bcc6a12b6308ccd4 Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH] PrusaSlicer: update to 4.5.0.
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
srcpkgs/PrusaSlicer/patches/boost-1.81.patch | 6 +-
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
| 19 ++---
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
6 files changed, 109 insertions(+), 41 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
deleted file mode 100644
index c759e84879aa..000000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 27 May 2019 18:54:59 -0700
-Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
-
----
- src/slic3r/Utils/Serial.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
-index 601719b50..43dab2390 100644
---- a/src/slic3r/Utils/Serial.cpp
-+++ b/src/slic3r/Utils/Serial.cpp
-@@ -42,7 +42,7 @@
- #ifndef _WIN32
- #include <sys/ioctl.h>
- #include <sys/time.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/select.h>
- #endif
-
---
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch b/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
index d320a3bfd66a..7c3caace77ea 100644
--- a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
+++ b/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
@@ -1,7 +1,7 @@
-Index: PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp
+Index: PrusaSlicer-2.5.0/src/slic3r/GUI/PrintHostDialogs.cpp
===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/GUI/PrintHostDialogs.cpp
-+++ PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp
+--- PrusaSlicer-2.5.0.orig/src/slic3r/GUI/PrintHostDialogs.cpp
++++ PrusaSlicer-2.5.0/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/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
--git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..c06aa681931b 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -1,7 +1,7 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/libslic3r/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/libslic3r/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/libslic3r/CMakeLists.txt
@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
target_link_libraries(libslic3r
libnest2d
@@ -10,23 +10,24 @@ Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
libigl
miniz
boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/CMakeLists.txt
@@ -125,7 +125,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)
+
if (APPLE)
# add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/slic3r/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/slic3r/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/slic3r/CMakeLists.txt
@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
encoding_check(libslic3r_gui)
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..2a4185cde6a2 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=4
+version=2.5.0
+revision=5
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
2023-01-09 16:21 ` [PR PATCH] [Updated] " sinetek
2023-01-09 16:24 ` sinetek
@ 2023-01-10 5:02 ` sgn
2023-01-10 5:02 ` sgn
` (22 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sgn @ 2023-01-10 5:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1065335914
Comment:
This patch doesn't need to be refreshed.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (2 preceding siblings ...)
2023-01-10 5:02 ` [PR REVIEW] " sgn
@ 2023-01-10 5:02 ` sgn
2023-01-10 5:02 ` sgn
` (21 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sgn @ 2023-01-10 5:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1065335639
Comment:
How come the patch change but the hunk indicator didn't change?
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (3 preceding siblings ...)
2023-01-10 5:02 ` sgn
@ 2023-01-10 5:02 ` sgn
2023-01-10 19:21 ` sinetek
` (20 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sgn @ 2023-01-10 5:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 174 bytes --]
New review comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1065335682
Comment:
```suggestion
revision=1
```
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (4 preceding siblings ...)
2023-01-10 5:02 ` sgn
@ 2023-01-10 19:21 ` sinetek
2023-01-10 19:21 ` sinetek
` (19 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-10 19:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 289 bytes --]
New review comment by sinetek on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1066214864
Comment:
What is that? I changed the path so that the patch applies, without it it would not apply on my side because the path is 2.5.0 and not 2.4.2.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (5 preceding siblings ...)
2023-01-10 19:21 ` sinetek
@ 2023-01-10 19:21 ` sinetek
2023-01-10 19:22 ` sinetek
` (18 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-10 19:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 181 bytes --]
New review comment by sinetek on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1066215118
Comment:
Why the revision going back to 1?
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (6 preceding siblings ...)
2023-01-10 19:21 ` sinetek
@ 2023-01-10 19:22 ` sinetek
2023-01-10 19:30 ` sinetek
` (17 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-10 19:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 241 bytes --]
New review comment by sinetek on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1066215692
Comment:
It does, the patch doesn't apply if i leave it like that. I might be wrong, let me try again.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (7 preceding siblings ...)
2023-01-10 19:22 ` sinetek
@ 2023-01-10 19:30 ` sinetek
2023-01-10 19:32 ` [PR PATCH] [Updated] " sinetek
` (16 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-10 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 211 bytes --]
New review comment by sinetek on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1066226502
Comment:
ok i will revert it, it doesn't seem to matter in this context.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (8 preceding siblings ...)
2023-01-10 19:30 ` sinetek
@ 2023-01-10 19:32 ` sinetek
2023-01-10 19:35 ` sinetek
` (15 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-10 19:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 4.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 9659 bytes --]
From 092165614e50fc1e549bbc4d3e62eb8e92c5694f Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH] PrusaSlicer: update to 4.5.0.
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
| 19 ++---
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
5 files changed, 106 insertions(+), 38 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
deleted file mode 100644
index c759e84879aa..000000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 27 May 2019 18:54:59 -0700
-Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
-
----
- src/slic3r/Utils/Serial.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
-index 601719b50..43dab2390 100644
---- a/src/slic3r/Utils/Serial.cpp
-+++ b/src/slic3r/Utils/Serial.cpp
-@@ -42,7 +42,7 @@
- #ifndef _WIN32
- #include <sys/ioctl.h>
- #include <sys/time.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/select.h>
- #endif
-
---
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
--git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..c06aa681931b 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -1,7 +1,7 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/libslic3r/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/libslic3r/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/libslic3r/CMakeLists.txt
@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
target_link_libraries(libslic3r
libnest2d
@@ -10,23 +10,24 @@ Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
libigl
miniz
boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/CMakeLists.txt
@@ -125,7 +125,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)
+
if (APPLE)
# add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
+Index: PrusaSlicer-2.5.0/src/slic3r/CMakeLists.txt
===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
+--- PrusaSlicer-2.5.0.orig/src/slic3r/CMakeLists.txt
++++ PrusaSlicer-2.5.0/src/slic3r/CMakeLists.txt
@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
encoding_check(libslic3r_gui)
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..2a4185cde6a2 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=4
+version=2.5.0
+revision=5
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (9 preceding siblings ...)
2023-01-10 19:32 ` [PR PATCH] [Updated] " sinetek
@ 2023-01-10 19:35 ` sinetek
2023-01-10 22:31 ` [PR REVIEW] " kruceter
` (14 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-10 19:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 4.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 7438 bytes --]
From 31ae18a175806fc4f51c2d2dc20f712b42900428 Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH] PrusaSlicer: update to 4.5.0.
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
4 files changed, 96 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
deleted file mode 100644
index c759e84879aa..000000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 27 May 2019 18:54:59 -0700
-Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
-
----
- src/slic3r/Utils/Serial.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
-index 601719b50..43dab2390 100644
---- a/src/slic3r/Utils/Serial.cpp
-+++ b/src/slic3r/Utils/Serial.cpp
-@@ -42,7 +42,7 @@
- #ifndef _WIN32
- #include <sys/ioctl.h>
- #include <sys/time.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/select.h>
- #endif
-
---
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..2a4185cde6a2 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=4
+version=2.5.0
+revision=5
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (10 preceding siblings ...)
2023-01-10 19:35 ` sinetek
@ 2023-01-10 22:31 ` kruceter
2023-01-14 21:55 ` [PR PATCH] [Updated] " sinetek
` (13 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: kruceter @ 2023-01-10 22:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 504 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1066409932
Comment:
Revision is an accessory to the version. Once package is updated (i.e upgraded to another version), revision is reset to 1.
```markdown
- `revision` A number that must be set to 1 when the `source package` is created, or
updated to a new `upstream version`. This should only be increased when
the generated `binary packages` have been modified.
```
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 4.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (11 preceding siblings ...)
2023-01-10 22:31 ` [PR REVIEW] " kruceter
@ 2023-01-14 21:55 ` sinetek
2023-01-14 21:59 ` [PR PATCH] [Updated] PrusaSlicer: update to 2.5.0 sinetek
` (12 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-14 21:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 4.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 7438 bytes --]
From 31ae18a175806fc4f51c2d2dc20f712b42900428 Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH] PrusaSlicer: update to 4.5.0.
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
4 files changed, 96 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
deleted file mode 100644
index c759e84879aa..000000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 27 May 2019 18:54:59 -0700
-Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
-
----
- src/slic3r/Utils/Serial.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
-index 601719b50..43dab2390 100644
---- a/src/slic3r/Utils/Serial.cpp
-+++ b/src/slic3r/Utils/Serial.cpp
-@@ -42,7 +42,7 @@
- #ifndef _WIN32
- #include <sys/ioctl.h>
- #include <sys/time.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/select.h>
- #endif
-
---
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..2a4185cde6a2 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=4
+version=2.5.0
+revision=5
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (12 preceding siblings ...)
2023-01-14 21:55 ` [PR PATCH] [Updated] " sinetek
@ 2023-01-14 21:59 ` sinetek
2023-01-15 15:12 ` sinetek
` (11 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-14 21:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 2.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 7438 bytes --]
From 9a3a36f348af2677860d43a706dfe2523163219e Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH] PrusaSlicer: update to 4.5.0.
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
4 files changed, 96 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
deleted file mode 100644
index c759e84879aa..000000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 27 May 2019 18:54:59 -0700
-Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
-
----
- src/slic3r/Utils/Serial.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
-index 601719b50..43dab2390 100644
---- a/src/slic3r/Utils/Serial.cpp
-+++ b/src/slic3r/Utils/Serial.cpp
-@@ -42,7 +42,7 @@
- #ifndef _WIN32
- #include <sys/ioctl.h>
- #include <sys/time.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/select.h>
- #endif
-
---
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..2a4185cde6a2 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=4
+version=2.5.0
+revision=5
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (13 preceding siblings ...)
2023-01-14 21:59 ` [PR PATCH] [Updated] PrusaSlicer: update to 2.5.0 sinetek
@ 2023-01-15 15:12 ` sinetek
2023-01-15 16:15 ` sinetek
` (10 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-15 15:12 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 2.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 8818 bytes --]
From 9a3a36f348af2677860d43a706dfe2523163219e Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH 1/2] PrusaSlicer: update to 4.5.0.
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
4 files changed, 96 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
deleted file mode 100644
index c759e84879aa..000000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 27 May 2019 18:54:59 -0700
-Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
-
----
- src/slic3r/Utils/Serial.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
-index 601719b50..43dab2390 100644
---- a/src/slic3r/Utils/Serial.cpp
-+++ b/src/slic3r/Utils/Serial.cpp
-@@ -42,7 +42,7 @@
- #ifndef _WIN32
- #include <sys/ioctl.h>
- #include <sys/time.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/select.h>
- #endif
-
---
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..2a4185cde6a2 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=4
+version=2.5.0
+revision=5
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
From 2d1ba170a33a59fa9f0f7ee3dbbb9540d3b873ca Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Sun, 15 Jan 2023 16:12:20 +0100
Subject: [PATCH 2/2] .
---
srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch | 1 +
srcpkgs/PrusaSlicer/template | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..c29d9974e475 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,6 +20,7 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-target_link_libraries(PrusaSlicer libslic3r cereal)
+target_link_libraries(PrusaSlicer libslic3r)
+
if (APPLE)
# add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 2a4185cde6a2..a3bf65d8c112 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.5.0
-revision=5
+revision=1
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (14 preceding siblings ...)
2023-01-15 15:12 ` sinetek
@ 2023-01-15 16:15 ` sinetek
2023-01-15 17:11 ` sinetek
` (9 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-15 16:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 2.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 10253 bytes --]
From 9a3a36f348af2677860d43a706dfe2523163219e Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH 1/3] PrusaSlicer: update to 4.5.0.
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 ------
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
4 files changed, 96 insertions(+), 29 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
deleted file mode 100644
index c759e84879aa..000000000000
--- a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
-From: Jasper Chan <jasperchan515@gmail.com>
-Date: Mon, 27 May 2019 18:54:59 -0700
-Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
-
----
- src/slic3r/Utils/Serial.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
-index 601719b50..43dab2390 100644
---- a/src/slic3r/Utils/Serial.cpp
-+++ b/src/slic3r/Utils/Serial.cpp
-@@ -42,7 +42,7 @@
- #ifndef _WIN32
- #include <sys/ioctl.h>
- #include <sys/time.h>
-- #include <sys/unistd.h>
-+ #include <unistd.h>
- #include <sys/select.h>
- #endif
-
---
-2.21.0
-
diff --git a/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..2a4185cde6a2 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=4
+version=2.5.0
+revision=5
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
From 2d1ba170a33a59fa9f0f7ee3dbbb9540d3b873ca Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Sun, 15 Jan 2023 16:12:20 +0100
Subject: [PATCH 2/3] .
---
srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch | 1 +
srcpkgs/PrusaSlicer/template | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..c29d9974e475 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,6 +20,7 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-target_link_libraries(PrusaSlicer libslic3r cereal)
+target_link_libraries(PrusaSlicer libslic3r)
+
if (APPLE)
# add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 2a4185cde6a2..a3bf65d8c112 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
version=2.5.0
-revision=5
+revision=1
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
From c08ceb6a19ee2d7fa2cd54a536326c86bad1f7b4 Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Sun, 15 Jan 2023 17:15:22 +0100
Subject: [PATCH 3/3] this iis needed for musl
---
...-sys-unistd.h-with-unistd.h-for-musl.patch | 25 +++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
diff --git a/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
new file mode 100644
index 000000000000..c759e84879aa
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/0001-Replace-sys-unistd.h-with-unistd.h-for-musl.patch
@@ -0,0 +1,25 @@
+From 7cdeb3dfbe01fc681c35e89e3f509c8e7ac9522e Mon Sep 17 00:00:00 2001
+From: Jasper Chan <jasperchan515@gmail.com>
+Date: Mon, 27 May 2019 18:54:59 -0700
+Subject: [PATCH] Replace sys/unistd.h with unistd.h for musl
+
+---
+ src/slic3r/Utils/Serial.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git src/slic3r/Utils/Serial.cpp src/slic3r/Utils/Serial.cpp
+index 601719b50..43dab2390 100644
+--- a/src/slic3r/Utils/Serial.cpp
++++ b/src/slic3r/Utils/Serial.cpp
+@@ -42,7 +42,7 @@
+ #ifndef _WIN32
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+- #include <sys/unistd.h>
++ #include <unistd.h>
+ #include <sys/select.h>
+ #endif
+
+--
+2.21.0
+
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (15 preceding siblings ...)
2023-01-15 16:15 ` sinetek
@ 2023-01-15 17:11 ` sinetek
2023-01-15 17:13 ` sinetek
` (8 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-15 17:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 2.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 6924 bytes --]
From 704f8bf58705ce68a751b8e38b565314123f98ca Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH] PrusaSlicer: update to 2.5.0.
---
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
| 1 +
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
4 files changed, 97 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
--git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..c29d9974e475 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,6 +20,7 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-target_link_libraries(PrusaSlicer libslic3r cereal)
+target_link_libraries(PrusaSlicer libslic3r)
+
if (APPLE)
# add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..a3bf65d8c112 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=4
+version=2.5.0
+revision=1
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (16 preceding siblings ...)
2023-01-15 17:11 ` sinetek
@ 2023-01-15 17:13 ` sinetek
2023-01-15 17:13 ` sinetek
` (7 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-15 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
New comment by sinetek on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#issuecomment-1383203705
Comment:
Hi, please see changes, I think it is ready for merge.
- compiled on musl
- fixed the revision number
- fixed the patching 'cereal', now it applies correctly.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (17 preceding siblings ...)
2023-01-15 17:13 ` sinetek
@ 2023-01-15 17:13 ` sinetek
2023-01-15 22:00 ` [PR PATCH] [Updated] " sinetek
` (6 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-15 17:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
New comment by sinetek on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#issuecomment-1383203705
Comment:
Hi, please see changes, I think it is ready for merge.
- compiled on musl
- fixed the revision number
- fixed the patching 'cereal', now it applies correctly.
- corrected the title, and commit title version number.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (18 preceding siblings ...)
2023-01-15 17:13 ` sinetek
@ 2023-01-15 22:00 ` sinetek
2023-01-30 13:29 ` sinetek
` (5 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-15 22:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 695 bytes --]
There is an updated pull request by sinetek against master on the void-packages repository
https://github.com/sinetek/void-packages master
https://github.com/void-linux/void-packages/pull/41548
PrusaSlicer: update to 2.5.0.
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
A patch file from https://github.com/void-linux/void-packages/pull/41548.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-41548.patch --]
[-- Type: text/x-diff, Size: 8424 bytes --]
From 704f8bf58705ce68a751b8e38b565314123f98ca Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Mon, 9 Jan 2023 18:03:58 +0100
Subject: [PATCH 1/2] PrusaSlicer: update to 2.5.0.
---
.../PrusaSlicer/patches/boost-nowide.patch | 81 +++++++++++++++++++
| 1 +
.../patches/cmake-relax-occt-dependency.patch | 11 +++
srcpkgs/PrusaSlicer/template | 8 +-
4 files changed, 97 insertions(+), 4 deletions(-)
create mode 100644 srcpkgs/PrusaSlicer/patches/boost-nowide.patch
create mode 100644 srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
diff --git a/srcpkgs/PrusaSlicer/patches/boost-nowide.patch b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
new file mode 100644
index 000000000000..f3ad855ad4de
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/boost-nowide.patch
@@ -0,0 +1,81 @@
+From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
+From: Vojtech Bubnik <bubnikv@gmail.com>
+Date: Mon, 25 Apr 2022 08:33:48 +0200
+Subject: [PATCH] Fix of Boost 1.79 deprecated boost::filesystem::ofstream
+ #8238 Replacing boost::filesystem::fstream with boost::nowide::fstream
+ variants with the unfortunate cost of string path conversion on Windows from
+ 16 bits to UTF8 and back to 16 bits.
+
+Unfortunately we cannot use std::filesystem yet as it is missing
+on older MACs and because the interface is crooked minefield on Windows
+see https://github.com/microsoft/STL/issues/909
+---
+ src/hints/HintsToPot.cpp | 2 +-
+ src/libslic3r/Preset.cpp | 2 +-
+ src/slic3r/GUI/HintNotification.cpp | 8 +++++---
+ 3 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/src/hints/HintsToPot.cpp b/src/hints/HintsToPot.cpp
+index 7c8029cdeb..4791f0612f 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<std::pair<std::string, std::string>>& 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/Preset.cpp b/src/libslic3r/Preset.cpp
+index f3a1c15b3e..f171cb14dd 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/slic3r/GUI/HintNotification.cpp b/src/slic3r/GUI/HintNotification.cpp
+index 93e0fb3259..820b74eedb 100644
+--- a/src/slic3r/GUI/HintNotification.cpp
++++ b/src/slic3r/GUI/HintNotification.cpp
+@@ -14,12 +14,14 @@
+ #include "libslic3r/Config.hpp"
+ #include "libslic3r/PrintConfig.hpp"
+
++#include <map>
++
+ #include <boost/algorithm/string/replace.hpp>
+ #include <boost/filesystem.hpp>
+ #include <boost/nowide/fstream.hpp>
+ #include <boost/log/trivial.hpp>
+ #include <boost/property_tree/ini_parser.hpp>
+-#include <map>
++
+ #include <cereal/archives/binary.hpp>
+ #include <cereal/types/string.hpp>
+ #include <cereal/types/vector.hpp>
+@@ -65,7 +67,7 @@ inline void push_style_color(ImGuiCol idx, const ImVec4& col, bool fading_out, f
+
+ void write_used_binary(const std::vector<std::string>& ids)
+ {
+- boost::filesystem::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal"), std::ios::binary);
++ boost::nowide::ofstream file((boost::filesystem::path(data_dir()) / "cache" / "hints.cereal").string(), std::ios::binary);
+ cereal::BinaryOutputArchive archive(file);
+ HintsCerealData cd { ids };
+ try
+@@ -84,7 +86,7 @@ void read_used_binary(std::vector<std::string>& ids)
+ BOOST_LOG_TRIVIAL(warning) << "Failed to load to hints.cereal. File does not exists. " << path.string();
+ return;
+ }
+- boost::filesystem::ifstream file(path);
++ boost::nowide::ifstream file(path.string());
+ cereal::BinaryInputArchive archive(file);
+ HintsCerealData cd;
+ try
--git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
index 10b9a29864ae..c29d9974e475 100644
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
@@ -20,6 +20,7 @@ Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-target_link_libraries(PrusaSlicer libslic3r cereal)
+target_link_libraries(PrusaSlicer libslic3r)
+
if (APPLE)
# add_compile_options(-stdlib=libc++)
# add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
diff --git a/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
new file mode 100644
index 000000000000..51d2c1124292
--- /dev/null
+++ b/srcpkgs/PrusaSlicer/patches/cmake-relax-occt-dependency.patch
@@ -0,0 +1,11 @@
+--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
++++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
+@@ -19,7 +19,7 @@ include(GenerateExportHeader)
+
+ generate_export_header(OCCTWrapper)
+
+-find_package(OpenCASCADE 7.6.2 REQUIRED)
++find_package(OpenCASCADE 7.4.0...7.999.999 REQUIRED)
+
+ set(OCCT_LIBS
+ TKXDESTEP
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 676680fb4297..a3bf65d8c112 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,12 +1,12 @@
# Template file for 'PrusaSlicer'
pkgname=PrusaSlicer
-version=2.4.2
-revision=4
+version=2.5.0
+revision=1
build_style=cmake
build_helper="qemu cmake-wxWidgets-gtk3"
# Pre-Compiled Headers seems to be slower
configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3
- -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF"
+ -DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP="
hostmakedepends="pkg-config"
makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel
glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel
@@ -17,7 +17,7 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
license="GPL-3.0-or-later"
homepage="https://www.prusa3d.com/prusaslicer/"
distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23
+checksum=dbbf3e10c812d1dc7bae4bd6879e60f864d763b2738b099dd34b9636d0e5eb6a
post_extract() {
# Mark tests that fail on certain targets
From c45257d7dc827e896ce3ff2460d604d0d95fb5bb Mon Sep 17 00:00:00 2001
From: sinetek <pitwuu@gmail.com>
Date: Sun, 15 Jan 2023 22:59:15 +0100
Subject: [PATCH 2/2] PrusaSlicer: Remove duplicate desktop file (provided by
upstream).
---
srcpkgs/PrusaSlicer/files/prusa-slicer.desktop | 11 -----------
srcpkgs/PrusaSlicer/template | 4 ----
2 files changed, 15 deletions(-)
delete mode 100644 srcpkgs/PrusaSlicer/files/prusa-slicer.desktop
diff --git a/srcpkgs/PrusaSlicer/files/prusa-slicer.desktop b/srcpkgs/PrusaSlicer/files/prusa-slicer.desktop
deleted file mode 100644
index 3ac7491cdb6f..000000000000
--- a/srcpkgs/PrusaSlicer/files/prusa-slicer.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=PrusaSlicer
-Exec=/usr/bin/prusa-slicer
-Icon=prusa-slicer
-Terminal=false
-Type=Application
-StartupNotify=false
-MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;application/x-amf;
-Icon=/usr/share/PrusaSlicer/icons/PrusaSlicer_192px.png
-Categories=Graphics;3DGraphics;
-Keywords=3D;Printing;Slicer;
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index a3bf65d8c112..5192cd10f8b3 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -36,10 +36,6 @@ post_extract() {
# rm -rf src/boost
}
-post_install() {
- vinstall ${FILESDIR}/prusa-slicer.desktop 644 usr/share/applications
-}
-
Slic3rPE_package() {
build_style=meta
short_desc+=" (transitional dummy package)"
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (19 preceding siblings ...)
2023-01-15 22:00 ` [PR PATCH] [Updated] " sinetek
@ 2023-01-30 13:29 ` sinetek
2023-02-01 18:45 ` [PR REVIEW] " kruceter
` (4 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: sinetek @ 2023-01-30 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 147 bytes --]
New comment by sinetek on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#issuecomment-1408634512
Comment:
bump.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (22 preceding siblings ...)
2023-02-01 18:45 ` kruceter
@ 2023-02-01 18:45 ` kruceter
2023-05-03 1:51 ` github-actions
2023-05-17 1:54 ` [PR PATCH] [Closed]: " github-actions
25 siblings, 0 replies; 33+ messages in thread
From: kruceter @ 2023-02-01 18:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 458 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1093538768
Comment:
```suggestion
-DSLIC3R_ENC_CHECK=0 -DUSE_BLOSC=ON -DUSE_EXR=ON -DSLIC3R_PCH=OFF -DSLIC3R_ENABLE_FORMAT_STEP=OFF"
```
Why not just set it to `OFF`? Cmake triggers on booleans, not the contents of the variable:
```cmake
if (SLIC3R_ENABLE_FORMAT_STEP)
add_subdirectory(occt_wrapper)
endif ()
```
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (20 preceding siblings ...)
2023-01-30 13:29 ` sinetek
@ 2023-02-01 18:45 ` kruceter
2023-02-01 18:45 ` kruceter
` (3 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: kruceter @ 2023-02-01 18:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1093552417
Comment:
```suggestion
https://github.com/prusa3d/Prusaslicer/commit/408e56f0390f20aaf793e0aa0c70c4d9544401d4
From 408e56f0390f20aaf793e0aa0c70c4d9544401d4 Mon Sep 17 00:00:00 2001
```
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR REVIEW] PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (21 preceding siblings ...)
2023-02-01 18:45 ` [PR REVIEW] " kruceter
@ 2023-02-01 18:45 ` kruceter
2023-02-01 18:45 ` kruceter
` (2 subsequent siblings)
25 siblings, 0 replies; 33+ messages in thread
From: kruceter @ 2023-02-01 18:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 276 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#discussion_r1093548831
Comment:
```suggestion
+find_package(OpenCASCADE REQUIRED)
```
If I recall it right, omitting the version should also do the trick.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (23 preceding siblings ...)
2023-02-01 18:45 ` kruceter
@ 2023-05-03 1:51 ` github-actions
2023-05-17 1:54 ` [PR PATCH] [Closed]: " github-actions
25 siblings, 0 replies; 33+ messages in thread
From: github-actions @ 2023-05-03 1:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/41548#issuecomment-1532359816
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: [PR PATCH] [Closed]: PrusaSlicer: update to 2.5.0.
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
` (24 preceding siblings ...)
2023-05-03 1:51 ` github-actions
@ 2023-05-17 1:54 ` github-actions
25 siblings, 0 replies; 33+ messages in thread
From: github-actions @ 2023-05-17 1:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 540 bytes --]
There's a closed pull request on the void-packages repository
PrusaSlicer: update to 2.5.0.
https://github.com/void-linux/void-packages/pull/41548
Description:
Bump the version for PrusaSlicer to 2.5.0.
Note that this does not require the new occt version. When the version for occt is bumped, we can enable the new STEP file support. Otherwise just keep it as it was.
#### Testing the changes
- I tested the changes in this PR: YES
#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0
2022-10-10 21:18 [PR PATCH] " hvraven
` (4 preceding siblings ...)
2022-12-22 20:08 ` vincele
@ 2023-03-23 1:53 ` github-actions
5 siblings, 0 replies; 33+ messages in thread
From: github-actions @ 2023-03-23 1:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/39875#issuecomment-1480471734
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0
2022-10-10 21:18 [PR PATCH] " hvraven
` (3 preceding siblings ...)
2022-10-22 17:10 ` sgn
@ 2022-12-22 20:08 ` vincele
2023-03-23 1:53 ` github-actions
5 siblings, 0 replies; 33+ messages in thread
From: vincele @ 2022-12-22 20:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by vincele on void-packages repository
https://github.com/void-linux/void-packages/pull/39875#issuecomment-1363299766
Comment:
Same goal as #39756
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0
2022-10-10 21:18 [PR PATCH] " hvraven
` (2 preceding siblings ...)
2022-10-11 9:08 ` hvraven
@ 2022-10-22 17:10 ` sgn
2022-12-22 20:08 ` vincele
2023-03-23 1:53 ` github-actions
5 siblings, 0 replies; 33+ messages in thread
From: sgn @ 2022-10-22 17:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/pull/39875#issuecomment-1287857877
Comment:
I though `find_package(OpenCASCADE 7.6.2 REQUIRED)` is min version is `7.6.2`? (no `EXACT` specified)?
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0
2022-10-10 21:18 [PR PATCH] " hvraven
2022-10-11 6:20 ` Gottox
2022-10-11 6:20 ` Gottox
@ 2022-10-11 9:08 ` hvraven
2022-10-22 17:10 ` sgn
` (2 subsequent siblings)
5 siblings, 0 replies; 33+ messages in thread
From: hvraven @ 2022-10-11 9:08 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
New comment by hvraven on void-packages repository
https://github.com/void-linux/void-packages/pull/39875#issuecomment-1274364137
Comment:
Thanks @Gottox for the review and spotting the pinned version. I added the patch you suggested. I also tried building with the occt-7.4 currently in the tree, but the build fails with it.
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0
2022-10-10 21:18 [PR PATCH] " hvraven
2022-10-11 6:20 ` Gottox
@ 2022-10-11 6:20 ` Gottox
2022-10-11 9:08 ` hvraven
` (3 subsequent siblings)
5 siblings, 0 replies; 33+ messages in thread
From: Gottox @ 2022-10-11 6:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/39875#issuecomment-1274141480
Comment:
The issue with this PR is, that `occt` is pinned to 7.6.2. This will break any update to `occt`. I suggest the following patch to relax this requirements to PrusaSlicer:
```cat patches/cmake-relax-dependency.patch```:
```patch
--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
+++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
@@ -19,7 +19,7 @@ include(GenerateExportHeader)
generate_export_header(OCCTWrapper)
-find_package(OpenCASCADE 7.6.2 REQUIRED)
+find_package(OpenCASCADE 7.6.2...7.999.999 REQUIRED)
set(OCCT_LIBS
TKXDESTEP
```
^ permalink raw reply [flat|nested] 33+ messages in thread
* Re: PrusaSlicer: update to 2.5.0
2022-10-10 21:18 [PR PATCH] " hvraven
@ 2022-10-11 6:20 ` Gottox
2022-10-11 6:20 ` Gottox
` (4 subsequent siblings)
5 siblings, 0 replies; 33+ messages in thread
From: Gottox @ 2022-10-11 6:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 797 bytes --]
New comment by Gottox on void-packages repository
https://github.com/void-linux/void-packages/pull/39875#issuecomment-1274141480
Comment:
The issue with this PR is, that `occt` is pinned to 7.6.2. This will break any update to `occt`. I suggest the following patch to relax this requirements to PrusaSlicer:
```cat cmake-relax-dependency.patch```:
```patch
--- PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt.orig 2022-09-17 11:47:02.398209546 +0200
+++ PrusaSlicer-version_2.5.0/src/occt_wrapper/CMakeLists.txt 2022-09-17 11:47:30.092595307 +0200
@@ -19,7 +19,7 @@ include(GenerateExportHeader)
generate_export_header(OCCTWrapper)
-find_package(OpenCASCADE 7.6.2 REQUIRED)
+find_package(OpenCASCADE 7.6.2...7.999.999 REQUIRED)
set(OCCT_LIBS
TKXDESTEP
```
^ permalink raw reply [flat|nested] 33+ messages in thread
end of thread, other threads:[~2023-05-17 1:54 UTC | newest]
Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
2023-01-09 16:21 ` [PR PATCH] [Updated] " sinetek
2023-01-09 16:24 ` sinetek
2023-01-10 5:02 ` [PR REVIEW] " sgn
2023-01-10 5:02 ` sgn
2023-01-10 5:02 ` sgn
2023-01-10 19:21 ` sinetek
2023-01-10 19:21 ` sinetek
2023-01-10 19:22 ` sinetek
2023-01-10 19:30 ` sinetek
2023-01-10 19:32 ` [PR PATCH] [Updated] " sinetek
2023-01-10 19:35 ` sinetek
2023-01-10 22:31 ` [PR REVIEW] " kruceter
2023-01-14 21:55 ` [PR PATCH] [Updated] " sinetek
2023-01-14 21:59 ` [PR PATCH] [Updated] PrusaSlicer: update to 2.5.0 sinetek
2023-01-15 15:12 ` sinetek
2023-01-15 16:15 ` sinetek
2023-01-15 17:11 ` sinetek
2023-01-15 17:13 ` sinetek
2023-01-15 17:13 ` sinetek
2023-01-15 22:00 ` [PR PATCH] [Updated] " sinetek
2023-01-30 13:29 ` sinetek
2023-02-01 18:45 ` [PR REVIEW] " kruceter
2023-02-01 18:45 ` kruceter
2023-02-01 18:45 ` kruceter
2023-05-03 1:51 ` github-actions
2023-05-17 1:54 ` [PR PATCH] [Closed]: " github-actions
-- strict thread matches above, loose matches on Subject: below --
2022-10-10 21:18 [PR PATCH] " hvraven
2022-10-11 6:20 ` Gottox
2022-10-11 6:20 ` Gottox
2022-10-11 9:08 ` hvraven
2022-10-22 17:10 ` sgn
2022-12-22 20:08 ` vincele
2023-03-23 1:53 ` github-actions
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).