Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] WIP: Cura: update to 4.13
@ 2022-01-11 19:07 karl-nilsson
  2022-01-11 20:23 ` [PR PATCH] [Updated] " karl-nilsson
                   ` (14 more replies)
  0 siblings, 15 replies; 16+ messages in thread
From: karl-nilsson @ 2022-01-11 19:07 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 830 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [ ] Ultimaker appears to have forgotten to tag a new release for pynest2d

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

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

From a6d6ff3fb044f95ff417e28e92787ef9791569db Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:40 -0500
Subject: [PATCH 1/6] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From a6842cf4aea906b2937d06458e0e29635fcc1cf3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:45 -0500
Subject: [PATCH 2/6] libArcus: update to 4.13.0.

---
 srcpkgs/libArcus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 4d6bd9dd9875..04a9b6391f80 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
+version=4.13.0
 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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=6318f40432a210c77335964c1bb344f499668eab0e23803814065d78573f5951
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From bce7152a1f562f73837c16c6e2288bde8439a03e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 3/6] Uranium: update to 4.13.0.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..1b276b624f2f 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.0
 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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=e7fcbdfdc42cd694059f111af72de7347d5a13aa5f5c6bf45712859b0282ba0a
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 666bf646f261d95cc0706772c476519584dd1798 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:56 -0500
Subject: [PATCH 4/6] cura-engine: update to 4.13.0.

---
 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 a018b654d08f..1859abb5b529 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.1
+version=4.13.0
 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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=7da1600dafb0a4dafa1fa8d545879e13688b43cd3b318fa22a67de4f87e67ca0
 
 post_install() {
 	vlicense LICENSE

From 3fde2fa5072cd0a76bb097e4784d5cb331f838dc Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 5/6] libSavitar: update to 4.13.0.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..640457079f72 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.0
 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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=1ae4b8ab8fe3e9a960c8a37ddb54560053da10abee621f0c5a60f343243a1317
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From 6a77c012baf5fc4a6076bf7f9630744b78eafe0c Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 6/6] cura: update to 4.13.0.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  4 ++--
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..6bd98423f111 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.0
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=45fe84601d5b7e78150181a6321e796c9676423d4dd13a161018c897ae07a8be

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
@ 2022-01-11 20:23 ` karl-nilsson
  2022-01-11 21:48 ` [PR PATCH] [Closed]: " karl-nilsson
                   ` (13 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-01-11 20:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 835 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [ ] Ultimaker appears to have forgotten to tag a new release for pynest2d

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

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

From a6d6ff3fb044f95ff417e28e92787ef9791569db Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:40 -0500
Subject: [PATCH 1/6] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From a6842cf4aea906b2937d06458e0e29635fcc1cf3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:45 -0500
Subject: [PATCH 2/6] libArcus: update to 4.13.0.

---
 srcpkgs/libArcus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 4d6bd9dd9875..04a9b6391f80 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
+version=4.13.0
 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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=6318f40432a210c77335964c1bb344f499668eab0e23803814065d78573f5951
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From bce7152a1f562f73837c16c6e2288bde8439a03e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 3/6] Uranium: update to 4.13.0.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..1b276b624f2f 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.0
 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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=e7fcbdfdc42cd694059f111af72de7347d5a13aa5f5c6bf45712859b0282ba0a
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 666bf646f261d95cc0706772c476519584dd1798 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:56 -0500
Subject: [PATCH 4/6] cura-engine: update to 4.13.0.

---
 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 a018b654d08f..1859abb5b529 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.1
+version=4.13.0
 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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=7da1600dafb0a4dafa1fa8d545879e13688b43cd3b318fa22a67de4f87e67ca0
 
 post_install() {
 	vlicense LICENSE

From 3fde2fa5072cd0a76bb097e4784d5cb331f838dc Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 5/6] libSavitar: update to 4.13.0.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..640457079f72 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.0
 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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=1ae4b8ab8fe3e9a960c8a37ddb54560053da10abee621f0c5a60f343243a1317
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From c817f00ab0221921a0711be01b20175550811cac Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 6/6] cura: update to 4.13.0.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..7a11b16d3919 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.0
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=45fe84601d5b7e78150181a6321e796c9676423d4dd13a161018c897ae07a8be

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

* Re: [PR PATCH] [Closed]: WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
  2022-01-11 20:23 ` [PR PATCH] [Updated] " karl-nilsson
@ 2022-01-11 21:48 ` karl-nilsson
  2022-01-21  5:05 ` [PR PATCH] [Updated] " karl-nilsson
                   ` (12 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-01-11 21:48 UTC (permalink / raw)
  To: ml

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

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

WIP: Cura: update to 4.13
https://github.com/void-linux/void-packages/pull/35001

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [ ] Ultimaker appears to have forgotten to tag a new release for pynest2d

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
  2022-01-11 20:23 ` [PR PATCH] [Updated] " karl-nilsson
  2022-01-11 21:48 ` [PR PATCH] [Closed]: " karl-nilsson
@ 2022-01-21  5:05 ` karl-nilsson
  2022-01-28 16:10 ` karl-nilsson
                   ` (11 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-01-21  5:05 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 928 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

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

From b59e78c798ffe5e2a658a7c7a8fbafa4a8a1f6db Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:40 -0500
Subject: [PATCH 1/6] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 95fd3c42405c22e827ed22f57bba296d3d84fe5c Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:45 -0500
Subject: [PATCH 2/6] libArcus: update to 4.13.0.

---
 srcpkgs/libArcus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 4d6bd9dd9875..04a9b6391f80 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
+version=4.13.0
 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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=6318f40432a210c77335964c1bb344f499668eab0e23803814065d78573f5951
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From ee785a8326798c17e758818c4b232adaf9a01e0d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 3/6] Uranium: update to 4.13.0.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..1b276b624f2f 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.0
 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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=e7fcbdfdc42cd694059f111af72de7347d5a13aa5f5c6bf45712859b0282ba0a
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 408823c5f75b801b4a48fa0de68555b1c388c3a2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:56 -0500
Subject: [PATCH 4/6] cura-engine: update to 4.13.0.

