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

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

[-- 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() {