From: karl-nilsson <karl-nilsson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] [WIP] Cura: Update to 4.12.0
Date: Wed, 10 Nov 2021 00:27:07 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34002@inbox.vuxu.org> (raw)
[-- 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
next reply other threads:[~2021-11-09 23:27 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-09 23:27 karl-nilsson [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34002@inbox.vuxu.org \
--to=karl-nilsson@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).