Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] PrusaSlicer: update to 2.4.2.
@ 2022-07-02 19:09 ezag
  2022-07-07 19:41 ` [PR PATCH] [Updated] " ezag
                   ` (11 more replies)
  0 siblings, 12 replies; 13+ messages in thread
From: ezag @ 2022-07-02 19:09 UTC (permalink / raw)
  To: ml

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

There is a new 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: 1185 bytes --]

From ebcca8217848231688b01d03191527722ad3e028 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 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 46cd9d3dede6..e6b6f01b5e1c 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,7 +16,7 @@ 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() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
@ 2022-07-07 19:41 ` ezag
  2022-07-07 19:43 ` ezag
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ezag @ 2022-07-07 19:41 UTC (permalink / raw)
  To: ml

[-- 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: 2021 bytes --]

From b2c11381e89bb4a920bcb560e637a3c1c3a6267b 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 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 46cd9d3dede6..daa3f1aef787 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"
@@ -9,21 +9,21 @@ configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
 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 wxWidgets-devel
- wxWidgets-gtk3-devel"
+ libpng-devel libqhull-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 <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"
-	fi
+	#if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	#	vsed -i tests/CMakeLists.txt -e "/add_subdirectory(libslic3r)/d"
+	#fi
 }
 
 Slic3rPE_package() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
  2022-07-07 19:41 ` [PR PATCH] [Updated] " ezag
@ 2022-07-07 19:43 ` ezag
  2022-07-07 20:49 ` ezag
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ezag @ 2022-07-07 19:43 UTC (permalink / raw)
  To: ml

[-- 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: 2069 bytes --]

From 48742c2d0744af904ed7d509cbe8239e038b6431 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, 10 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 46cd9d3dede6..8afb118c3133 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"
@@ -9,22 +9,22 @@ configure_args="-DSLIC3R_WX_STABLE=1 -DSLIC3R_FHS=1 -DSLIC3R_GTK=3"
 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 wxWidgets-devel
- wxWidgets-gtk3-devel"
+ libpng-devel libqhull-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 <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() {
+#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
-}
+	#if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	#	vsed -i tests/CMakeLists.txt -e "/add_subdirectory(libslic3r)/d"
+	#fi
+#}
 
 Slic3rPE_package() {
 	build_style=meta

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
  2022-07-07 19:41 ` [PR PATCH] [Updated] " ezag
  2022-07-07 19:43 ` ezag
@ 2022-07-07 20:49 ` ezag
  2022-07-07 20:51 ` ezag
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ezag @ 2022-07-07 20:49 UTC (permalink / raw)
  To: ml

[-- 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
 }
 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
                   ` (2 preceding siblings ...)
  2022-07-07 20:49 ` ezag
@ 2022-07-07 20:51 ` ezag
  2022-07-07 20:53 ` ezag
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ezag @ 2022-07-07 20:51 UTC (permalink / raw)
  To: ml

[-- 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 cdf11bd0f713707b74032dcd644d5673bad426a2 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
 }
 

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
                   ` (3 preceding siblings ...)
  2022-07-07 20:51 ` ezag
@ 2022-07-07 20:53 ` ezag
  2022-07-07 21:32 ` ezag
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ezag @ 2022-07-07 20:53 UTC (permalink / raw)
  To: ml

[-- 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: 1815 bytes --]

From 12b5acc7060d385fa0b03f6d118eabbaf20f42bd 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 | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 46cd9d3dede6..74c6e4ec3a21 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,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"
-	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/'
+			;;
+	esac
 }
 
 Slic3rPE_package() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
                   ` (4 preceding siblings ...)
  2022-07-07 20:53 ` ezag
@ 2022-07-07 21:32 ` ezag
  2022-07-07 21:34 ` ezag
                   ` (5 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ezag @ 2022-07-07 21:32 UTC (permalink / raw)
  To: ml

[-- 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: 1956 bytes --]

From b8235abd818892bcd6faf476756fffa40af08035 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 | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 46cd9d3dede6..97aac2861e52 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 <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"
-	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() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
                   ` (5 preceding siblings ...)
  2022-07-07 21:32 ` ezag
@ 2022-07-07 21:34 ` ezag
  2022-07-07 22:05 ` ezag
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ezag @ 2022-07-07 21:34 UTC (permalink / raw)
  To: ml

[-- 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: 1957 bytes --]

From 9c6af990ba5f149e2868cdbc003b79d535660320 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 | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 46cd9d3dede6..415231ca0f42 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 <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"
-	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() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
                   ` (6 preceding siblings ...)
  2022-07-07 21:34 ` ezag
@ 2022-07-07 22:05 ` ezag
  2022-07-07 22:51 ` ezag
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ezag @ 2022-07-07 22:05 UTC (permalink / raw)
  To: ml

[-- 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: 1956 bytes --]

From ed1211b9587f2faba5f347cfa1b27f5627100f4e 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 | 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 <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"
-	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() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
                   ` (7 preceding siblings ...)
  2022-07-07 22:05 ` ezag
@ 2022-07-07 22:51 ` ezag
  2022-08-07 17:35 ` [PR PATCH] [Updated] " classabbyamp
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 13+ messages in thread
From: ezag @ 2022-07-07 22:51 UTC (permalink / raw)
  To: ml

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

New comment by ezag on void-packages repository

https://github.com/void-linux/void-packages/pull/37805#issuecomment-1178337693

Comment:
- made musl test exclusion more specific - now skip just the failing test case rather than entire directory
- excluded new tests that fail on i686

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
                   ` (8 preceding siblings ...)
  2022-07-07 22:51 ` ezag
@ 2022-08-07 17:35 ` classabbyamp
  2022-08-07 17:45 ` classabbyamp
  2022-08-07 18:20 ` [PR PATCH] [Merged]: " classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2022-08-07 17:35 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by classabbyamp 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: 1956 bytes --]

From 1374191dbd236125e35fb0417eb383dfe69d47b1 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 | 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 <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"
-	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() {

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Updated] PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
                   ` (9 preceding siblings ...)
  2022-08-07 17:35 ` [PR PATCH] [Updated] " classabbyamp
@ 2022-08-07 17:45 ` classabbyamp
  2022-08-07 18:20 ` [PR PATCH] [Merged]: " classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2022-08-07 17:45 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by classabbyamp 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: 2271 bytes --]

From 07a8187e54f5ac81ecbba26e2bbe5d219c238dfd 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 | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/srcpkgs/PrusaSlicer/template b/srcpkgs/PrusaSlicer/template
index 46cd9d3dede6..931ac73e5c94 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,21 +16,31 @@ 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"
-	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
+}
+
+post_install() {
+	vinstall ${FILESDIR}/prusa-slicer.desktop 644 usr/share/applications
 }
 
 Slic3rPE_package() {
 	build_style=meta
+	short_desc+=" (transitional dummy package)"
 	depends="${sourcepkg}>=${version}_${revision}"
 }
-
-post_install() {
-	vinstall ${FILESDIR}/prusa-slicer.desktop 644 usr/share/applications
-}

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PR PATCH] [Merged]: PrusaSlicer: update to 2.4.2.
  2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
                   ` (10 preceding siblings ...)
  2022-08-07 17:45 ` classabbyamp
@ 2022-08-07 18:20 ` classabbyamp
  11 siblings, 0 replies; 13+ messages in thread
From: classabbyamp @ 2022-08-07 18:20 UTC (permalink / raw)
  To: ml

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

There's a merged pull request on the void-packages repository

PrusaSlicer: update to 2.4.2.
https://github.com/void-linux/void-packages/pull/37805

Description:
<!-- 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
-->


^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2022-08-07 18:20 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-02 19:09 [PR PATCH] PrusaSlicer: update to 2.4.2 ezag
2022-07-07 19:41 ` [PR PATCH] [Updated] " ezag
2022-07-07 19:43 ` ezag
2022-07-07 20:49 ` ezag
2022-07-07 20:51 ` ezag
2022-07-07 20:53 ` ezag
2022-07-07 21:32 ` ezag
2022-07-07 21:34 ` ezag
2022-07-07 22:05 ` ezag
2022-07-07 22:51 ` ezag
2022-08-07 17:35 ` [PR PATCH] [Updated] " classabbyamp
2022-08-07 17:45 ` classabbyamp
2022-08-07 18:20 ` [PR PATCH] [Merged]: " classabbyamp

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).