[PR PATCH] [WIP] Cura: Update to 4.12.0

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] [WIP] Cura: Update to 4.12.0
@ 2021-11-09 23:27 karl-nilsson
  2021-11-10  4:16 ` [PR PATCH] [Updated] " karl-nilsson
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: karl-nilsson @ 2021-11-09 23:27 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 729 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/34002

[WIP] Cura: Update to 4.12.0
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x64_glibc)

fixes #33867 


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

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

From 1e0063591b42c974bbc3e03e65332e18fa5ee58d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:28 -0500
Subject: [PATCH 1/6] libArcus: update to 4.12.0.

---
 srcpkgs/libArcus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index f1249f37faed..0b491f9d017c 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.11.0
-revision=3
+version=4.12.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -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=2682a898a033f855c9a9d24da976a5467f8823b448db86e308d54017c0c6a372
+checksum=7f5c82866e5b56356a20783963c32211cbb050faeb92c1e73764e81fe1532761
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a05eea099b4335d45e7b2ed6b93d4351b95c6e54 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:32 -0500
Subject: [PATCH 2/6] Uranium: update to 4.12.0.

---
 srcpkgs/Uranium/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 2b5d8de87994..5c7cfd3f50de 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
 hostmakedepends="python3 gettext"
@@ -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=1765d563a36c3158ea8abe4d87b0e3f5e0e595a1c7584b9bd672331e300c0677
+checksum=e0730cae4ad210bbfeba9384ec37ee9e8700ad9c202a6b085f4aa98e564f22be
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 06adeb6b897cdb09c4c952029fa3efa8c856e21f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:38 -0500
Subject: [PATCH 3/6] cura-engine: update to 4.12.0.

---
 srcpkgs/cura-engine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index c1f2be20a24b..771901b0f02c 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -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=d654c2e0397f87d75d4481591f9d7f5e252a4fb4bc61cf84a477223618674f80
+checksum=9554f1c781517f64e0f4401e04eb6f80a34d36daa449b318aafebab58143a741
 
 post_install() {
 	vlicense LICENSE

From 46a30019d8bf991958d135fad858cdfe06540aa3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:12 -0500
Subject: [PATCH 4/6] libSavitar: update to 4.12.0.

---
 srcpkgs/libSavitar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 6389c5d9d530..7e77ae1487a8 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,7 +1,7 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"
@@ -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=fb0cb3d6b063e9f8ae88c0ef34dcbca5b0a4c6f8d841847c02cd4741decd16f9
+checksum=1065e0cca68eccf283dec72a4a515a8fe45d87058e938f98ab4233deb990e0a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From da56e204c4ac8260d59bb031e06301aab44e19a3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:17 -0500
Subject: [PATCH 5/6] python3-pynest2d: update to 4.12.0.

---
 srcpkgs/python3-pynest2d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 1af1547f5704..82d86b23d1e5 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pynest2d'
 pkgname=python3-pynest2d
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="pynest2d-${version}"
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=14"
@@ -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=2d94a0cd7bfa8b9e0ed1fcdbb99002d8eff437d382301101bdab140dc0a4beac
+checksum=55289ddc857883ced8a489721d130de4f500f4af9110c89d824a78a4dec09dc4

From 052dc74dd5e2f7a89227bc9669ac93d6b86be611 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:20 -0500
Subject: [PATCH 6/6] cura: update to 4.12.0.

---
 .../cura/patches/fix_support_blocker_crash.patch  | 15 +++++++++++++++
 srcpkgs/cura/template                             |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
new file mode 100644
index 000000000000..0ac249e2e5c8
--- /dev/null
+++ b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
@@ -0,0 +1,15 @@
+diff --git a/cura/PickingPass.py b/cura/PickingPass.py
+index 54e886fe6..4d6ef671d 100644
+--- a/cura/PickingPass.py
++++ b/cura/PickingPass.py
+@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
+ 
+         window_size = self._renderer.getWindowSize()
+ 
+-        px = (0.5 + x / 2.0) * window_size[0]
+-        py = (0.5 + y / 2.0) * window_size[1]
++        px = int((0.5 + x / 2.0) * window_size[0])
++        py = int((0.5 + y / 2.0) * window_size[1])
+ 
+         if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
+             return -1
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 7a143a8b69a8..53bd19afc3b8 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,7 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}
@@ -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=f8dcee2165141b9390c3144f2db4d7bbb0d62faf5f194e056266fa9409aa7a88
+checksum=ebbc00c792dca1365aa2a83c5e20b2c5973a47c2e24f1338e56fd48aac960d38

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

* Re: [PR PATCH] [Updated] [WIP] Cura: Update to 4.12.0
  2021-11-09 23:27 [PR PATCH] [WIP] Cura: Update to 4.12.0 karl-nilsson
@ 2021-11-10  4:16 ` karl-nilsson
  2021-11-10  4:22 ` karl-nilsson
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: karl-nilsson @ 2021-11-10  4:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 734 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/34002

[WIP] Cura: Update to 4.12.0
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x64_glibc)

fixes #33867 


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

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

From 1e0063591b42c974bbc3e03e65332e18fa5ee58d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:28 -0500
Subject: [PATCH 1/7] libArcus: update to 4.12.0.

---
 srcpkgs/libArcus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index f1249f37faed..0b491f9d017c 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.11.0
-revision=3
+version=4.12.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -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=2682a898a033f855c9a9d24da976a5467f8823b448db86e308d54017c0c6a372
+checksum=7f5c82866e5b56356a20783963c32211cbb050faeb92c1e73764e81fe1532761
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a05eea099b4335d45e7b2ed6b93d4351b95c6e54 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:32 -0500
Subject: [PATCH 2/7] Uranium: update to 4.12.0.

---
 srcpkgs/Uranium/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 2b5d8de87994..5c7cfd3f50de 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
 hostmakedepends="python3 gettext"
@@ -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=1765d563a36c3158ea8abe4d87b0e3f5e0e595a1c7584b9bd672331e300c0677
+checksum=e0730cae4ad210bbfeba9384ec37ee9e8700ad9c202a6b085f4aa98e564f22be
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 06adeb6b897cdb09c4c952029fa3efa8c856e21f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:38 -0500
Subject: [PATCH 3/7] cura-engine: update to 4.12.0.

---
 srcpkgs/cura-engine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index c1f2be20a24b..771901b0f02c 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -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=d654c2e0397f87d75d4481591f9d7f5e252a4fb4bc61cf84a477223618674f80
+checksum=9554f1c781517f64e0f4401e04eb6f80a34d36daa449b318aafebab58143a741
 
 post_install() {
 	vlicense LICENSE

From 46a30019d8bf991958d135fad858cdfe06540aa3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:12 -0500
Subject: [PATCH 4/7] libSavitar: update to 4.12.0.

---
 srcpkgs/libSavitar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 6389c5d9d530..7e77ae1487a8 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,7 +1,7 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"
@@ -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=fb0cb3d6b063e9f8ae88c0ef34dcbca5b0a4c6f8d841847c02cd4741decd16f9
+checksum=1065e0cca68eccf283dec72a4a515a8fe45d87058e938f98ab4233deb990e0a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From da56e204c4ac8260d59bb031e06301aab44e19a3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:17 -0500
Subject: [PATCH 5/7] python3-pynest2d: update to 4.12.0.

---
 srcpkgs/python3-pynest2d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 1af1547f5704..82d86b23d1e5 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pynest2d'
 pkgname=python3-pynest2d
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="pynest2d-${version}"
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=14"
@@ -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=2d94a0cd7bfa8b9e0ed1fcdbb99002d8eff437d382301101bdab140dc0a4beac
+checksum=55289ddc857883ced8a489721d130de4f500f4af9110c89d824a78a4dec09dc4

From 11ea4280de1e5ad79fc115dfa77760c23d5dc95a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:20 -0500
Subject: [PATCH 6/7] cura: update to 4.12.0.

---
 srcpkgs/cura/INSTALL.msg                          |  1 +
 .../cura/patches/fix_support_blocker_crash.patch  | 15 +++++++++++++++
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cura/INSTALL.msg
 create mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/INSTALL.msg b/srcpkgs/cura/INSTALL.msg
new file mode 100644
index 000000000000..0271ec1998bd
--- /dev/null
+++ b/srcpkgs/cura/INSTALL.msg
@@ -0,0 +1 @@
+If you want to interface to your Ultimaker 3d printer, install the libCharon package
diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
new file mode 100644
index 000000000000..0ac249e2e5c8
--- /dev/null
+++ b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
@@ -0,0 +1,15 @@
+diff --git a/cura/PickingPass.py b/cura/PickingPass.py
+index 54e886fe6..4d6ef671d 100644
+--- a/cura/PickingPass.py
++++ b/cura/PickingPass.py
+@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
+ 
+         window_size = self._renderer.getWindowSize()
+ 
+-        px = (0.5 + x / 2.0) * window_size[0]
+-        py = (0.5 + y / 2.0) * window_size[1]
++        px = int((0.5 + x / 2.0) * window_size[0])
++        py = int((0.5 + y / 2.0) * window_size[1])
+ 
+         if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
+             return -1
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 7a143a8b69a8..53bd19afc3b8 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,7 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}
@@ -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=f8dcee2165141b9390c3144f2db4d7bbb0d62faf5f194e056266fa9409aa7a88
+checksum=ebbc00c792dca1365aa2a83c5e20b2c5973a47c2e24f1338e56fd48aac960d38

From c5b429b8f3b1acad8e74ca1f0f5f7bbf9f2a24dc Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 23:15:48 -0500
Subject: [PATCH 7/7] New package: libCharon-4.12.0

---
 srcpkgs/libCharon/files/charon/run |  5 +++++
 srcpkgs/libCharon/template         | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/libCharon/files/charon/run
 create mode 100644 srcpkgs/libCharon/template

diff --git a/srcpkgs/libCharon/files/charon/run b/srcpkgs/libCharon/files/charon/run
new file mode 100644
index 000000000000..d76c62664f58
--- /dev/null
+++ b/srcpkgs/libCharon/files/charon/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+sv check dbus > /dev/null || exit 1
+
+CHARON_USE_SESSION_BUS=0
+exec /usr/bin/python3 CHARON_LOCATION
diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template
new file mode 100644
index 000000000000..7a4cf6ca1498
--- /dev/null
+++ b/srcpkgs/libCharon/template
@@ -0,0 +1,21 @@
+# Template file for 'libCharon'
+pkgname=libCharon
+version=4.12.0
+revision=1
+build_style=cmake
+# configure_args="-DINSTALL_SERVICE=OFF"
+hostmakedepends="python3"
+makedepends="python3-devel"
+depends="python3-dbus"
+short_desc="File metadata and streaming library"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/Ultimaker/libCharon"
+distfiles="https://github.com/Ultimaker/libCharon/archive/refs/tags/${version}.tar.gz"
+checksum=f69942ee65c55d3fe0d5737567d713bb30230d31798555edb58f3953f1b50881
+
+post_install() {
+    vinstall service/nl.ultimaker.charon.conf 644 /usr/share/dbus-1/system.d/
+    vsv charon
+    vsed -i charon/run -e s/CHARON_LOCATION/${DESTDIR}/
+}

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

* Re: [PR PATCH] [Updated] [WIP] Cura: Update to 4.12.0
  2021-11-09 23:27 [PR PATCH] [WIP] Cura: Update to 4.12.0 karl-nilsson
  2021-11-10  4:16 ` [PR PATCH] [Updated] " karl-nilsson