---
 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 a018b654d08f..1859abb5b529 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.1
+version=4.13.0
 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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=7da1600dafb0a4dafa1fa8d545879e13688b43cd3b318fa22a67de4f87e67ca0
 
 post_install() {
 	vlicense LICENSE

From 75d390560709de288e1d0d4afa7269295c563a08 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 5/6] libSavitar: update to 4.13.0.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..640457079f72 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.0
 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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=1ae4b8ab8fe3e9a960c8a37ddb54560053da10abee621f0c5a60f343243a1317
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From 1e517807aeac02e6917b7e8a6a8f5239c5defdd0 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 6/6] cura: update to 4.13.0.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..7a11b16d3919 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.0
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=45fe84601d5b7e78150181a6321e796c9676423d4dd13a161018c897ae07a8be

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (2 preceding siblings ...)
  2022-01-21  5:05 ` [PR PATCH] [Updated] " karl-nilsson
@ 2022-01-28 16:10 ` karl-nilsson
  2022-01-28 16:10 ` karl-nilsson
                   ` (10 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-01-28 16:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 928 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

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

From b59e78c798ffe5e2a658a7c7a8fbafa4a8a1f6db Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:40 -0500
Subject: [PATCH 1/6] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 95fd3c42405c22e827ed22f57bba296d3d84fe5c Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:45 -0500
Subject: [PATCH 2/6] libArcus: update to 4.13.0.

---
 srcpkgs/libArcus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 4d6bd9dd9875..04a9b6391f80 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
+version=4.13.0
 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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=6318f40432a210c77335964c1bb344f499668eab0e23803814065d78573f5951
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 3bac81f4112682e0c4c7fa93e4017dab5a6957cb Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 3/6] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From b43b2bb57b29ab855c1d044ffb449bf0f5322fe4 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:56 -0500
Subject: [PATCH 4/6] cura-engine: update to 4.13.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 a018b654d08f..5cded6271dea 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.1
+version=4.13.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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From 3d88c9aeed3fedaca6c5a2587f5ef0f220e571b9 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 5/6] libSavitar: update to 4.13.0.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..640457079f72 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.0
 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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=1ae4b8ab8fe3e9a960c8a37ddb54560053da10abee621f0c5a60f343243a1317
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From 67f0d4910e70303306491804c07e0baa1f97fd97 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 6/6] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..e7a5c9727ea1 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (3 preceding siblings ...)
  2022-01-28 16:10 ` karl-nilsson
@ 2022-01-28 16:10 ` karl-nilsson
  2022-03-01 23:12 ` karl-nilsson
                   ` (9 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-01-28 16:10 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 928 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

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

From 7412cc734a29e7f98a88e061ec18bf0ad11de325 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:40 -0500
Subject: [PATCH 1/6] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 73057f8be97fff987ca4c8f90f8533ab4e2e1f0a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:45 -0500
Subject: [PATCH 2/6] libArcus: update to 4.13.0.

---
 srcpkgs/libArcus/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index 4d6bd9dd9875..04a9b6391f80 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,6 +1,6 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
+version=4.13.0
 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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=6318f40432a210c77335964c1bb344f499668eab0e23803814065d78573f5951
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 14df17ab273682b31c28ad5de5299631905bb225 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 3/6] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From f802397ab85cf040dfebcbe42e01ea231b29f540 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:56 -0500
Subject: [PATCH 4/6] cura-engine: update to 4.13.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 a018b654d08f..5cded6271dea 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.1
+version=4.13.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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From 7d9eddfe3abafd4599bc5114183ef3d2cb5be5e8 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 5/6] libSavitar: update to 4.13.0.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..640457079f72 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.0
 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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=1ae4b8ab8fe3e9a960c8a37ddb54560053da10abee621f0c5a60f343243a1317
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From 1614683f02546ce4c8df6ac45a630332a3a3ae6d Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 6/6] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..e7a5c9727ea1 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (4 preceding siblings ...)
  2022-01-28 16:10 ` karl-nilsson
@ 2022-03-01 23:12 ` karl-nilsson
  2022-03-24  4:03 ` karl-nilsson
                   ` (8 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-03-01 23:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 928 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

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

From c2c8bf7fa14b0b05b10c4cad012f8fb8c1ec535a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:40 -0500
Subject: [PATCH 1/4] cura-fdm-materials: update to 4.13.0.

---
 srcpkgs/cura-fdm-materials/template | 4 ++--
 srcpkgs/libArcus/template           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/cura-fdm-materials/template b/srcpkgs/cura-fdm-materials/template
index 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE
diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..04a9b6391f80 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=6318f40432a210c77335964c1bb344f499668eab0e23803814065d78573f5951
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 67468c31757d4b8c5f1f4517c2353e3bc1b08b5c Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 2/4] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template     | 4 ++--
 srcpkgs/cura-engine/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 8c2822f73c0d..5cded6271dea 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.12.1
