Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.5.0.

[sinetek <sinetek@users.noreply.github.com>]

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