@ 2021-11-10  4:22 ` karl-nilsson
  2021-11-10 16:15 ` karl-nilsson
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 6+ messages in thread
From: karl-nilsson @ 2021-11-10  4:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 734 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/34002

[WIP] Cura: Update to 4.12.0
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x64_glibc)

fixes #33867 


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

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

From 1e0063591b42c974bbc3e03e65332e18fa5ee58d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:28 -0500
Subject: [PATCH 1/7] libArcus: update to 4.12.0.

---
 srcpkgs/libArcus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index f1249f37faed..0b491f9d017c 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.11.0
-revision=3
+version=4.12.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -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=2682a898a033f855c9a9d24da976a5467f8823b448db86e308d54017c0c6a372
+checksum=7f5c82866e5b56356a20783963c32211cbb050faeb92c1e73764e81fe1532761
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a05eea099b4335d45e7b2ed6b93d4351b95c6e54 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:32 -0500
Subject: [PATCH 2/7] Uranium: update to 4.12.0.

---
 srcpkgs/Uranium/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 2b5d8de87994..5c7cfd3f50de 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
 hostmakedepends="python3 gettext"
@@ -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=1765d563a36c3158ea8abe4d87b0e3f5e0e595a1c7584b9bd672331e300c0677
+checksum=e0730cae4ad210bbfeba9384ec37ee9e8700ad9c202a6b085f4aa98e564f22be
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 06adeb6b897cdb09c4c952029fa3efa8c856e21f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:38 -0500
Subject: [PATCH 3/7] cura-engine: update to 4.12.0.