-revision=2
+version=4.13.1
+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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From e024d12ce3fd4ee68906712baff024e561efc535 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 3/4] libSavitar: update to 4.13.0.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..640457079f72 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.0
 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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=1ae4b8ab8fe3e9a960c8a37ddb54560053da10abee621f0c5a60f343243a1317
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From 5be0e1d0be63db930d4cfedd830a4274d18375bb Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 4/4] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..e7a5c9727ea1 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (5 preceding siblings ...)
  2022-03-01 23:12 ` karl-nilsson
@ 2022-03-24  4:03 ` karl-nilsson
  2022-03-24  4:25 ` karl-nilsson
                   ` (7 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-03-24  4:03 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 928 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

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

From 68c8684d3ed8ee549280a092683296905c952ed2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 23:59:55 -0400
Subject: [PATCH 1/5] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 5a45120dffbb7aae0c5dffba0c8e9801d4cc59ce Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:00:21 -0400
Subject: [PATCH 2/5] libArcus: update to 4.13.1.

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

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..21176dfdbcbe 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.1
+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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 361171a4f93793ee5028a56633c2a8f265806786 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 3/5] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template     | 4 ++--
 srcpkgs/cura-engine/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 8c2822f73c0d..5cded6271dea 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.12.1
-revision=2
+version=4.13.1
+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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From dee15adb1fc0971ff936c28914fef19e2711b633 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 4/5] libSavitar: update to 4.13.1.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..eaffe92be8ce 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From daa5155c17d1bd5c6d3c0adba342b131e508eac4 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 5/5] cura: update to 4.13.1.

---
 .../cura/patches/fix_multiply_models.patch    |  13 -
 .../patches/fix_support_blocker_crash.patch   |  15 -
 srcpkgs/cura/patches/remove_plugins.patch     | 364 ++++++++++++++++++
 srcpkgs/cura/template                         |   6 +-
 4 files changed, 367 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch
 create mode 100644 srcpkgs/cura/patches/remove_plugins.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/patches/remove_plugins.patch b/srcpkgs/cura/patches/remove_plugins.patch
