From: Vaelatern <Vaelatern@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.6.1.
Date: Mon, 23 Oct 2023 02:27:46 +0200 [thread overview]
Message-ID: <20231023002746.f4kyC_0F8pLeBelO8VAUX16Sh1ShxcjTA3UrbAwG7QQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46799@inbox.vuxu.org>
[-- 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"
next prev parent reply other threads:[~2023-10-23 0:27 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-20 17:35 [PR PATCH] " 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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231023002746.f4kyC_0F8pLeBelO8VAUX16Sh1ShxcjTA3UrbAwG7QQ@z \
--to=vaelatern@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).