---
 srcpkgs/cura-engine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index c1f2be20a24b..771901b0f02c 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -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=d654c2e0397f87d75d4481591f9d7f5e252a4fb4bc61cf84a477223618674f80
+checksum=9554f1c781517f64e0f4401e04eb6f80a34d36daa449b318aafebab58143a741
 
 post_install() {
 	vlicense LICENSE

From 46a30019d8bf991958d135fad858cdfe06540aa3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:12 -0500
Subject: [PATCH 4/7] libSavitar: update to 4.12.0.

---
 srcpkgs/libSavitar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 6389c5d9d530..7e77ae1487a8 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,7 +1,7 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"
@@ -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=fb0cb3d6b063e9f8ae88c0ef34dcbca5b0a4c6f8d841847c02cd4741decd16f9
+checksum=1065e0cca68eccf283dec72a4a515a8fe45d87058e938f98ab4233deb990e0a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From da56e204c4ac8260d59bb031e06301aab44e19a3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:17 -0500
Subject: [PATCH 5/7] python3-pynest2d: update to 4.12.0.

---
 srcpkgs/python3-pynest2d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 1af1547f5704..82d86b23d1e5 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pynest2d'
 pkgname=python3-pynest2d
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="pynest2d-${version}"
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=14"
@@ -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=2d94a0cd7bfa8b9e0ed1fcdbb99002d8eff437d382301101bdab140dc0a4beac
+checksum=55289ddc857883ced8a489721d130de4f500f4af9110c89d824a78a4dec09dc4

From 11ea4280de1e5ad79fc115dfa77760c23d5dc95a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:20 -0500
Subject: [PATCH 6/7] cura: update to 4.12.0.

---
 srcpkgs/cura/INSTALL.msg                          |  1 +
 .../cura/patches/fix_support_blocker_crash.patch  | 15 +++++++++++++++
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cura/INSTALL.msg
 create mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/INSTALL.msg b/srcpkgs/cura/INSTALL.msg
new file mode 100644
index 000000000000..0271ec1998bd
--- /dev/null
+++ b/srcpkgs/cura/INSTALL.msg
@@ -0,0 +1 @@
+If you want to interface to your Ultimaker 3d printer, install the libCharon package
diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
new file mode 100644
index 000000000000..0ac249e2e5c8
--- /dev/null
+++ b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
@@ -0,0 +1,15 @@
+diff --git a/cura/PickingPass.py b/cura/PickingPass.py
+index 54e886fe6..4d6ef671d 100644
+--- a/cura/PickingPass.py
++++ b/cura/PickingPass.py
+@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
+ 
+         window_size = self._renderer.getWindowSize()
+ 
+-        px = (0.5 + x / 2.0) * window_size[0]
+-        py = (0.5 + y / 2.0) * window_size[1]
++        px = int((0.5 + x / 2.0) * window_size[0])
++        py = int((0.5 + y / 2.0) * window_size[1])
+ 
+         if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
+             return -1
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 7a143a8b69a8..53bd19afc3b8 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,7 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}
@@ -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=f8dcee2165141b9390c3144f2db4d7bbb0d62faf5f194e056266fa9409aa7a88
+checksum=ebbc00c792dca1365aa2a83c5e20b2c5973a47c2e24f1338e56fd48aac960d38