new file mode 100644
index 000000000000..a63f669e4149
--- /dev/null
+++ b/srcpkgs/cura/patches/remove_plugins.patch
@@ -0,0 +1,364 @@
+diff --git a/plugins/UFPReader/UFPReader.py b/plugins/UFPReader/UFPReader.py
+deleted file mode 100644
+index 71061f938..000000000
+--- a/plugins/UFPReader/UFPReader.py
++++ /dev/null
+@@ -1,42 +0,0 @@
+-# Copyright (c) 2019 Ultimaker B.V.
+-# Cura is released under the terms of the LGPLv3 or higher.
+-
+-from typing import TYPE_CHECKING
+-
+-from Charon.VirtualFile import VirtualFile
+-
+-from UM.Mesh.MeshReader import MeshReader
+-from UM.MimeTypeDatabase import MimeType, MimeTypeDatabase
+-from UM.PluginRegistry import PluginRegistry
+-
+-if TYPE_CHECKING:
+-    from cura.Scene.CuraSceneNode import CuraSceneNode
+-
+-
+-class UFPReader(MeshReader):
+-
+-    def __init__(self) -> None:
+-        super().__init__()
+-
+-        MimeTypeDatabase.addMimeType(
+-            MimeType(
+-                name = "application/x-ufp",
+-                comment = "Ultimaker Format Package",
+-                suffixes = ["ufp"]
+-            )
+-        )
+-        self._supported_extensions = [".ufp"]
+-
+-    def _read(self, file_name: str) -> "CuraSceneNode":
+-        # Open the file
+-        archive = VirtualFile()
+-        archive.open(file_name)
+-        # Get the gcode data from the file
+-        gcode_data = archive.getData("/3D/model.gcode")
+-        # Convert the bytes stream to string
+-        gcode_stream = gcode_data["/3D/model.gcode"].decode("utf-8")
+-
+-        # Open the GCodeReader to parse the data
+-        gcode_reader = PluginRegistry.getInstance().getPluginObject("GCodeReader")  # type: ignore
+-        gcode_reader.preReadFromStream(gcode_stream)  # type: ignore
+-        return gcode_reader.readFromStream(gcode_stream, file_name)  # type: ignore
+diff --git a/plugins/UFPReader/__init__.py b/plugins/UFPReader/__init__.py
+deleted file mode 100644
+index cfea4b988..000000000
+--- a/plugins/UFPReader/__init__.py
++++ /dev/null
+@@ -1,34 +0,0 @@
+-#Copyright (c) 2019 Ultimaker B.V.
+-#Cura is released under the terms of the LGPLv3 or higher.
+-
+-import sys
+-
+-from UM.Logger import Logger
+-try:
+-    from . import UFPReader
+-except ImportError:
+-    Logger.log("w", "Could not import UFPReader; libCharon may be missing")
+-
+-from UM.i18n import i18nCatalog
+-i18n_catalog = i18nCatalog("cura")
+-
+-
+-def getMetaData():
+-    return {
+-        "mesh_reader": [
+-            {
+-                "mime_type": "application/x-ufp",
+-                "extension": "ufp",
+-                "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package")
+-            }
+-        ]
+-    }
+-
+-
+-def register(app):
+-    if "UFPReader.UFPReader" not in sys.modules:
+-        return {}
+-
+-    app.addNonSliceableExtension(".ufp")
+-    return {"mesh_reader": UFPReader.UFPReader()}
+-
+diff --git a/plugins/UFPReader/plugin.json b/plugins/UFPReader/plugin.json
+deleted file mode 100644
+index cac7e8623..000000000
+--- a/plugins/UFPReader/plugin.json
++++ /dev/null
+@@ -1,8 +0,0 @@
+-{
+-    "name": "UFP Reader",
+-    "author": "Ultimaker B.V.",
+-    "version": "1.0.0",
+-    "description": "Provides support for reading Ultimaker Format Packages.",
+-    "supported_sdk_versions": ["7.9.0"],
+-    "i18n-catalog": "cura"
+-}
+\ No newline at end of file
+diff --git a/plugins/UFPWriter/UFPWriter.py b/plugins/UFPWriter/UFPWriter.py
+deleted file mode 100644
+index 455a7c3c3..000000000
+--- a/plugins/UFPWriter/UFPWriter.py
++++ /dev/null
+@@ -1,192 +0,0 @@
+-# Copyright (c) 2021 Ultimaker B.V.
+-# Cura is released under the terms of the LGPLv3 or higher.
+-
+-from typing import cast, List, Dict
+-
+-from Charon.VirtualFile import VirtualFile  # To open UFP files.
+-from Charon.OpenMode import OpenMode  # To indicate that we want to write to UFP files.
+-from Charon.filetypes.OpenPackagingConvention import OPCError
+-from io import StringIO  # For converting g-code to bytes.
+-
+-from PyQt5.QtCore import QBuffer
+-
+-from UM.Logger import Logger
+-from UM.Mesh.MeshWriter import MeshWriter  # The writer we need to implement.
+-from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType
+-from UM.PluginRegistry import PluginRegistry  # To get the g-code writer.
+-
+-from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
+-from UM.Scene.SceneNode import SceneNode
+-from cura.CuraApplication import CuraApplication
+-from cura.Utils.Threading import call_on_qt_thread
+-
+-from UM.i18n import i18nCatalog
+-
+-METADATA_OBJECTS_PATH = "metadata/objects"
+-
+-catalog = i18nCatalog("cura")
+-
+-
+-class UFPWriter(MeshWriter):
+-    def __init__(self):
+-        super().__init__(add_to_recent_files = False)
+-
+-        MimeTypeDatabase.addMimeType(
+-            MimeType(
+-                name = "application/x-ufp",
+-                comment = "Ultimaker Format Package",
+-                suffixes = ["ufp"]
+-            )
+-        )
+-
+-    # This needs to be called on the main thread (Qt thread) because the serialization of material containers can
+-    # trigger loading other containers. Because those loaded containers are QtObjects, they must be created on the
+-    # Qt thread. The File read/write operations right now are executed on separated threads because they are scheduled
+-    # by the Job class.
+-    @call_on_qt_thread
+-    def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode):
+-        archive = VirtualFile()
+-        archive.openStream(stream, "application/x-ufp", OpenMode.WriteOnly)
+-
+-        try:
+-            self._writeObjectList(archive)
+-
+-            # Store the g-code from the scene.
+-            archive.addContentType(extension = "gcode", mime_type = "text/x-gcode")
+-        except EnvironmentError as e:
+-            error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+-            self.setInformation(error_msg)
+-            Logger.error(error_msg)
+-            return False
+-        gcode_textio = StringIO()  # We have to convert the g-code into bytes.
+-        gcode_writer = cast(MeshWriter, PluginRegistry.getInstance().getPluginObject("GCodeWriter"))
+-        success = gcode_writer.write(gcode_textio, None)
+-        if not success:  # Writing the g-code failed. Then I can also not write the gzipped g-code.
+-            self.setInformation(gcode_writer.getInformation())
+-            return False
+-        try:
+-            gcode = archive.getStream("/3D/model.gcode")
+-            gcode.write(gcode_textio.getvalue().encode("UTF-8"))
+-            archive.addRelation(virtual_path = "/3D/model.gcode", relation_type = "http://schemas.ultimaker.org/package/2018/relationships/gcode")
+-        except EnvironmentError as e:
+-            error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+-            self.setInformation(error_msg)
+-            Logger.error(error_msg)
+-            return False
+-
+-        # Attempt to store the thumbnail, if any:
+-        backend = CuraApplication.getInstance().getBackend()
+-        snapshot = None if getattr(backend, "getLatestSnapshot", None) is None else backend.getLatestSnapshot()
+-        if snapshot:
+-            try:
+-                archive.addContentType(extension = "png", mime_type = "image/png")
+-                thumbnail = archive.getStream("/Metadata/thumbnail.png")
+-
+-                thumbnail_buffer = QBuffer()
+-                thumbnail_buffer.open(QBuffer.ReadWrite)
+-                snapshot.save(thumbnail_buffer, "PNG")
+-
+-                thumbnail.write(thumbnail_buffer.data())
+-                archive.addRelation(virtual_path = "/Metadata/thumbnail.png",
+-                                    relation_type = "http://schemas.openxmlformats.org/package/2006/relationships/metadata/thumbnail",
+-                                    origin = "/3D/model.gcode")
+-            except EnvironmentError as e:
+-                error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+-                self.setInformation(error_msg)
+-                Logger.error(error_msg)
+-                return False
+-        else:
+-            Logger.log("w", "Thumbnail not created, cannot save it")
+-
+-        # Store the material.
+-        application = CuraApplication.getInstance()
+-        machine_manager = application.getMachineManager()
+-        container_registry = application.getContainerRegistry()
+-        global_stack = machine_manager.activeMachine
+-
+-        material_extension = "xml.fdm_material"
+-        material_mime_type = "application/x-ultimaker-material-profile"
+-
+-        try:
+-            archive.addContentType(extension = material_extension, mime_type = material_mime_type)
+-        except OPCError:
+-            Logger.log("w", "The material extension: %s was already added", material_extension)
+-
+-        added_materials = []
+-        for extruder_stack in global_stack.extruderList:
+-            material = extruder_stack.material
+-            try:
+-                material_file_name = material.getMetaData()["base_file"] + ".xml.fdm_material"
+-            except KeyError:
+-                Logger.log("w", "Unable to get base_file for the material %s", material.getId())
+-                continue
+-            material_file_name = "/Materials/" + material_file_name
+-
+-            # The same material should not be added again.
+-            if material_file_name in added_materials:
+-                continue
+-
+-            material_root_id = material.getMetaDataEntry("base_file")
+-            material_root_query = container_registry.findContainers(id = material_root_id)
+-            if not material_root_query:
+-                Logger.log("e", "Cannot find material container with root id {root_id}".format(root_id = material_root_id))
+-                return False
+-            material_container = material_root_query[0]
+-
+-            try:
+-                serialized_material = material_container.serialize()
+-            except NotImplementedError:
+-                Logger.log("e", "Unable serialize material container with root id: %s", material_root_id)
+-                return False
+-
+-            try:
+-                material_file = archive.getStream(material_file_name)
+-                material_file.write(serialized_material.encode("UTF-8"))
+-                archive.addRelation(virtual_path = material_file_name,
+-                                    relation_type = "http://schemas.ultimaker.org/package/2018/relationships/material",
+-                                    origin = "/3D/model.gcode")
+-            except EnvironmentError as e:
+-                error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+-                self.setInformation(error_msg)
+-                Logger.error(error_msg)
+-                return False
+-
+-            added_materials.append(material_file_name)
+-
+-        try:
+-            archive.close()
+-        except EnvironmentError as e:
+-            error_msg = catalog.i18nc("@info:error", "Can't write to UFP file:") + " " + str(e)
+-            self.setInformation(error_msg)
+-            Logger.error(error_msg)
+-            return False
+-        return True
+-
+-    @staticmethod
+-    def _writeObjectList(archive):
+-        """Write a json list of object names to the METADATA_OBJECTS_PATH metadata field
+-
+-        To retrieve, use: `archive.getMetadata(METADATA_OBJECTS_PATH)`
+-        """
+-
+-        objects_model = CuraApplication.getInstance().getObjectsModel()
+-        object_metas = []
+-
+-        for item in objects_model.items:
+-            object_metas.extend(UFPWriter._getObjectMetadata(item["node"]))
+-
+-        data = {METADATA_OBJECTS_PATH: object_metas}
+-        archive.setMetadata(data)
+-
+-    @staticmethod
+-    def _getObjectMetadata(node: SceneNode) -> List[Dict[str, str]]:
+-        """Get object metadata to write for a Node.
+-
+-        :return: List of object metadata dictionaries.
+-                 Might contain > 1 element in case of a group node.
+-                 Might be empty in case of nonPrintingMesh
+-        """
+-
+-        return [{"name": item.getName()}
+-                for item in DepthFirstIterator(node)
+-                if item.getMeshData() is not None and not item.callDecoration("isNonPrintingMesh")]
+diff --git a/plugins/UFPWriter/__init__.py b/plugins/UFPWriter/__init__.py
+deleted file mode 100644
+index 9db6b042f..000000000
+--- a/plugins/UFPWriter/__init__.py
++++ /dev/null
+@@ -1,38 +0,0 @@
+-#Copyright (c) 2018 Ultimaker B.V.
+-#Cura is released under the terms of the LGPLv3 or higher.
+-
+-import sys
+-
+-from UM.Logger import Logger
+-try:
+-    from . import UFPWriter
+-except ImportError:
+-    Logger.log("w", "Could not import UFPWriter; libCharon may be missing")
+-
+-from UM.i18n import i18nCatalog #To translate the file format description.
+-from UM.Mesh.MeshWriter import MeshWriter #For the binary mode flag.
+-
+-i18n_catalog = i18nCatalog("cura")
+-
+-def getMetaData():
+-    if "UFPWriter.UFPWriter" not in sys.modules:
+-        return {}
+-
+-    return {
+-        "mesh_writer": {
+-            "output": [
+-                {
+-                    "mime_type": "application/x-ufp",
+-                    "mode": MeshWriter.OutputMode.BinaryMode,
+-                    "extension": "ufp",
+-                    "description": i18n_catalog.i18nc("@item:inlistbox", "Ultimaker Format Package")
+-                }
+-            ]
+-        }
+-    }
+-
+-def register(app):
+-    if "UFPWriter.UFPWriter" not in sys.modules:
+-        return {}
+-
+-    return { "mesh_writer": UFPWriter.UFPWriter() }
+diff --git a/plugins/UFPWriter/kitten.png b/plugins/UFPWriter/kitten.png
+deleted file mode 100644
+index 44738f94f..000000000
+Binary files a/plugins/UFPWriter/kitten.png and /dev/null differ
+diff --git a/plugins/UFPWriter/plugin.json b/plugins/UFPWriter/plugin.json
+deleted file mode 100644
+index 6d27d250c..000000000
+--- a/plugins/UFPWriter/plugin.json
++++ /dev/null
+@@ -1,8 +0,0 @@
+-{
+-    "name": "UFP Writer",
+-    "author": "Ultimaker B.V.",
+-    "version": "1.0.1",
+-    "description": "Provides support for writing Ultimaker Format Packages.",
+-    "api": 7,
+-    "i18n-catalog": "cura"
+-}
+\ No newline at end of file
diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template
index aa06dcd98b85..e7a5c9727ea1 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (6 preceding siblings ...)
  2022-03-24  4:03 ` karl-nilsson
@ 2022-03-24  4:25 ` karl-nilsson
  2022-03-24  4:34 ` karl-nilsson
                   ` (6 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-03-24  4:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 928 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

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

From 68c8684d3ed8ee549280a092683296905c952ed2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 23:59:55 -0400
Subject: [PATCH 1/6] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 5a45120dffbb7aae0c5dffba0c8e9801d4cc59ce Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:00:21 -0400
Subject: [PATCH 2/6] libArcus: update to 4.13.1.

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

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..21176dfdbcbe 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.1
+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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 361171a4f93793ee5028a56633c2a8f265806786 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 3/6] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template     | 4 ++--
 srcpkgs/cura-engine/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 8c2822f73c0d..5cded6271dea 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.12.1
