From d52bd1f3cf1864b9d35e69dd0e9ee42795af5cd1 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Tue, 11 Jan 2022 12:57:04 -0500 Subject: [PATCH] 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 32174f8bc3..0000000000 --- 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 0ac249e2e5..0000000000 --- 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 aa06dcd98b..8e0cc09ab8 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 " 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