From c507055f1b66ba69ff3e38a768851beffda94a04 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 23:15:48 -0500
Subject: [PATCH 7/7] New package: libCharon-4.12.0

---
 srcpkgs/libCharon/files/charon/run |  5 +++++
 srcpkgs/libCharon/template         | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/libCharon/files/charon/run
 create mode 100644 srcpkgs/libCharon/template

diff --git a/srcpkgs/libCharon/files/charon/run b/srcpkgs/libCharon/files/charon/run
new file mode 100644
index 000000000000..d76c62664f58
--- /dev/null
+++ b/srcpkgs/libCharon/files/charon/run
@@ -0,0 +1,5 @@
+#!/bin/sh
+sv check dbus > /dev/null || exit 1
+
+CHARON_USE_SESSION_BUS=0
+exec /usr/bin/python3 CHARON_LOCATION
diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template
new file mode 100644
index 000000000000..1fc91b871ce3
--- /dev/null
+++ b/srcpkgs/libCharon/template
@@ -0,0 +1,21 @@
+# Template file for 'libCharon'
+pkgname=libCharon
+version=4.12.0
+revision=1
+build_style=cmake
+hostmakedepends="python3"
+makedepends="python3-devel"
+depends="python3-dbus"
+checkdepends="python3-pytest"
+short_desc="File metadata and streaming library"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
+license="LGPL-3.0-or-later"
+homepage="https://github.com/Ultimaker/libCharon"
+distfiles="https://github.com/Ultimaker/libCharon/archive/refs/tags/${version}.tar.gz"
+checksum=f69942ee65c55d3fe0d5737567d713bb30230d31798555edb58f3953f1b50881
+
+post_install() {
+    vinstall service/nl.ultimaker.charon.conf 644 /usr/share/dbus-1/system.d/
+    vsv charon
+    vsed -i charon/run -e s/CHARON_LOCATION/${DESTDIR}/
+}

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