-revision=2
+version=4.13.1
+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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From dee15adb1fc0971ff936c28914fef19e2711b633 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 4/6] libSavitar: update to 4.13.1.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..eaffe92be8ce 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From 0b2f06f2ad6f478edcde7dbc5b03471d490ccacb Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:18:57 -0400
Subject: [PATCH 5/6] New package: libCharon-4.13.0

---
 srcpkgs/libCharon/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/libCharon/template

diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template
new file mode 100644
index 000000000000..0c1b9860f203
--- /dev/null
+++ b/srcpkgs/libCharon/template
@@ -0,0 +1,16 @@
+# Template file for 'libCharon'
+pkgname=libCharon
+version=4.13.0
+revision=1
+build_style=cmake
+configure_args="INSTALL_SERVICE=OFF"
+hostmakedepends="python3"
+makedepends=""
+depends=""
+checkdepends="python3-pytest python-mypy"
+short_desc="File metadata and streaming library"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Ultimaker/libCharon"
+distfiles="https://github.com/Ultimaker/libCharon/archive/${version}.tar.gz"
+checksum=efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec

From 0e71030bb6a18395f24168800ed87723ad01936a Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 6/6] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..8e0cc09ab8d3 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry libCharon"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

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

* Re: WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (7 preceding siblings ...)
  2022-03-24  4:25 ` karl-nilsson
@ 2022-03-24  4:34 ` karl-nilsson
  2022-03-24  4:36 ` [PR PATCH] [Updated] " karl-nilsson
                   ` (5 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-03-24  4:34 UTC (permalink / raw)
  To: ml

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

New comment by karl-nilsson on void-packages repository

https://github.com/void-linux/void-packages/pull/35001#issuecomment-1077061698

Comment:
The libCharon library is a new dependency of Cura. I disabled its systemd service, and I'll attempt to replace it with a runit service in a future release.

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (8 preceding siblings ...)
  2022-03-24  4:34 ` karl-nilsson
@ 2022-03-24  4:36 ` karl-nilsson
  2022-03-29 14:09 ` WIP: Cura: update to 4.13.1 ahesford
                   ` (4 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-03-24  4:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 928 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

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

From 68c8684d3ed8ee549280a092683296905c952ed2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 23:59:55 -0400
Subject: [PATCH 1/6] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 5a45120dffbb7aae0c5dffba0c8e9801d4cc59ce Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:00:21 -0400
Subject: [PATCH 2/6] libArcus: update to 4.13.1.

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

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..21176dfdbcbe 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.1
+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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 361171a4f93793ee5028a56633c2a8f265806786 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:56:50 -0500
Subject: [PATCH 3/6] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template     | 4 ++--
 srcpkgs/cura-engine/template | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake
diff --git a/srcpkgs/cura-engine/template b/srcpkgs/cura-engine/template
index 8c2822f73c0d..5cded6271dea 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.12.1
-revision=2
+version=4.13.1
+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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From dee15adb1fc0971ff936c28914fef19e2711b633 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 4/6] libSavitar: update to 4.13.1.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..eaffe92be8ce 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From 5a141c6aa7828afca755f135e344c983f6ee9878 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:18:57 -0400
Subject: [PATCH 5/6] New package: libCharon-4.13.0

---
 srcpkgs/libCharon/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/libCharon/template

diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template
new file mode 100644
index 000000000000..b33e995d9dbe
--- /dev/null
+++ b/srcpkgs/libCharon/template
@@ -0,0 +1,14 @@
+# Template file for 'libCharon'
+pkgname=libCharon
+version=4.13.0
+revision=1
+build_style=cmake
+configure_args="INSTALL_SERVICE=OFF"
+hostmakedepends="python3"
+checkdepends="python3-pytest python3-mypy"
+short_desc="File metadata and streaming library"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Ultimaker/libCharon"
+distfiles="https://github.com/Ultimaker/libCharon/archive/${version}.tar.gz"
+checksum=efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec

From 2d046f474dbc5e8bc8d53a8d779a1b095bd4559e Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 6/6] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..8e0cc09ab8d3 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry libCharon"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

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

