[PR PATCH] PrusaSlicer: update to 2.6.1.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] PrusaSlicer: update to 2.6.1.
@ 2023-10-20 17:35 Vaelatern
  2023-10-20 18:05 ` [PR PATCH] [Updated] " Vaelatern
                   ` (15 more replies)
  0 siblings, 16 replies; 17+ messages in thread
From: Vaelatern @ 2023-10-20 17:35 UTC (permalink / raw)
  To: ml

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

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

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 1144 bytes --]

From c433eaf58d47746c79c66c1af0686fa520c64b10 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH] PrusaSlicer: update to 2.6.1.

---
 srcpkgs/PrusaSlicer/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..34fb50cfe3b8e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=3
+version=2.6.1
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+checksum=516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
@ 2023-10-20 18:05 ` Vaelatern
  2023-10-20 18:46 ` Vaelatern
                   ` (14 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-10-20 18:05 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 3155 bytes --]

From bd2e5491ab52dbc3a9285ed1adb217f4277e6186 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------------
 srcpkgs/PrusaSlicer/template                  |  6 +--
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb5..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..34fb50cfe3b8e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=3
+version=2.6.1
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+checksum=516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
  2023-10-20 18:05 ` [PR PATCH] [Updated] " Vaelatern
@ 2023-10-20 18:46 ` Vaelatern
  2023-10-20 19:18 ` Vaelatern
                   ` (13 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-10-20 18:46 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 5172 bytes --]

From 9626a224097b257669a90b85b97429864463d990 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  |  6 +-
 3 files changed, 3 insertions(+), 98 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb5..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0d..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..34fb50cfe3b8e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=3
+version=2.6.1
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -17,7 +17,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+checksum=516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
  2023-10-20 18:05 ` [PR PATCH] [Updated] " Vaelatern
  2023-10-20 18:46 ` Vaelatern
@ 2023-10-20 19:18 ` Vaelatern
  2023-10-23  0:27 ` Vaelatern
                   ` (12 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-10-20 19:18 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 5630 bytes --]

From 0c9ee5b50a6195d591f304bd985b4d3da18f9c79 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  |  8 +--
 3 files changed, 4 insertions(+), 99 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb5..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0d..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..592177b9979dc 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=3
+version=2.6.1
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,13 +11,13 @@ 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 mpfr-devel c-blosc-devel
- libopenexr-devel wxWidgets-gtk3-devel occt-devel"
+ libopenexr-devel wxWidgets-gtk3-devel occt-devel libqhull-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+checksum=516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (2 preceding siblings ...)
  2023-10-20 19:18 ` Vaelatern
@ 2023-10-23  0:27 ` Vaelatern
  2023-10-23  2:17 ` Vaelatern
                   ` (11 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-10-23  0:27 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 6476 bytes --]

From cbed2d6807ca8885c3ea3293b56e3eef22ac5332 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 22 Oct 2023 20:26:45 -0400
Subject: [PATCH 1/2] qhull: put cmake files in -devel subpkg

---
 srcpkgs/qhull/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 949d21450a0b5..f23961b8e06cf 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,7 +1,7 @@
 # Template file for 'qhull'
 pkgname=qhull
 version=2020.2
-revision=1
+revision=2
 build_style=cmake
 make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
@@ -42,5 +42,6 @@ libqhull-devel_package() {
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
 	}
 }

From 7b23e39af5ea24a88c4df13b9f92ed3cc9ec3cc3 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH 2/2] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  |  8 +--
 3 files changed, 4 insertions(+), 99 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb5..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0d..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..592177b9979dc 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=3
+version=2.6.1
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,13 +11,13 @@ 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 mpfr-devel c-blosc-devel
- libopenexr-devel wxWidgets-gtk3-devel occt-devel"
+ libopenexr-devel wxWidgets-gtk3-devel occt-devel libqhull-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+checksum=516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (3 preceding siblings ...)
  2023-10-23  0:27 ` Vaelatern
@ 2023-10-23  2:17 ` Vaelatern
  2023-10-23  3:06 ` Vaelatern
                   ` (10 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-10-23  2:17 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 6707 bytes --]

