From db300efb381e56bf6c62c962302bb326294ec126 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 23 Jan 2021 17:17:52 +0100 Subject: [PATCH 1/2] PrusaSlicer: update to 2.3.0. --- srcpkgs/PrusaSlicer/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index aa195fe6ac8..dd0e76cb801 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,21 +1,22 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer -version=2.2.0 -revision=4 +version=2.3.0 +revision=1 wrksrc="PrusaSlicer-version_${version}" build_style=cmake build_helper="qemu" -configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1" +configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3" hostmakedepends="pkg-config" -makedepends="boost-devel tbb-devel libcurl-devel nlopt-devel gtest-devel - wxWidgets-devel glu-devel libpng-devel glew-devel cereal openvdb-devel - cgal-devel gmpxx-devel eigen" +makedepends=" boost-devel cereal cgal-devel dbus-devel eigen glew-devel + glu-devel gmpxx-devel gtest-devel gtk+3-devel libcurl-devel libglib-devel + libpng-devel nlopt-devel openvdb-devel tbb-devel wxWidgets-devel + wxWidgets-gtk3-devel" short_desc="G-code generator for 3D printers (RepRap, Makerbot, Ultimaker etc.)" maintainer="Jasper Chan " license="GPL-3.0-or-later" homepage="https://www.prusa3d.com/prusaslicer/" distfiles="https://github.com/prusa3d/Prusaslicer/archive/version_${version}.tar.gz" -checksum=e6e0c83bf92e448ec058fd3063b84caca69f58b8b419e48eace6e8ce534937c0 +checksum=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio" Slic3rPE_package() { From d5212f541ff27f5ac6ae63206e22cc594372d6b7 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Mon, 25 Jan 2021 09:55:30 +0100 Subject: [PATCH 2/2] PrusaSlicer: fix musl build --- ...ace-get_current_thread_name-for-musl.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch diff --git a/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch b/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch new file mode 100644 index 00000000000..798a26690f2 --- /dev/null +++ b/srcpkgs/PrusaSlicer/patches/0002-Replace-get_current_thread_name-for-musl.patch @@ -0,0 +1,30 @@ +--- src/libslic3r/Thread.cpp.orig 2021-01-24 13:50:00.469444149 +0100 ++++ src/libslic3r/Thread.cpp 2021-01-24 13:51:17.109443201 +0100 +@@ -171,16 +171,27 @@ bool set_thread_name(boost::thread &thre + return true; + } + ++#ifndef __GLIBC__ ++thread_local char current_thread_name[16] = { 0 }; ++#endif ++ + bool set_current_thread_name(const char *thread_name) + { ++#ifndef __GLIBC__ ++ strncpy(current_thread_name, thread_name, 15); ++#endif + pthread_setname_np(pthread_self(), thread_name); + return true; + } + + std::optional get_current_thread_name() + { ++#ifndef __GLIBC__ + char buf[16]; + return std::string(pthread_getname_np(pthread_self(), buf, 16) == 0 ? buf : ""); ++#else ++ return std::string(current_thread_name); ++#endif + } + + #endif