* Re: WIP: Cura: update to 4.13.1
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (9 preceding siblings ...)
  2022-03-24  4:36 ` [PR PATCH] [Updated] " karl-nilsson
@ 2022-03-29 14:09 ` ahesford
  2022-03-29 15:24 ` [PR PATCH] [Updated] " karl-nilsson
                   ` (3 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: ahesford @ 2022-03-29 14:09 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/35001#issuecomment-1081919736

Comment:
This update and addition of libCharon enable network printing to an Ultimaker 3. Our existing packaged version fails to print. Is this ready to be merged?

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13.1
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (10 preceding siblings ...)
  2022-03-29 14:09 ` WIP: Cura: update to 4.13.1 ahesford
@ 2022-03-29 15:24 ` karl-nilsson
  2022-03-29 15:24 ` karl-nilsson
                   ` (2 subsequent siblings)
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-03-29 15:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 930 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

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

From 68c8684d3ed8ee549280a092683296905c952ed2 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 23:59:55 -0400
Subject: [PATCH 1/7] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 5a45120dffbb7aae0c5dffba0c8e9801d4cc59ce Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:00:21 -0400
Subject: [PATCH 2/7] libArcus: update to 4.13.1.

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

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..21176dfdbcbe 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.1
+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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 39c1655f6aa0b3b988bb93b35744e9fe3f02eb82 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:27 -0400
Subject: [PATCH 3/7] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From b67d02bfea2f518e1473c708b3b60febeea22032 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:57 -0400
Subject: [PATCH 4/7] cura-engine: update to 4.13.1.

---
 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 8c2822f73c0d..5cded6271dea 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.12.1
-revision=2
+version=4.13.1
+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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From 3cc78d8989a561b2fb630b9f32e603a2453c7c20 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 5/7] libSavitar: update to 4.13.1.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..eaffe92be8ce 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From d737da3f112155de4f4c51e7e129e36c408134f3 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:18:57 -0400
Subject: [PATCH 6/7] New package: libCharon-4.13.0