From 2423fa5878a11efb9ff4e6086d4291619dbcad0e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 22 Oct 2023 20:26:45 -0400
Subject: [PATCH 1/2] qhull: fix cmake with -devel subpkg

---
 srcpkgs/qhull/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 949d21450a0b5..ac160bbce58a4 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,7 +1,7 @@
 # Template file for 'qhull'
 pkgname=qhull
 version=2020.2
-revision=1
+revision=2
 build_style=cmake
 make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
@@ -35,12 +35,13 @@ libqhull_package() {
 }
 
 libqhull-devel_package() {
-	depends="libqhull>=${version}_${revision}"
+	depends="libqhull>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
 	}
 }

From f384b2bc609f4ed9285c78ca069bced48abb7118 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH 2/2] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  |  8 +--
 3 files changed, 4 insertions(+), 99 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb5..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0d..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..592177b9979dc 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=3
+version=2.6.1
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,13 +11,13 @@ 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 mpfr-devel c-blosc-devel
- libopenexr-devel wxWidgets-gtk3-devel occt-devel"
+ libopenexr-devel wxWidgets-gtk3-devel occt-devel libqhull-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+checksum=516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (4 preceding siblings ...)
  2023-10-23  2:17 ` Vaelatern
@ 2023-10-23  3:06 ` Vaelatern
  2023-10-23 22:13 ` Vaelatern
                   ` (9 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-10-23  3:06 UTC (permalink / raw)
  To: ml

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

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/46799#issuecomment-1774360918

Comment:
Well. Needs nanosvg...

```
#/|/ Copyright (c) Prusa Research 2022 - 2023 Enrico Turri @enricoturri1966, Tomáš Mészáros @tamasmeszaros
#/|/
#/|/ PrusaSlicer is released under the terms of the AGPLv3 or higher
#/|/
# In PrusaSlicer 2.6.0 we switched from https://github.com/memononen/nanosvg to its fork https://github.com/fltk/nanosvg
# because this last implements the new function nsvgRasterizeXY() which we now use in GLTexture::load_from_svg()
# for rasterizing svg files from their original size to a squared power of two texture on Windows systems using
# AMD Radeon graphics cards

prusaslicer_add_cmake_project(NanoSVG
    URL https://github.com/fltk/nanosvg/archive/abcd277ea45e9098bed752cf9c6875b533c0892f.zip
    URL_HASH SHA256=e859938fbaee4b351bd8a8b3d3c7a75b40c36885ce00b73faa1ce0b98aa0ad34
)
```

It seems like a poor candidate for packaging. Not sure what to do with that.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (5 preceding siblings ...)
  2023-10-23  3:06 ` Vaelatern
@ 2023-10-23 22:13 ` Vaelatern
  2023-10-23 22:19 ` agausmann
                   ` (8 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-10-23 22:13 UTC (permalink / raw)
  To: ml

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

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/46799#issuecomment-1776104589

Comment:
It may be best to use nanosvg as a distfile.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (6 preceding siblings ...)
  2023-10-23 22:13 ` Vaelatern
@ 2023-10-23 22:19 ` agausmann
  2023-11-01  6:38 ` [PR PATCH] [Updated] " Vaelatern
                   ` (7 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: agausmann @ 2023-10-23 22:19 UTC (permalink / raw)
  To: ml

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

New comment by agausmann on void-packages repository

https://github.com/void-linux/void-packages/pull/46799#issuecomment-1776111108

Comment:
Yeah, I think that's reasonable, it's just a header-only library

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (7 preceding siblings ...)
  2023-10-23 22:19 ` agausmann
@ 2023-11-01  6:38 ` Vaelatern
  2023-11-17  4:31 ` Vaelatern
                   ` (6 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-11-01  6:38 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 6707 bytes --]

From 57f4487e2f0fcbb6f385c8734d27f0f43802deb4 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 22 Oct 2023 20:26:45 -0400
Subject: [PATCH 1/2] qhull: fix cmake with -devel subpkg

---
 srcpkgs/qhull/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 949d21450a0b5..ac160bbce58a4 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,7 +1,7 @@
 # Template file for 'qhull'
 pkgname=qhull
 version=2020.2
-revision=1
+revision=2
 build_style=cmake
 make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
@@ -35,12 +35,13 @@ libqhull_package() {
 }
 
 libqhull-devel_package() {
-	depends="libqhull>=${version}_${revision}"
+	depends="libqhull>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
 	}
 }

From 61344e9354963eae022d6b25f0795a1419d1721c Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH 2/2] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  |  8 +--
 3 files changed, 4 insertions(+), 99 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb5..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0d..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..592177b9979dc 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,7 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=3
+version=2.6.1
+revision=1
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,13 +11,13 @@ 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 mpfr-devel c-blosc-devel
- libopenexr-devel wxWidgets-gtk3-devel occt-devel"
+ libopenexr-devel wxWidgets-gtk3-devel occt-devel libqhull-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+checksum=516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (8 preceding siblings ...)
  2023-11-01  6:38 ` [PR PATCH] [Updated] " Vaelatern
@ 2023-11-17  4:31 ` Vaelatern
  2023-11-17  4:32 ` Vaelatern
                   ` (5 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-11-17  4:31 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 7571 bytes --]

From 7ed81e188ee3621e94fe03a0ec03b1572415a6f3 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 22 Oct 2023 20:26:45 -0400
Subject: [PATCH 1/2] qhull: fix cmake with -devel subpkg

---
 srcpkgs/qhull/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 949d21450a0b5..ac160bbce58a4 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,7 +1,7 @@
 # Template file for 'qhull'
 pkgname=qhull
 version=2020.2
-revision=1
+revision=2
 build_style=cmake
 make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
@@ -35,12 +35,13 @@ libqhull_package() {
 }
 
 libqhull-devel_package() {
-	depends="libqhull>=${version}_${revision}"
+	depends="libqhull>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
 	}
 }

