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

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

[-- Attachment #1: Type: text/plain, Size: 1245 bytes --]

There is an updated pull request by ezag against master on the void-packages repository

https://github.com/ezag/void-packages PrusaSlicer
https://github.com/void-linux/void-packages/pull/37805

PrusaSlicer: update to 2.4.2.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **briefly**

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-glibc
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/37805.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-PrusaSlicer-37805.patch --]
[-- Type: text/x-diff, Size: 1791 bytes --]

From a321d7c6f373044ad5c7d1efbf8ddb5f7c3d1ae7 Mon Sep 17 00:00:00 2001
From: Eugen Zagorodniy <zag@disroot.org>
Date: Sat, 2 Jul 2022 18:50:56 +0300
Subject: [PATCH] PrusaSlicer: update to 2.4.2.

---
 srcpkgs/PrusaSlicer/template | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 46cd9d3dede6..08703eeec736 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,13 +16,21 @@ maintainer="Jasper Chan <jasperchan515@gmail.com>"
 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"
+	# 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/'
+				;;
+
 	fi
 }