---
 srcpkgs/libCharon/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/libCharon/template

diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template
new file mode 100644
index 000000000000..b33e995d9dbe
--- /dev/null
+++ b/srcpkgs/libCharon/template
@@ -0,0 +1,14 @@
+# Template file for 'libCharon'
+pkgname=libCharon
+version=4.13.0
+revision=1
+build_style=cmake
+configure_args="INSTALL_SERVICE=OFF"
+hostmakedepends="python3"
+checkdepends="python3-pytest python3-mypy"
+short_desc="File metadata and streaming library"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Ultimaker/libCharon"
+distfiles="https://github.com/Ultimaker/libCharon/archive/${version}.tar.gz"
+checksum=efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec

From 5dd8825882ed5b1c83a18d0d43edc0c54c80af66 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 7/7] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..8e0cc09ab8d3 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry libCharon"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

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

* Re: [PR PATCH] [Updated] WIP: Cura: update to 4.13.1
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (11 preceding siblings ...)
  2022-03-29 15:24 ` [PR PATCH] [Updated] " karl-nilsson
@ 2022-03-29 15:24 ` karl-nilsson
  2022-03-29 15:41 ` karl-nilsson
  2022-03-29 15:48 ` [PR PATCH] [Merged]: " ahesford
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-03-29 15:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 930 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-4.13
https://github.com/void-linux/void-packages/pull/35001

WIP: Cura: update to 4.13.1
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

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

