* [PR PATCH] Cura: Update to 4.12.1
@ 2021-11-18 21:53 karl-nilsson
2021-11-19 1:56 ` [PR REVIEW] " ericonr
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: karl-nilsson @ 2021-11-18 21:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 580 bytes --]
There is a new pull request by karl-nilsson against master on the void-packages repository
https://github.com/karl-nilsson/void-packages cura
https://github.com/void-linux/void-packages/pull/34138
Cura: Update to 4.12.1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64, glibc)
Thanks to @zlice for identifying this bug:
https://github.com/Ultimaker/Cura/issues/10801
A patch file from https://github.com/void-linux/void-packages/pull/34138.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cura-34138.patch --]
[-- Type: text/x-diff, Size: 9983 bytes --]
From df60a6b5f086f5dae9d840956cc65ae23c3cca17 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:03:52 -0500
Subject: [PATCH 1/8] cura-fdm-materials: update to 4.12.0.
---
srcpkgs/cura-fdm-materials/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index f813f00af5c7..2383b2c697a3 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,7 +1,7 @@
# Template file for 'cura-fdm-materials'
pkgname=cura-fdm-materials
reverts="2019.08.21_1"
-version=4.11.0
+version=4.12.0
revision=1
wrksrc="fdm_materials-${version}"
build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="CC0-1.0"
homepage="https://github.com/Ultimaker/fdm_materials"
distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz"
-checksum=ae339f08ffb5bf14f2dadf4e2c374acec3c0a82c7e9b323cf1e50f081dde274f
+checksum=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
post_install() {
vlicense LICENSE
From 1408779cdf3a4d795fa17800a86da9a96f4b2fbd Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:02 -0500
Subject: [PATCH 2/8] python3-shapely: update to 1.8.0.
---
srcpkgs/python3-shapely/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 5f977079abfc..a88b6fcd3c1b 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -1,8 +1,8 @@
# Template file for 'python3-shapely'
pkgname=python3-shapely
reverts="1.7a1_1 1.7a1_2 1.7a1_3"
-version=1.7.1
-revision=3
+version=1.8.0
+revision=1
wrksrc="Shapely-${version}"
build_style=python3-module
build_helper=numpy
@@ -14,7 +14,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/Toblerity/Shapely"
distfiles="https://github.com/Toblerity/Shapely/archive/${version}.tar.gz"
-checksum=8a39f78a5bb21bc7a0f6e3aa9d78291fad53a433346ffa2474076698da47f24c
+checksum=492d4207b20541e3d0f31c238e07d2f55fe5e00afcfd12390bf55737901fce91
pre_configure() {
if [ "$CROSS_BUILD" ]; then
From a9c79f41716cd39d987835b4386cf2e518d739df Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:23 -0500
Subject: [PATCH 3/8] libArcus: update to 4.12.1.
---
srcpkgs/libArcus/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 0b491f9d017c..4d6bd9dd9875 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
# Template file for 'libArcus'
pkgname=libArcus
-version=4.12.0
+version=4.12.1
revision=1
build_style=cmake
configure_args="-DBUILD_EXAMPLES=OFF"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/libArcus"
distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=7f5c82866e5b56356a20783963c32211cbb050faeb92c1e73764e81fe1532761
+checksum=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
libArcus-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From 936c87f2469e7fdbc84e11327c3a918e5fff0ab1 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:27 -0500
Subject: [PATCH 4/8] Uranium: update to 4.12.1.
---
srcpkgs/Uranium/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 5c7cfd3f50de..672b02276623 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
# Template file for 'Uranium'
pkgname=Uranium
-version=4.12.0
+version=4.12.1
revision=1
build_style=cmake
pycompile_dirs="usr/lib/uranium/plugins"
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/Uranium"
distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=e0730cae4ad210bbfeba9384ec37ee9e8700ad9c202a6b085f4aa98e564f22be
+checksum=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
post_install() {
vmkdir usr/share/uranium/cmake
From 39ff413b50873aa8d7722f0af575f470ebb120e8 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:32 -0500
Subject: [PATCH 5/8] cura-engine: update to 4.12.1.
---
srcpkgs/cura-engine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 771901b0f02c..a018b654d08f 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,6 +1,6 @@
# Template file for 'cura-engine'
pkgname=cura-engine
-version=4.12.0
+version=4.12.1
revision=1
wrksrc="CuraEngine-${version}"
build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="AGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/CuraEngine"
distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=9554f1c781517f64e0f4401e04eb6f80a34d36daa449b318aafebab58143a741
+checksum=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
post_install() {
vlicense LICENSE
From d1cbadc42e06f781caf222e5e0eba3a632d462a9 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:49 -0500
Subject: [PATCH 6/8] python3-pynest2d: update to 4.12.1.
---
srcpkgs/python3-pynest2d/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 82d86b23d1e5..3997bdb0ec4a 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pynest2d'
pkgname=python3-pynest2d
-version=4.12.0
+version=4.12.1
revision=1
wrksrc="pynest2d-${version}"
build_style=cmake
@@ -14,4 +14,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/pynest2d"
distfiles="https://github.com/Ultimaker/pynest2d/archive/${version}.tar.gz"
-checksum=55289ddc857883ced8a489721d130de4f500f4af9110c89d824a78a4dec09dc4
+checksum=d6cd634f0a9ea81c86e5fe1579cd7db8ce293171eb430e6a08d3d5b6523083f5
From 42ec0b0fe91104c42e94f5f12beec59cb4076cf3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:57 -0500
Subject: [PATCH 7/8] libSavitar: update to 4.12.1.
---
srcpkgs/libSavitar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 7e77ae1487a8..3870dcc222be 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
# Template file for 'libSavitar'
pkgname=libSavitar
-version=4.12.0
+version=4.12.1
revision=1
build_style=cmake
hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/libSavitar"
distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=1065e0cca68eccf283dec72a4a515a8fe45d87058e938f98ab4233deb990e0a7
+checksum=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-sip-devel"
From d3c494a981a479f1836a96ea4e96b1dcb478ca99 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:08:00 -0500
Subject: [PATCH 8/8] cura: update to 4.12.1.
---
srcpkgs/cura/patches/fix_multiply_models.patch | 13 +++++++++++++
srcpkgs/cura/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
new file mode 100644
index 000000000000..32174f8bc313
--- /dev/null
+++ b/srcpkgs/cura/patches/fix_multiply_models.patch
@@ -0,0 +1,13 @@
+diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py
+index c29a0648d..dad67ba16 100644
+--- a/cura/Arranging/Nest2DArrange.py
++++ b/cura/Arranging/Nest2DArrange.py
+@@ -91,7 +91,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV
+
+ if hull_polygon is not None and hull_polygon.getPoints() is not None and len(hull_polygon.getPoints()) > 2: # numpy array has to be explicitly checked against None
+ for point in hull_polygon.getPoints():
+- converted_points.append(Point(point[0] * factor, point[1] * factor))
++ converted_points.append(Point(int(point[0] * factor), int(point[1] * factor)))
+ item = Item(converted_points)
+ item.markAsFixedInBin(0)
+ node_items.append(item)
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 53bd19afc3b8..aa06dcd98b85 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
# Template file for 'cura'
pkgname=cura
-version=4.12.0
+version=4.12.1
revision=1
wrksrc="Cura-${version}"
build_style=cmake
@@ -18,4 +18,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/Cura"
distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=ebbc00c792dca1365aa2a83c5e20b2c5973a47c2e24f1338e56fd48aac960d38
+checksum=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR REVIEW] Cura: Update to 4.12.1
2021-11-18 21:53 [PR PATCH] Cura: Update to 4.12.1 karl-nilsson
@ 2021-11-19 1:56 ` ericonr
2021-11-19 19:04 ` [PR PATCH] [Updated] " karl-nilsson
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-11-19 1:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 167 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/34138#discussion_r752807623
Comment:
Can remove `reverts`
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] Cura: Update to 4.12.1
2021-11-18 21:53 [PR PATCH] Cura: Update to 4.12.1 karl-nilsson
2021-11-19 1:56 ` [PR REVIEW] " ericonr
@ 2021-11-19 19:04 ` karl-nilsson
2021-11-19 19:05 ` karl-nilsson
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: karl-nilsson @ 2021-11-19 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 585 bytes --]
There is an updated pull request by karl-nilsson against master on the void-packages repository
https://github.com/karl-nilsson/void-packages cura
https://github.com/void-linux/void-packages/pull/34138
Cura: Update to 4.12.1
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64, glibc)
Thanks to @zlice for identifying this bug:
https://github.com/Ultimaker/Cura/issues/10801
A patch file from https://github.com/void-linux/void-packages/pull/34138.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cura-34138.patch --]
[-- Type: text/x-diff, Size: 9984 bytes --]
From df60a6b5f086f5dae9d840956cc65ae23c3cca17 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:03:52 -0500
Subject: [PATCH 1/8] cura-fdm-materials: update to 4.12.0.
---
srcpkgs/cura-fdm-materials/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index f813f00af5c7..2383b2c697a3 100644
--- a/srcpkgs/cura-fdm-materials/template
+++ b/srcpkgs/cura-fdm-materials/template
@@ -1,7 +1,7 @@
# Template file for 'cura-fdm-materials'
pkgname=cura-fdm-materials
reverts="2019.08.21_1"
-version=4.11.0
+version=4.12.0
revision=1
wrksrc="fdm_materials-${version}"
build_style=cmake
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="CC0-1.0"
homepage="https://github.com/Ultimaker/fdm_materials"
distfiles="https://github.com/Ultimaker/fdm_materials/archive/${version}.tar.gz"
-checksum=ae339f08ffb5bf14f2dadf4e2c374acec3c0a82c7e9b323cf1e50f081dde274f
+checksum=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
post_install() {
vlicense LICENSE
From 2abcf6f6cff7cf7f30d4da3ec1068666b10fb44f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:02 -0500
Subject: [PATCH 2/8] python3-shapely: update to 1.8.0.
---
srcpkgs/python3-shapely/template | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/python3-shapely/template b/srcpkgs/python3-shapely/template
index 5f977079abfc..47632cbc41f8 100644
--- a/srcpkgs/python3-shapely/template
+++ b/srcpkgs/python3-shapely/template
@@ -1,8 +1,7 @@
# Template file for 'python3-shapely'
pkgname=python3-shapely
-reverts="1.7a1_1 1.7a1_2 1.7a1_3"
-version=1.7.1
-revision=3
+version=1.8.0
+revision=1
wrksrc="Shapely-${version}"
build_style=python3-module
build_helper=numpy
@@ -14,7 +13,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/Toblerity/Shapely"
distfiles="https://github.com/Toblerity/Shapely/archive/${version}.tar.gz"
-checksum=8a39f78a5bb21bc7a0f6e3aa9d78291fad53a433346ffa2474076698da47f24c
+checksum=492d4207b20541e3d0f31c238e07d2f55fe5e00afcfd12390bf55737901fce91
pre_configure() {
if [ "$CROSS_BUILD" ]; then
From 193aeae7b1d786e6c89122ef5bdbba5c39d0c229 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:23 -0500
Subject: [PATCH 3/8] libArcus: update to 4.12.1.
---
srcpkgs/libArcus/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 0b491f9d017c..4d6bd9dd9875 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
# Template file for 'libArcus'
pkgname=libArcus
-version=4.12.0
+version=4.12.1
revision=1
build_style=cmake
configure_args="-DBUILD_EXAMPLES=OFF"
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/libArcus"
distfiles="https://github.com/Ultimaker/libArcus/archive/${version}.tar.gz"
-checksum=7f5c82866e5b56356a20783963c32211cbb050faeb92c1e73764e81fe1532761
+checksum=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
libArcus-devel_package() {
depends="${sourcepkg}>=${version}_${revision}"
From bdb49617378c554ccdc057387801b6389dd80879 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:27 -0500
Subject: [PATCH 4/8] Uranium: update to 4.12.1.
---
srcpkgs/Uranium/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 5c7cfd3f50de..672b02276623 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
# Template file for 'Uranium'
pkgname=Uranium
-version=4.12.0
+version=4.12.1
revision=1
build_style=cmake
pycompile_dirs="usr/lib/uranium/plugins"
@@ -15,7 +15,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/Uranium"
distfiles="https://github.com/Ultimaker/Uranium/archive/${version}.tar.gz"
-checksum=e0730cae4ad210bbfeba9384ec37ee9e8700ad9c202a6b085f4aa98e564f22be
+checksum=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
post_install() {
vmkdir usr/share/uranium/cmake
From ad8d31c2d31bbb6cd0a6799fc18953d61bf4eea8 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:32 -0500
Subject: [PATCH 5/8] cura-engine: update to 4.12.1.
---
srcpkgs/cura-engine/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 771901b0f02c..a018b654d08f 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,6 +1,6 @@
# Template file for 'cura-engine'
pkgname=cura-engine
-version=4.12.0
+version=4.12.1
revision=1
wrksrc="CuraEngine-${version}"
build_style=cmake
@@ -12,7 +12,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="AGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/CuraEngine"
distfiles="https://github.com/Ultimaker/CuraEngine/archive/${version}.tar.gz"
-checksum=9554f1c781517f64e0f4401e04eb6f80a34d36daa449b318aafebab58143a741
+checksum=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
post_install() {
vlicense LICENSE
From c2d9dff410fd3e1b4fecb136e4a647c3b9b3dd6e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:49 -0500
Subject: [PATCH 6/8] python3-pynest2d: update to 4.12.1.
---
srcpkgs/python3-pynest2d/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 82d86b23d1e5..3997bdb0ec4a 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,6 +1,6 @@
# Template file for 'python3-pynest2d'
pkgname=python3-pynest2d
-version=4.12.0
+version=4.12.1
revision=1
wrksrc="pynest2d-${version}"
build_style=cmake
@@ -14,4 +14,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/pynest2d"
distfiles="https://github.com/Ultimaker/pynest2d/archive/${version}.tar.gz"
-checksum=55289ddc857883ced8a489721d130de4f500f4af9110c89d824a78a4dec09dc4
+checksum=d6cd634f0a9ea81c86e5fe1579cd7db8ce293171eb430e6a08d3d5b6523083f5
From e687d5b04d025be67814a8ec60f7c1a8bd10c7a7 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:07:57 -0500
Subject: [PATCH 7/8] libSavitar: update to 4.12.1.
---
srcpkgs/libSavitar/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 7e77ae1487a8..3870dcc222be 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
# Template file for 'libSavitar'
pkgname=libSavitar
-version=4.12.0
+version=4.12.1
revision=1
build_style=cmake
hostmakedepends="python3"
@@ -10,7 +10,7 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/libSavitar"
distfiles="https://github.com/Ultimaker/libSavitar/archive/${version}.tar.gz"
-checksum=1065e0cca68eccf283dec72a4a515a8fe45d87058e938f98ab4233deb990e0a7
+checksum=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" python3-sip-devel"
From 78b07a2aa7e8125849f51fa186a02452ce1faeb4 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 18 Nov 2021 16:08:00 -0500
Subject: [PATCH 8/8] cura: update to 4.12.1.
---
srcpkgs/cura/patches/fix_multiply_models.patch | 13 +++++++++++++
srcpkgs/cura/template | 4 ++--
2 files changed, 15 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
new file mode 100644
index 000000000000..32174f8bc313
--- /dev/null
+++ b/srcpkgs/cura/patches/fix_multiply_models.patch
@@ -0,0 +1,13 @@
+diff --git a/cura/Arranging/Nest2DArrange.py b/cura/Arranging/Nest2DArrange.py
+index c29a0648d..dad67ba16 100644
+--- a/cura/Arranging/Nest2DArrange.py
++++ b/cura/Arranging/Nest2DArrange.py
+@@ -91,7 +91,7 @@ def findNodePlacement(nodes_to_arrange: List["SceneNode"], build_volume: "BuildV
+
+ if hull_polygon is not None and hull_polygon.getPoints() is not None and len(hull_polygon.getPoints()) > 2: # numpy array has to be explicitly checked against None
+ for point in hull_polygon.getPoints():
+- converted_points.append(Point(point[0] * factor, point[1] * factor))
++ converted_points.append(Point(int(point[0] * factor), int(point[1] * factor)))
+ item = Item(converted_points)
+ item.markAsFixedInBin(0)
+ node_items.append(item)
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 53bd19afc3b8..aa06dcd98b85 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
# Template file for 'cura'
pkgname=cura
-version=4.12.0
+version=4.12.1
revision=1
wrksrc="Cura-${version}"
build_style=cmake
@@ -18,4 +18,4 @@ maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
license="LGPL-3.0-or-later"
homepage="https://github.com/Ultimaker/Cura"
distfiles="https://github.com/Ultimaker/Cura/archive/${version}.tar.gz"
-checksum=ebbc00c792dca1365aa2a83c5e20b2c5973a47c2e24f1338e56fd48aac960d38
+checksum=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Cura: Update to 4.12.1
2021-11-18 21:53 [PR PATCH] Cura: Update to 4.12.1 karl-nilsson
2021-11-19 1:56 ` [PR REVIEW] " ericonr
2021-11-19 19:04 ` [PR PATCH] [Updated] " karl-nilsson
@ 2021-11-19 19:05 ` karl-nilsson
2021-11-19 22:30 ` [PR PATCH] [Merged]: " ericonr
2021-11-20 1:48 ` zlice
4 siblings, 0 replies; 6+ messages in thread
From: karl-nilsson @ 2021-11-19 19:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
New comment by karl-nilsson on void-packages repository
https://github.com/void-linux/void-packages/pull/34138#issuecomment-974332343
Comment:
@ericonr fixed
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: Cura: Update to 4.12.1
2021-11-18 21:53 [PR PATCH] Cura: Update to 4.12.1 karl-nilsson
` (2 preceding siblings ...)
2021-11-19 19:05 ` karl-nilsson
@ 2021-11-19 22:30 ` ericonr
2021-11-20 1:48 ` zlice
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-11-19 22:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
There's a merged pull request on the void-packages repository
Cura: Update to 4.12.1
https://github.com/void-linux/void-packages/pull/34138
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
#### Local build testing
- I built this PR locally for my native architecture, (x64, glibc)
Thanks to @zlice for identifying this bug:
https://github.com/Ultimaker/Cura/issues/10801
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: Cura: Update to 4.12.1
2021-11-18 21:53 [PR PATCH] Cura: Update to 4.12.1 karl-nilsson
` (3 preceding siblings ...)
2021-11-19 22:30 ` [PR PATCH] [Merged]: " ericonr
@ 2021-11-20 1:48 ` zlice
4 siblings, 0 replies; 6+ messages in thread
From: zlice @ 2021-11-20 1:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 150 bytes --]
New comment by zlice on void-packages repository
https://github.com/void-linux/void-packages/pull/34138#issuecomment-974572024
Comment:
Thanks yall
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-11-20 1:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18 21:53 [PR PATCH] Cura: Update to 4.12.1 karl-nilsson
2021-11-19 1:56 ` [PR REVIEW] " ericonr
2021-11-19 19:04 ` [PR PATCH] [Updated] " karl-nilsson
2021-11-19 19:05 ` karl-nilsson
2021-11-19 22:30 ` [PR PATCH] [Merged]: " ericonr
2021-11-20 1:48 ` zlice
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).