From 8527eab84a7e2e4122537d35a380ed5f2d3bcf3f Mon Sep 17 00:00:00 2001 From: Karl Nilsson 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 " 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 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 " 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 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 " 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 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 " 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 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 " 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 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 " +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 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 " 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