From 8527eab84a7e2e4122537d35a380ed5f2d3bcf3f Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Wed, 23 Mar 2022 23:59:55 -0400
Subject: [PATCH 1/7] cura-fdm-materials: update to 4.13.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 2383b2c697a3..fb701a7510f0 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.12.0
+version=4.13.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=f559a5c9a7ca926de1b13fdd6cadb765d0a53b14a2279dbf2782def7b087ec41
+checksum=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8
 
 post_install() {
 	vlicense LICENSE

From 4c8d0ea6274839de88f82ace9546e75690c437c8 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:00:21 -0400
Subject: [PATCH 2/7] libArcus: update to 4.13.1.

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

diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template
index d560ee19b81d..21176dfdbcbe 100644
--- a/srcpkgs/libArcus/template
+++ b/srcpkgs/libArcus/template
@@ -1,7 +1,7 @@
 # Template file for 'libArcus'
 pkgname=libArcus
-version=4.12.1
-revision=2
+version=4.13.1
+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=412848c07fa5792eed2e07e47d372119a93fcfc3f09ed7ae1ee4f33fe51444a6
+checksum=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240
 
 libArcus-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From b3956611af1b4929210ffe6bafeaf75e404739de Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:27 -0400
Subject: [PATCH 3/7] Uranium: update to 4.13.1.

---
 srcpkgs/Uranium/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template
index 672b02276623..eb4bcf6670ee 100644
--- a/srcpkgs/Uranium/template
+++ b/srcpkgs/Uranium/template
@@ -1,6 +1,6 @@
 # Template file for 'Uranium'
 pkgname=Uranium
-version=4.12.1
+version=4.13.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=b64a3673de67b93bcbf874d7a3401ab9ff095cc2c085ee118ee5f8902aac2bd0
+checksum=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41
 
 post_install() {
 	vmkdir usr/share/uranium/cmake

From 2cb8114761216bc431ffd425e2cec65143551192 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 29 Mar 2022 11:23:57 -0400
Subject: [PATCH 4/7] cura-engine: update to 4.13.1.

---
 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 8c2822f73c0d..5cded6271dea 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.12.1
-revision=2
+version=4.13.1
+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=d23514cb0140926c929b18b09db01c439b822db3243a13bc907f38adeca0252b
+checksum=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657
 
 post_install() {
 	vlicense LICENSE

From b534f0827c3bdeb53fe57ed304e5cd60cd8b73dd Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:01 -0500
Subject: [PATCH 5/7] libSavitar: update to 4.13.1.

---
 srcpkgs/libSavitar/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template
index 3870dcc222be..eaffe92be8ce 100644
--- a/srcpkgs/libSavitar/template
+++ b/srcpkgs/libSavitar/template
@@ -1,6 +1,6 @@
 # Template file for 'libSavitar'
 pkgname=libSavitar
-version=4.12.1
+version=4.13.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=de73263b28e288d933665eae1e6ebc5026cc7a128aff4a4716b7cd60756b9940
+checksum=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" python3-sip-devel"

From 861bfc38f5891c2c511829c46b61a7fc531d0918 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Thu, 24 Mar 2022 00:18:57 -0400
Subject: [PATCH 6/7] New package: libCharon-4.13.0

---
 srcpkgs/libCharon/template | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 srcpkgs/libCharon/template

diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template
new file mode 100644
index 000000000000..b33e995d9dbe
--- /dev/null
+++ b/srcpkgs/libCharon/template
@@ -0,0 +1,14 @@
+# Template file for 'libCharon'
+pkgname=libCharon
+version=4.13.0
+revision=1
+build_style=cmake
+configure_args="INSTALL_SERVICE=OFF"
+hostmakedepends="python3"
+checkdepends="python3-pytest python3-mypy"
+short_desc="File metadata and streaming library"
+maintainer="Karl Nilsson <karl.robert.nilsson@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/Ultimaker/libCharon"
+distfiles="https://github.com/Ultimaker/libCharon/archive/${version}.tar.gz"
+checksum=efccb04a84b9a80fe4e154aa4b44c56b59061aeba25937be804277a5f21259ec

From ade02aa3c8504772a4f57b73b3129fad7218f9d1 Mon Sep 17 00:00:00 2001
From: Karl Nilsson <karl.robert.nilsson@gmail.com>
Date: Tue, 11 Jan 2022 12:57:04 -0500
Subject: [PATCH 7/7] cura: update to 4.13.1.

---
 srcpkgs/cura/patches/fix_multiply_models.patch    | 13 -------------
 .../cura/patches/fix_support_blocker_crash.patch  | 15 ---------------
 srcpkgs/cura/template                             |  6 +++---
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/cura/patches/fix_multiply_models.patch
 delete mode 100644 srcpkgs/cura/patches/fix_support_blocker_crash.patch

diff --git a/srcpkgs/cura/patches/fix_multiply_models.patch b/srcpkgs/cura/patches/fix_multiply_models.patch
deleted file mode 100644
index 32174f8bc313..000000000000
--- a/srcpkgs/cura/patches/fix_multiply_models.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/patches/fix_support_blocker_crash.patch b/srcpkgs/cura/patches/fix_support_blocker_crash.patch
deleted file mode 100644
index 0ac249e2e5c8..000000000000
--- a/srcpkgs/cura/patches/fix_support_blocker_crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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 aa06dcd98b85..8e0cc09ab8d3 100644
--- a/srcpkgs/cura/template
+++ b/srcpkgs/cura/template
@@ -1,6 +1,6 @@
 # Template file for 'cura'
 pkgname=cura
-version=4.12.1
+version=4.13.1
 revision=1
 wrksrc="Cura-${version}"
 build_style=cmake
@@ -11,11 +11,11 @@ hostmakedepends="python3"
 makedepends="Uranium libArcus-devel python3-devel"
 depends="Uranium cura-engine cura-fdm-materials python3-pyserial python3-zeroconf
  python3-certifi python3-trimesh libSavitar-python3 python3-requests qt5-graphicaleffects
- python3-pynest2d python3-keyring"
+ python3-pynest2d python3-keyring python3-sentry libCharon"
 checkdepends="python3-pytest python3-mypy $depends"
 short_desc="3D printer / slicing GUI"
 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=98be51c664e75cb67d589c32d66e516a96bfe78829ded38d8be57128378d5a72
+checksum=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c

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

* Re: Cura: update to 4.13.1
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (12 preceding siblings ...)
  2022-03-29 15:24 ` karl-nilsson
@ 2022-03-29 15:41 ` karl-nilsson
  2022-03-29 15:48 ` [PR PATCH] [Merged]: " ahesford
  14 siblings, 0 replies; 16+ messages in thread
From: karl-nilsson @ 2022-03-29 15:41 UTC (permalink / raw)
  To: ml

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

New comment by karl-nilsson on void-packages repository

https://github.com/void-linux/void-packages/pull/35001#issuecomment-1082039435

Comment:
@ahesford it's ready to merge!

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

* Re: [PR PATCH] [Merged]: Cura: update to 4.13.1
  2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
                   ` (13 preceding siblings ...)
  2022-03-29 15:41 ` karl-nilsson
@ 2022-03-29 15:48 ` ahesford
  14 siblings, 0 replies; 16+ messages in thread
From: ahesford @ 2022-03-29 15:48 UTC (permalink / raw)
  To: ml

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

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

Cura: update to 4.13.1
https://github.com/void-linux/void-packages/pull/35001

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

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

#### Local build testing
- I built this PR locally for my native architecture, x64-glibc

Todo:
- [ ] UFP(Reader|Writer) plugin fails, because libCharon is absent (I haven't packaged it yet). The error dialog appears twice, and clicking the "Remove plugin" button on both dialogs crashes cura.
- [x] ~~Ultimaker appears to have forgotten to tag a new release for pynest2d~~
  - the pynest2d repo hasn't changed in the past 3 releases. No need for a version bump

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

end of thread, other threads:[~2022-03-29 15:48 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-11 19:07 [PR PATCH] WIP: Cura: update to 4.13 karl-nilsson
2022-01-11 20:23 ` [PR PATCH] [Updated] " karl-nilsson
2022-01-11 21:48 ` [PR PATCH] [Closed]: " karl-nilsson
2022-01-21  5:05 ` [PR PATCH] [Updated] " karl-nilsson
2022-01-28 16:10 ` karl-nilsson
2022-01-28 16:10 ` karl-nilsson
2022-03-01 23:12 ` karl-nilsson
2022-03-24  4:03 ` karl-nilsson
2022-03-24  4:25 ` karl-nilsson
2022-03-24  4:34 ` karl-nilsson
2022-03-24  4:36 ` [PR PATCH] [Updated] " karl-nilsson
2022-03-29 14:09 ` WIP: Cura: update to 4.13.1 ahesford
2022-03-29 15:24 ` [PR PATCH] [Updated] " karl-nilsson
2022-03-29 15:24 ` karl-nilsson
2022-03-29 15:41 ` karl-nilsson
2022-03-29 15:48 ` [PR PATCH] [Merged]: " ahesford

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