Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] PrusaSlicer: update to 2.5.0
@ 2022-10-10 21:18 hvraven
  2022-10-11  6:20 ` Gottox
                   ` (7 more replies)
  0 siblings, 8 replies; 13+ messages in thread
From: hvraven @ 2022-10-10 21:18 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 741 bytes --]

There is a new pull request by hvraven against master on the void-packages repository

https://github.com/hvraven/void-packages prusaslicer-2.5.0
https://github.com/void-linux/void-packages/pull/39875

PrusaSlicer: update to 2.5.0
Updates PrusaSlicer to the latest release. It requires occt-7.6 for STEP import, I couldn't find any option to disable it temporarily. Version bump for occt is posted in PR #36356. Using it I successfully built and used the software on my system.

#### 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/39875.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusaslicer-2.5.0-39875.patch --]
[-- Type: text/x-diff, Size: 1679 bytes --]

From 0f9457652bc0e07692cbede0f28a3b2ec3502044 Mon Sep 17 00:00:00 2001
From: "Hendrik v. Raven" <hendrik@consetetur.de>
Date: Mon, 10 Oct 2022 21:54:17 +0200
Subject: [PATCH] prusaslicer: update to version 2.5.0

requires occt-7.6 (PR #36356)
---
 srcpkgs/PrusaSlicer/template | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index b8dba603326f..3bb8f76c754d 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.4.2
-revision=2
+version=2.5.0
+revision=1
 wrksrc="PrusaSlicer-version_${version}"
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
@@ -11,13 +11,14 @@ 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
- c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel"
+ c-blosc-devel ilmbase-devel libopenexr-devel wxWidgets-gtk3-devel
+ occt-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] 13+ messages in thread
* [PR PATCH] PrusaSlicer: update to 4.5.0.
@ 2023-01-09 16:16 sinetek
  2023-01-15 17:13 ` PrusaSlicer: update to 2.5.0 sinetek
                   ` (3 more replies)
  0 siblings, 4 replies; 13+ 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 +++++++++++++++++++
 .../patches/cereal-is-header-only.patch       | 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
diff --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] 13+ messages in thread
end of thread, other threads:[~2023-05-03  1:51 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-10 21:18 [PR PATCH] PrusaSlicer: update to 2.5.0 hvraven
2022-10-11  6:20 ` Gottox
2022-10-11  6:20 ` Gottox
2022-10-11  9:07 ` [PR PATCH] [Updated] " hvraven
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
2023-04-07  1:49 ` [PR PATCH] [Closed]: " github-actions
2023-01-09 16:16 [PR PATCH] PrusaSlicer: update to 4.5.0 sinetek
2023-01-15 17:13 ` PrusaSlicer: update to 2.5.0 sinetek
2023-01-15 17:13 ` sinetek
2023-01-30 13:29 ` sinetek
2023-05-03  1:51 ` 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).