* Re: [PR PATCH] [Updated] [WIP] Cura: Update to 4.12.0
  2021-11-09 23:27 [PR PATCH] [WIP] Cura: Update to 4.12.0 karl-nilsson
  2021-11-10  4:16 ` [PR PATCH] [Updated] " karl-nilsson
  2021-11-10  4:22 ` karl-nilsson
@ 2021-11-10 16:15 ` karl-nilsson
  2021-11-10 16:15 ` karl-nilsson
  2021-11-10 17:45 ` [PR PATCH] [Closed]: " abenson
  4 siblings, 0 replies; 6+ messages in thread
From: karl-nilsson @ 2021-11-10 16:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 734 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/34002

[WIP] Cura: Update to 4.12.0
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x64_glibc)

fixes #33867 


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

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

From 1e0063591b42c974bbc3e03e65332e18fa5ee58d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:28 -0500
Subject: [PATCH 1/6] libArcus: update to 4.12.0.

---
 srcpkgs/libArcus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index f1249f37faed..0b491f9d017c 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.11.0
-revision=3
+version=4.12.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -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=2682a898a033f855c9a9d24da976a5467f8823b448db86e308d54017c0c6a372
+checksum=7f5c82866e5b56356a20783963c32211cbb050faeb92c1e73764e81fe1532761
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From a05eea099b4335d45e7b2ed6b93d4351b95c6e54 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:32 -0500
Subject: [PATCH 2/6] Uranium: update to 4.12.0.

---
 srcpkgs/Uranium/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 2b5d8de87994..5c7cfd3f50de 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
 hostmakedepends="python3 gettext"
@@ -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=1765d563a36c3158ea8abe4d87b0e3f5e0e595a1c7584b9bd672331e300c0677
+checksum=e0730cae4ad210bbfeba9384ec37ee9e8700ad9c202a6b085f4aa98e564f22be
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 06adeb6b897cdb09c4c952029fa3efa8c856e21f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:38 -0500
Subject: [PATCH 3/6] cura-engine: update to 4.12.0.

---
 srcpkgs/cura-engine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index c1f2be20a24b..771901b0f02c 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -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=d654c2e0397f87d75d4481591f9d7f5e252a4fb4bc61cf84a477223618674f80
+checksum=9554f1c781517f64e0f4401e04eb6f80a34d36daa449b318aafebab58143a741
 
 post_install() {
 	vlicense LICENSE

From 46a30019d8bf991958d135fad858cdfe06540aa3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:12 -0500
Subject: [PATCH 4/6] libSavitar: update to 4.12.0.

---
 srcpkgs/libSavitar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 6389c5d9d530..7e77ae1487a8 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,7 +1,7 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"
@@ -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=fb0cb3d6b063e9f8ae88c0ef34dcbca5b0a4c6f8d841847c02cd4741decd16f9
+checksum=1065e0cca68eccf283dec72a4a515a8fe45d87058e938f98ab4233deb990e0a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From da56e204c4ac8260d59bb031e06301aab44e19a3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:17 -0500
Subject: [PATCH 5/6] python3-pynest2d: update to 4.12.0.

---
 srcpkgs/python3-pynest2d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 1af1547f5704..82d86b23d1e5 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pynest2d'
 pkgname=python3-pynest2d
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="pynest2d-${version}"
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=14"
@@ -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=2d94a0cd7bfa8b9e0ed1fcdbb99002d8eff437d382301101bdab140dc0a4beac
+checksum=55289ddc857883ced8a489721d130de4f500f4af9110c89d824a78a4dec09dc4

From 4c4b414063a0371345195a0a935472548e4b8cb2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:20 -0500
Subject: [PATCH 6/6] cura: update to 4.12.0.

---
 .../cura/patches/fix_support_blocker_crash.patch  | 15 +++++++++++++++
 srcpkgs/cura/template                             |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
new file mode 100644
index 000000000000..0ac249e2e5c8
--- /dev/null
+++ b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
@@ -0,0 +1,15 @@
+diff --git a/cura/PickingPass.py b/cura/PickingPass.py
+index 54e886fe6..4d6ef671d 100644
+--- a/cura/PickingPass.py
++++ b/cura/PickingPass.py
+@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
+ 
+         window_size = self._renderer.getWindowSize()
+ 
+-        px = (0.5 + x / 2.0) * window_size[0]
+-        py = (0.5 + y / 2.0) * window_size[1]
++        px = int((0.5 + x / 2.0) * window_size[0])
++        py = int((0.5 + y / 2.0) * window_size[1])
+ 
+         if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
+             return -1
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 7a143a8b69a8..53bd19afc3b8 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,7 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}
@@ -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=f8dcee2165141b9390c3144f2db4d7bbb0d62faf5f194e056266fa9409aa7a88
+checksum=ebbc00c792dca1365aa2a83c5e20b2c5973a47c2e24f1338e56fd48aac960d38

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

* Re: [PR PATCH] [Updated] [WIP] Cura: Update to 4.12.0
  2021-11-09 23:27 [PR PATCH] [WIP] Cura: Update to 4.12.0 karl-nilsson
                   ` (2 preceding siblings ...)
  2021-11-10 16:15 ` karl-nilsson
@ 2021-11-10 16:15 ` karl-nilsson
  2021-11-10 17:45 ` [PR PATCH] [Closed]: " abenson
  4 siblings, 0 replies; 6+ messages in thread
From: karl-nilsson @ 2021-11-10 16:15 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 734 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/34002

[WIP] Cura: Update to 4.12.0
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x64_glibc)

fixes #33867 


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

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

From ad79b59e1bf9c85c2a072398cf9522bf24fe8e29 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:28 -0500
Subject: [PATCH 1/6] libArcus: update to 4.12.0.

---
 srcpkgs/libArcus/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index f1249f37faed..0b491f9d017c 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.11.0
-revision=3
+version=4.12.0
+revision=1
 build_style=cmake
 configure_args="-DBUILD_EXAMPLES=OFF"
 hostmakedepends="protobuf python3-sip-devel"
@@ -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=2682a898a033f855c9a9d24da976a5467f8823b448db86e308d54017c0c6a372
+checksum=7f5c82866e5b56356a20783963c32211cbb050faeb92c1e73764e81fe1532761
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 3938e791bc6a8f18e84080f84228d40318fbea75 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:32 -0500
Subject: [PATCH 2/6] Uranium: update to 4.12.0.

---
 srcpkgs/Uranium/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 2b5d8de87994..5c7cfd3f50de 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,7 +1,7 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 pycompile_dirs="usr/lib/uranium/plugins"
 hostmakedepends="python3 gettext"
@@ -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=1765d563a36c3158ea8abe4d87b0e3f5e0e595a1c7584b9bd672331e300c0677
+checksum=e0730cae4ad210bbfeba9384ec37ee9e8700ad9c202a6b085f4aa98e564f22be
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 4f91185e317ff6aec7c48e85b8f5da276e2f4f67 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:16:38 -0500
Subject: [PATCH 3/6] cura-engine: update to 4.12.0.

---
 srcpkgs/cura-engine/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index c1f2be20a24b..771901b0f02c 100644
--- a/srcpkgs/cura-engine/template
+++ b/srcpkgs/cura-engine/template
@@ -1,7 +1,7 @@
 # Template file for 'cura-engine'
 pkgname=cura-engine
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="CuraEngine-${version}"
 build_style=cmake
 configure_args="-DCURA_ENGINE_VERSION=${version}"
@@ -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=d654c2e0397f87d75d4481591f9d7f5e252a4fb4bc61cf84a477223618674f80
+checksum=9554f1c781517f64e0f4401e04eb6f80a34d36daa449b318aafebab58143a741
 
 post_install() {
 	vlicense LICENSE

From e3795959f4963404a1d42953bfd370a5cf92f499 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:12 -0500
Subject: [PATCH 4/6] libSavitar: update to 4.12.0.

---
 srcpkgs/libSavitar/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 6389c5d9d530..7e77ae1487a8 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,7 +1,7 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 build_style=cmake
 hostmakedepends="python3"
 makedepends="python3-sip-devel python3-devel pugixml-devel"
@@ -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=fb0cb3d6b063e9f8ae88c0ef34dcbca5b0a4c6f8d841847c02cd4741decd16f9
+checksum=1065e0cca68eccf283dec72a4a515a8fe45d87058e938f98ab4233deb990e0a7
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From ed13f9c89ba93d2346b934295c1f1b29c93ea2b2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:17 -0500
Subject: [PATCH 5/6] python3-pynest2d: update to 4.12.0.

---
 srcpkgs/python3-pynest2d/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template
index 1af1547f5704..82d86b23d1e5 100644
--- a/srcpkgs/python3-pynest2d/template
+++ b/srcpkgs/python3-pynest2d/template
@@ -1,7 +1,7 @@
 # Template file for 'python3-pynest2d'
 pkgname=python3-pynest2d
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="pynest2d-${version}"
 build_style=cmake
 configure_args="-DCMAKE_CXX_STANDARD=14"
@@ -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=2d94a0cd7bfa8b9e0ed1fcdbb99002d8eff437d382301101bdab140dc0a4beac
+checksum=55289ddc857883ced8a489721d130de4f500f4af9110c89d824a78a4dec09dc4

From 4b315434f50f66cbbde3c818341442be52a9c9af Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 9 Nov 2021 11:17:20 -0500
Subject: [PATCH 6/6] cura: update to 4.12.0.

---
 .../cura/patches/fix_support_blocker_crash.patch  | 15 +++++++++++++++
 srcpkgs/cura/template                             |  6 +++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
new file mode 100644
index 000000000000..0ac249e2e5c8
--- /dev/null
+++ b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
@@ -0,0 +1,15 @@
+diff --git a/cura/PickingPass.py b/cura/PickingPass.py
+index 54e886fe6..4d6ef671d 100644
+--- a/cura/PickingPass.py
++++ b/cura/PickingPass.py
+@@ -72,8 +72,8 @@ class PickingPass(RenderPass):
+ 
+         window_size = self._renderer.getWindowSize()
+ 
+-        px = (0.5 + x / 2.0) * window_size[0]
+-        py = (0.5 + y / 2.0) * window_size[1]
++        px = int((0.5 + x / 2.0) * window_size[0])
++        py = int((0.5 + y / 2.0) * window_size[1])
+ 
+         if px < 0 or px > (output.width() - 1) or py < 0 or py > (output.height() - 1):
+             return -1
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index 7a143a8b69a8..53bd19afc3b8 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,7 +1,7 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.11.0
-revision=2
+version=4.12.0
+revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
 configure_args="-DCURA_VERSION=${version}
@@ -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=f8dcee2165141b9390c3144f2db4d7bbb0d62faf5f194e056266fa9409aa7a88
+checksum=ebbc00c792dca1365aa2a83c5e20b2c5973a47c2e24f1338e56fd48aac960d38

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

* Re: [PR PATCH] [Closed]: Cura: Update to 4.12.0
  2021-11-09 23:27 [PR PATCH] [WIP] Cura: Update to 4.12.0 karl-nilsson
                   ` (3 preceding siblings ...)
  2021-11-10 16:15 ` karl-nilsson
@ 2021-11-10 17:45 ` abenson
  4 siblings, 0 replies; 6+ messages in thread
From: abenson @ 2021-11-10 17:45 UTC (permalink / raw)
  To: ml

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

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

Cura: Update to 4.12.0
https://github.com/void-linux/void-packages/pull/34002

Description:
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x64_glibc)

fixes #33867 


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

end of thread, other threads:[~2021-11-10 17:45 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-09 23:27 [PR PATCH] [WIP] Cura: Update to 4.12.0 karl-nilsson
2021-11-10  4:16 ` [PR PATCH] [Updated] " karl-nilsson
2021-11-10  4:22 ` karl-nilsson
2021-11-10 16:15 ` karl-nilsson
2021-11-10 16:15 ` karl-nilsson
2021-11-10 17:45 ` [PR PATCH] [Closed]: " abenson

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