From d5123dd31980758c2a5700d480555e35798edfcd Mon Sep 17 00:00:00 2001 From: cinerea0 Date: Thu, 27 Jan 2022 19:21:06 -0500 Subject: [PATCH] PrusaSlicer: update to 2.4.0. --- srcpkgs/PrusaSlicer/patches/cross.patch | 11 ----------- srcpkgs/PrusaSlicer/template | 11 +++++++++-- 2 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 srcpkgs/PrusaSlicer/patches/cross.patch diff --git a/srcpkgs/PrusaSlicer/patches/cross.patch b/srcpkgs/PrusaSlicer/patches/cross.patch deleted file mode 100644 index d64a450d9e9..00000000000 --- a/srcpkgs/PrusaSlicer/patches/cross.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/avrdude/CMakeLists.txt 2020-06-04 09:19:26.017251215 +0200 -+++ b/src/avrdude/CMakeLists.txt 2020-06-04 09:19:36.468250771 +0200 -@@ -83,7 +83,7 @@ add_executable(avrdude-conf-gen conf-gen - add_custom_command( - DEPENDS avrdude-conf-gen ${CMAKE_CURRENT_SOURCE_DIR}/avrdude-slic3r.conf - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h -- COMMAND $ avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h -+ COMMAND avrdude-conf-gen avrdude-slic3r.conf avrdude_slic3r_conf ${CMAKE_CURRENT_BINARY_DIR}/avrdude-slic3r.conf.h - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - ) - diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index dd0e76cb801..c612c47d785 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,6 +1,6 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer -version=2.3.0 +version=2.4.0 revision=1 wrksrc="PrusaSlicer-version_${version}" build_style=cmake @@ -16,9 +16,16 @@ 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=cd3bac5e29b5441fc4690f28cd7b1064e97dc00207bbdc88f7bd7832308d6ca5 +checksum=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2 nocross="https://build.voidlinux.org/builders/armv7l_builder/builds/25230/steps/shell_3/logs/stdio" +post_extract() { + # this test suite fails on musl + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + vsed -i tests/CMakeLists.txt -e "/add_subdirectory(libslic3r)/d" + fi +} + Slic3rPE_package() { build_style=meta depends="${sourcepkg}>=${version}_${revision}"