Github messages for voidlinux
 help / color / mirror / Atom feed
From: karl-nilsson <karl-nilsson@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] WIP: Cura: update to 4.13
Date: Tue, 11 Jan 2022 20:07:08 +0100	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35001@inbox.vuxu.org> (raw)

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

             reply	other threads:[~2022-01-11 19:07 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-11 19:07 karl-nilsson [this message]
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

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-35001@inbox.vuxu.org \
    --to=karl-nilsson@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).