From c43d90b985f6c2cafdd116fdae8c829c5e90d7e2 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH 2/2] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  | 22 +++++--
 3 files changed, 16 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb5..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0d..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..01d91cf756a8f 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,8 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=3
+version=2.6.1
+revision=1
+_nanosvg_version=fltk_2022-12-22
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,17 +12,27 @@ 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 mpfr-devel c-blosc-devel
- libopenexr-devel wxWidgets-gtk3-devel occt-devel"
+ libopenexr-devel wxWidgets-gtk3-devel occt-devel libqhull-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
-distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz
+ https://github.com/fltk/nanosvg/archive/refs/tags/${_nanosvg_version}.tar.gz"
+checksum="516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
+ 5b1df945777eb76729a9cc6d2140102f5563ad55ca859692b0d6c273974f55f7"
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 post_extract() {
+	mv "nanosvg-${_nanosvg_version}/src" "PrusaSlicer-version_${version}/src/nanosvg"
+	rm -r "nanosvg-${_nanosvg_version}"
+	mv "PrusaSlicer-version_${version}"/* "PrusaSlicer-version_${version}"/.[a-z]* ./
+	rmdir "PrusaSlicer-version_${version}"
+
+	rm deps/NanoSVG/NanoSVG.cmake
+	rmdir deps/NanoSVG
+
 	# Mark tests that fail on certain targets
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
@@ -35,7 +46,6 @@ post_extract() {
 			-e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
 			;;
 	esac
-	# rm -rf src/boost
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (9 preceding siblings ...)
  2023-11-17  4:31 ` Vaelatern
@ 2023-11-17  4:32 ` Vaelatern
  2024-02-16  1:44 ` github-actions
                   ` (4 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2023-11-17  4:32 UTC (permalink / raw)
  To: ml

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

New comment by Vaelatern on void-packages repository

https://github.com/void-linux/void-packages/pull/46799#issuecomment-1815733772

Comment:
Progress, do need to convince cmake to be happy with what it has.

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (10 preceding siblings ...)
  2023-11-17  4:32 ` Vaelatern
@ 2024-02-16  1:44 ` github-actions
  2024-02-25 22:17 ` [PR PATCH] [Updated] " Vaelatern
                   ` (3 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: github-actions @ 2024-02-16  1:44 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/46799#issuecomment-1947631205

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] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (11 preceding siblings ...)
  2024-02-16  1:44 ` github-actions
@ 2024-02-25 22:17 ` Vaelatern
  2024-04-17 21:49 ` Vaelatern
                   ` (2 subsequent siblings)
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2024-02-25 22:17 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 8216 bytes --]

From aefb21ce1cb22351fab44e28250fe9818bcae67c Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 22 Oct 2023 20:26:45 -0400
Subject: [PATCH 1/3] qhull: fix cmake with -devel subpkg

---
 srcpkgs/qhull/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 949d21450a0b5..ac160bbce58a4 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,7 +1,7 @@
 # Template file for 'qhull'
 pkgname=qhull
 version=2020.2
-revision=1
+revision=2
 build_style=cmake
 make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
@@ -35,12 +35,13 @@ libqhull_package() {
 }
 
 libqhull-devel_package() {
-	depends="libqhull>=${version}_${revision}"
+	depends="libqhull>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
 	}
 }

From 4f5776a23adf877aa8e7bbc4a5bb0cd735d7a098 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH 2/3] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  | 22 +++++--
 3 files changed, 16 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb5..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0d..0000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index c28c2d707c229..01d91cf756a8f 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,8 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=3
+version=2.6.1
+revision=1
+_nanosvg_version=fltk_2022-12-22
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,17 +12,27 @@ 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 mpfr-devel c-blosc-devel
- libopenexr-devel wxWidgets-gtk3-devel occt-devel"
+ libopenexr-devel wxWidgets-gtk3-devel occt-devel libqhull-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
-distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz
+ https://github.com/fltk/nanosvg/archive/refs/tags/${_nanosvg_version}.tar.gz"
+checksum="516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
+ 5b1df945777eb76729a9cc6d2140102f5563ad55ca859692b0d6c273974f55f7"
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 post_extract() {
+	mv "nanosvg-${_nanosvg_version}/src" "PrusaSlicer-version_${version}/src/nanosvg"
+	rm -r "nanosvg-${_nanosvg_version}"
+	mv "PrusaSlicer-version_${version}"/* "PrusaSlicer-version_${version}"/.[a-z]* ./
+	rmdir "PrusaSlicer-version_${version}"
+
+	rm deps/NanoSVG/NanoSVG.cmake
+	rmdir deps/NanoSVG
+
 	# Mark tests that fail on certain targets
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
@@ -35,7 +46,6 @@ post_extract() {
 			-e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
 			;;
 	esac
-	# rm -rf src/boost
 }
 
 post_install() {

From 6fa8c831a01e589d7860c183a7c135d7b8cb7e8a Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 25 Feb 2024 17:15:35 -0500
Subject: [PATCH 3/3] PrusaSlicer: update to 2.7.1.

---
 srcpkgs/PrusaSlicer/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 01d91cf756a8f..fdfb0709e08de 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,6 +1,6 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.6.1
+version=2.7.1
 revision=1
 _nanosvg_version=fltk_2022-12-22
 build_style=cmake

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (12 preceding siblings ...)
  2024-02-25 22:17 ` [PR PATCH] [Updated] " Vaelatern
@ 2024-04-17 21:49 ` Vaelatern
  2024-04-17 21:50 ` Vaelatern
  2024-04-18 17:01 ` Vaelatern
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2024-04-17 21:49 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 7579 bytes --]

From 19476d492bf662c07011a7f6d9ad928d69663b2e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 22 Oct 2023 20:26:45 -0400
Subject: [PATCH 1/2] qhull: fix cmake with -devel subpkg

---
 srcpkgs/qhull/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 949d21450a0b59..ac160bbce58a4f 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,7 +1,7 @@
 # Template file for 'qhull'
 pkgname=qhull
 version=2020.2
-revision=1
+revision=2
 build_style=cmake
 make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
@@ -35,12 +35,13 @@ libqhull_package() {
 }
 
 libqhull-devel_package() {
-	depends="libqhull>=${version}_${revision}"
+	depends="libqhull>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
 	}
 }

From 79a167147644665592b3aeca2c24ef8c4f8eab0f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH 2/2] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  | 22 +++++--
 3 files changed, 16 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb59..00000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0dd..00000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 04d1e74a3533d0..01d91cf756a8fa 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,8 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=4
+version=2.6.1
+revision=1
+_nanosvg_version=fltk_2022-12-22
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,17 +12,27 @@ 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 mpfr-devel c-blosc-devel
- libopenexr-devel wxWidgets-gtk3-devel occt-devel"
+ libopenexr-devel wxWidgets-gtk3-devel occt-devel libqhull-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
-distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz
+ https://github.com/fltk/nanosvg/archive/refs/tags/${_nanosvg_version}.tar.gz"
+checksum="516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
+ 5b1df945777eb76729a9cc6d2140102f5563ad55ca859692b0d6c273974f55f7"
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 post_extract() {
+	mv "nanosvg-${_nanosvg_version}/src" "PrusaSlicer-version_${version}/src/nanosvg"
+	rm -r "nanosvg-${_nanosvg_version}"
+	mv "PrusaSlicer-version_${version}"/* "PrusaSlicer-version_${version}"/.[a-z]* ./
+	rmdir "PrusaSlicer-version_${version}"
+
+	rm deps/NanoSVG/NanoSVG.cmake
+	rmdir deps/NanoSVG
+
 	# Mark tests that fail on certain targets
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
@@ -35,7 +46,6 @@ post_extract() {
 			-e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
 			;;
 	esac
-	# rm -rf src/boost
 }
 
 post_install() {

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (13 preceding siblings ...)
  2024-04-17 21:49 ` Vaelatern
@ 2024-04-17 21:50 ` Vaelatern
  2024-04-18 17:01 ` Vaelatern
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2024-04-17 21:50 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 8766 bytes --]

From 19476d492bf662c07011a7f6d9ad928d69663b2e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 22 Oct 2023 20:26:45 -0400
Subject: [PATCH 1/3] qhull: fix cmake with -devel subpkg

---
 srcpkgs/qhull/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 949d21450a0b59..ac160bbce58a4f 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,7 +1,7 @@
 # Template file for 'qhull'
 pkgname=qhull
 version=2020.2
-revision=1
+revision=2
 build_style=cmake
 make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
@@ -35,12 +35,13 @@ libqhull_package() {
 }
 
 libqhull-devel_package() {
-	depends="libqhull>=${version}_${revision}"
+	depends="libqhull>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
 	}
 }

From 79a167147644665592b3aeca2c24ef8c4f8eab0f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH 2/3] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  | 22 +++++--
 3 files changed, 16 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb59..00000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0dd..00000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 04d1e74a3533d0..01d91cf756a8fa 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,8 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=4
+version=2.6.1
+revision=1
+_nanosvg_version=fltk_2022-12-22
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,17 +12,27 @@ 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 mpfr-devel c-blosc-devel
- libopenexr-devel wxWidgets-gtk3-devel occt-devel"
+ libopenexr-devel wxWidgets-gtk3-devel occt-devel libqhull-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
-distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz
+ https://github.com/fltk/nanosvg/archive/refs/tags/${_nanosvg_version}.tar.gz"
+checksum="516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
+ 5b1df945777eb76729a9cc6d2140102f5563ad55ca859692b0d6c273974f55f7"
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 post_extract() {
+	mv "nanosvg-${_nanosvg_version}/src" "PrusaSlicer-version_${version}/src/nanosvg"
+	rm -r "nanosvg-${_nanosvg_version}"
+	mv "PrusaSlicer-version_${version}"/* "PrusaSlicer-version_${version}"/.[a-z]* ./
+	rmdir "PrusaSlicer-version_${version}"
+
+	rm deps/NanoSVG/NanoSVG.cmake
+	rmdir deps/NanoSVG
+
 	# Mark tests that fail on certain targets
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
@@ -35,7 +46,6 @@ post_extract() {
 			-e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
 			;;
 	esac
-	# rm -rf src/boost
 }
 
 post_install() {

From 04ed2b96f1acfdd4a669857e5920b7f019151368 Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 17 Apr 2024 17:49:54 -0400
Subject: [PATCH 3/3] PrusaSlicer: update to 2.7.4.

---
 srcpkgs/PrusaSlicer/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 01d91cf756a8fa..484cefa4779b6e 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,6 +1,6 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.6.1
+version=2.7.4
 revision=1
 _nanosvg_version=fltk_2022-12-22
 build_style=cmake
@@ -19,7 +19,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz
  https://github.com/fltk/nanosvg/archive/refs/tags/${_nanosvg_version}.tar.gz"
-checksum="516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
+checksum="6370a9593aeac5c56543e66d167ab5fd053df55b9376392c2d6184eb0bf65fc8
  5b1df945777eb76729a9cc6d2140102f5563ad55ca859692b0d6c273974f55f7"
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"

^ permalink raw reply	[flat|nested] 17+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
  2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
                   ` (14 preceding siblings ...)
  2024-04-17 21:50 ` Vaelatern
@ 2024-04-18 17:01 ` Vaelatern
  15 siblings, 0 replies; 17+ messages in thread
From: Vaelatern @ 2024-04-18 17:01 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by Vaelatern against master on the void-packages repository

https://github.com/Vaelatern/void-packages prusa-slicer-2.6.1
https://github.com/void-linux/void-packages/pull/46799

PrusaSlicer: update to 2.6.1.
draft, for CI

A patch file from https://github.com/void-linux/void-packages/pull/46799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-prusa-slicer-2.6.1-46799.patch --]
[-- Type: text/x-diff, Size: 10530 bytes --]

From 19476d492bf662c07011a7f6d9ad928d69663b2e Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Sun, 22 Oct 2023 20:26:45 -0400
Subject: [PATCH 1/3] qhull: fix cmake with -devel subpkg

---
 srcpkgs/qhull/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qhull/template b/srcpkgs/qhull/template
index 949d21450a0b59..ac160bbce58a4f 100644
--- a/srcpkgs/qhull/template
+++ b/srcpkgs/qhull/template
@@ -1,7 +1,7 @@
 # Template file for 'qhull'
 pkgname=qhull
 version=2020.2
-revision=1
+revision=2
 build_style=cmake
 make_build_target="all libqhull"
 short_desc="Computes volumes, surface areas and approximations to the convex hull"
@@ -35,12 +35,13 @@ libqhull_package() {
 }
 
 libqhull-devel_package() {
-	depends="libqhull>=${version}_${revision}"
+	depends="libqhull>=${version}_${revision} ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/*.a
 		vmove usr/lib/*.so
 		vmove usr/lib/pkgconfig
+		vmove usr/lib/cmake
 	}
 }

From 79a167147644665592b3aeca2c24ef8c4f8eab0f Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Fri, 20 Oct 2023 13:28:01 -0400
Subject: [PATCH 2/3] PrusaSlicer: update to 2.6.1.

---
 .../patches/cereal-is-header-only.patch       | 38 -------------
 srcpkgs/PrusaSlicer/patches/fstream.patch     | 57 -------------------
 srcpkgs/PrusaSlicer/template                  | 22 +++++--
 3 files changed, 16 insertions(+), 101 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
 delete mode 100644 srcpkgs/PrusaSlicer/patches/fstream.patch

diff --git a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch b/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
deleted file mode 100644
index 24897e503efb59..00000000000000
--- a/srcpkgs/PrusaSlicer/patches/cereal-is-header-only.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/libslic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/libslic3r/CMakeLists.txt
-@@ -337,7 +337,6 @@ target_include_directories(libslic3r PUB
- target_link_libraries(libslic3r
-     libnest2d
-     admesh
--    cereal
-     libigl
-     miniz
-     boost_libs
-Index: PrusaSlicer-2.4.2/src/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/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++)
-Index: PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/CMakeLists.txt
-+++ PrusaSlicer-2.4.2/src/slic3r/CMakeLists.txt
-@@ -260,7 +260,7 @@ add_library(libslic3r_gui STATIC ${SLIC3
- 
- encoding_check(libslic3r_gui)
- 
--target_link_libraries(libslic3r_gui libslic3r avrdude cereal imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
-+target_link_libraries(libslic3r_gui libslic3r avrdude imgui GLEW::GLEW OpenGL::GL hidapi libcurl ${wxWidgets_LIBRARIES})
- 
- if (MSVC)
-     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/srcpkgs/PrusaSlicer/patches/fstream.patch b/srcpkgs/PrusaSlicer/patches/fstream.patch
deleted file mode 100644
index c40928e84bd0dd..00000000000000
--- a/srcpkgs/PrusaSlicer/patches/fstream.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/src/hints/HintsToPot.cpp
-+++ b/src/hints/HintsToPot.cpp
-@@ -2,6 +2,7 @@
- #include <vector>
- #include <string>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/dll.hpp>
- #include <boost/property_tree/ini_parser.hpp>
- #include <boost/nowide/fstream.hpp>
---- a/tests/fff_print/test_data.cpp
-+++ b/tests/fff_print/test_data.cpp
-@@ -8,6 +8,7 @@
- #include "libslic3r/Format/STL.hpp"
- 
- #include <cstdlib>
-+#include <fstream>
- #include <string>
- 
- #include <boost/nowide/cstdio.hpp>
---- a/src/slic3r/GUI/GUI_App.cpp
-+++ b/src/slic3r/GUI/GUI_App.cpp
-@@ -10,6 +10,7 @@
- #include <algorithm>
- #include <iterator>
- #include <exception>
-+#include <fstream>
- #include <cstdlib>
- #include <regex>
- #include <string_view>
---- a/src/slic3r/GUI/HintNotification.cpp
-+++ b/src/slic3r/GUI/HintNotification.cpp
-@@ -16,6 +16,7 @@
- 
- #include <boost/algorithm/string/replace.hpp>
- #include <boost/filesystem.hpp>
-+#include <boost/filesystem/fstream.hpp>
- #include <boost/nowide/fstream.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/property_tree/ini_parser.hpp>
---- a/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-+++ b/src/slic3r/GUI/DesktopIntegrationDialog.cpp
-@@ -10,6 +10,7 @@
- #include "libslic3r/Platform.hpp"
- #include "libslic3r/Config.hpp"
- 
-+#include <fstream>
- #include <boost/filesystem.hpp>
- #include <boost/log/trivial.hpp>
- #include <boost/dll/runtime_symbol_info.hpp>
-@@ -503,4 +504,4 @@ DesktopIntegrationDialog::~DesktopIntegr
- 
- } // namespace GUI
- } // namespace Slic3r
--#endif // __linux__
-\ No newline at end of file
-+#endif // __linux__
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 04d1e74a3533d0..01d91cf756a8fa 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,7 +1,8 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.5.2
-revision=4
+version=2.6.1
+revision=1
+_nanosvg_version=fltk_2022-12-22
 build_style=cmake
 build_helper="qemu cmake-wxWidgets-gtk3"
 # Pre-Compiled Headers seems to be slower
@@ -11,17 +12,27 @@ 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 mpfr-devel c-blosc-devel
- libopenexr-devel wxWidgets-gtk3-devel occt-devel"
+ libopenexr-devel wxWidgets-gtk3-devel occt-devel libqhull-devel"
 short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
-distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz"
-checksum=e58278067b9d49a42dc9bb02b74307b3cb365bb737f28e246ca8c6f466095d6b
+distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz
+ https://github.com/fltk/nanosvg/archive/refs/tags/${_nanosvg_version}.tar.gz"
+checksum="516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
+ 5b1df945777eb76729a9cc6d2140102f5563ad55ca859692b0d6c273974f55f7"
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
 
 post_extract() {
+	mv "nanosvg-${_nanosvg_version}/src" "PrusaSlicer-version_${version}/src/nanosvg"
+	rm -r "nanosvg-${_nanosvg_version}"
+	mv "PrusaSlicer-version_${version}"/* "PrusaSlicer-version_${version}"/.[a-z]* ./
+	rmdir "PrusaSlicer-version_${version}"
+
+	rm deps/NanoSVG/NanoSVG.cmake
+	rmdir deps/NanoSVG
+
 	# Mark tests that fail on certain targets
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)
@@ -35,7 +46,6 @@ post_extract() {
 			-e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/'
 			;;
 	esac
-	# rm -rf src/boost
 }
 
 post_install() {

From f277a701213900e9c435947c25c5ecb68c50c88c Mon Sep 17 00:00:00 2001
From: Toyam Cox <Vaelatern@voidlinux.org>
Date: Wed, 17 Apr 2024 17:49:54 -0400
Subject: [PATCH 3/3] PrusaSlicer: update to 2.7.4.

---
 srcpkgs/PrusaSlicer/patches/boost-1.81.patch | 15 ---------------
 srcpkgs/PrusaSlicer/template                 |  7 ++-----
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 srcpkgs/PrusaSlicer/patches/boost-1.81.patch

diff --git a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch b/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
deleted file mode 100644
index d320a3bfd66a90..00000000000000
--- a/srcpkgs/PrusaSlicer/patches/boost-1.81.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: PrusaSlicer-2.4.2/src/slic3r/GUI/PrintHostDialogs.cpp
-===================================================================
---- PrusaSlicer-2.4.2.orig/src/slic3r/GUI/PrintHostDialogs.cpp
-+++ PrusaSlicer-2.4.2/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);
-     // .gcode suffix control
--    auto validate_path = [this](const wxString &path) -> bool {
--        if (! path.Lower().EndsWith(m_valid_suffix.Lower())) {
-+    auto validate_path = [this](const wxString &apath) -> bool {
-+        if (! apath.Lower().EndsWith(m_valid_suffix.Lower())) {
-             MessageDialog msg_wingow(this, wxString::Format(_L("Upload filename doesn't end with \"%s\". Do you wish to continue?"), m_valid_suffix), wxString(SLIC3R_APP_NAME), wxYES | wxNO);
-             if (msg_wingow.ShowModal() == wxID_NO)
-                 return false;
diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 01d91cf756a8fa..f5fc3cb399f564 100644
--- a/srcpkgs/PrusaSlicer/template
+++ b/srcpkgs/PrusaSlicer/template
@@ -1,6 +1,6 @@
 # Template file for 'PrusaSlicer'
 pkgname=PrusaSlicer
-version=2.6.1
+version=2.7.4
 revision=1
 _nanosvg_version=fltk_2022-12-22
 build_style=cmake
@@ -19,7 +19,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.prusa3d.com/prusaslicer/"
 distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz
  https://github.com/fltk/nanosvg/archive/refs/tags/${_nanosvg_version}.tar.gz"
-checksum="516eb34835cd8f301e639fa77f9f12297300ce012ebc3b7b6a73275c6245011d
+checksum="6370a9593aeac5c56543e66d167ab5fd053df55b9376392c2d6184eb0bf65fc8
  5b1df945777eb76729a9cc6d2140102f5563ad55ca859692b0d6c273974f55f7"
 
 CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -30,9 +30,6 @@ post_extract() {
 	mv "PrusaSlicer-version_${version}"/* "PrusaSlicer-version_${version}"/.[a-z]* ./
 	rmdir "PrusaSlicer-version_${version}"
 
-	rm deps/NanoSVG/NanoSVG.cmake
-	rmdir deps/NanoSVG
-
 	# Mark tests that fail on certain targets
 	case "$XBPS_TARGET_MACHINE" in
 		*-musl)

^ permalink raw reply	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2024-04-18 17:01 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-20 17:35 [PR PATCH] PrusaSlicer: update to 2.6.1 Vaelatern
2023-10-20 18:05 ` [PR PATCH] [Updated] " Vaelatern
2023-10-20 18:46 ` Vaelatern
2023-10-20 19:18 ` Vaelatern
2023-10-23  0:27 ` Vaelatern
2023-10-23  2:17 ` Vaelatern
2023-10-23  3:06 ` Vaelatern
2023-10-23 22:13 ` Vaelatern
2023-10-23 22:19 ` agausmann
2023-11-01  6:38 ` [PR PATCH] [Updated] " Vaelatern
2023-11-17  4:31 ` Vaelatern
2023-11-17  4:32 ` Vaelatern
2024-02-16  1:44 ` github-actions
2024-02-25 22:17 ` [PR PATCH] [Updated] " Vaelatern
2024-04-17 21:49 ` Vaelatern
2024-04-17 21:50 ` Vaelatern
2024-04-18 17:01 ` Vaelatern

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).