From ed1211b9587f2faba5f347cfa1b27f5627100f4e Mon Sep 17 00:00:00 2001 From: Eugen Zagorodniy Date: Sat, 2 Jul 2022 18:50:56 +0300 Subject: [PATCH] PrusaSlicer: update to 2.4.2. --- srcpkgs/PrusaSlicer/template | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template index 46cd9d3dede6..51c89da5c021 100644 --- a/srcpkgs/PrusaSlicer/template +++ b/srcpkgs/PrusaSlicer/template @@ -1,7 +1,7 @@ # Template file for 'PrusaSlicer' pkgname=PrusaSlicer -version=2.4.0 -revision=2 +version=2.4.2 +revision=1 wrksrc="PrusaSlicer-version_${version}" build_style=cmake build_helper="qemu" @@ -16,14 +16,23 @@ 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=906d0acf0d0e064ae3cbaa16ba1a2e24dd9c32ceb2121464cb4d5951c09e66c2 +checksum=ac3a77212260e8d0baf9df027c29e0ae965bc77f371e59fd27b8fe103ebb1f23 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 + # Mark tests that fail on certain targets + case "$XBPS_TARGET_MACHINE" in + *-musl) + vsed -i tests/libslic3r/test_mutable_priority_queue.cpp \ + -e 's/\(TEST_CASE("Mutable priority queue - first pop", "\[MutableSkipHeapPriorityQueue\]\)\(")\)/\1[!mayfail]\2/' + ;; + i686*) + vsed -i tests/libslic3r/test_voronoi.cpp \ + -e 's/\(TEST_CASE("Voronoi offset 2", "\[VoronoiOffset\]\)\(")\)/\1[!mayfail]\2/' + vsed -i tests/fff_print/test_trianglemesh.cpp \ + -e 's/\(SCENARIO( "make_xxx functions produce meshes."\)\()\)/\1, "[!mayfail]"\2/' + ;; + esac } Slic3rPE_package() {