From 7412cc734a29e7f98a88e061ec18bf0ad11de325 Mon Sep 17 00:00:00 2001 From: Karl Nilsson 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 " 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 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 " 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 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 " 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 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 " 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 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 " 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 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 " 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