From f6f3d68a654680b20713461e879eee8d24cf268d Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Fri, 20 May 2022 21:10:29 -0400 Subject: [PATCH 1/8] cura-fdm-materials: update to 5.1.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 fb701a7510f053..222345a3f343fe 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.13.0 +version=5.1.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=5db128a41437bc7326c440f5f75a09f67cadaefa1e511fa24046be58a3d4a1d8 +checksum=5143c0a0975d9ef9f07600d16ef59798d0b721d4feb3b157eaba774a43baba49 post_install() { vlicense LICENSE From f146938ebe1d9ef47389167f148ebd640a2a8eae Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Fri, 20 May 2022 21:10:33 -0400 Subject: [PATCH 2/8] libArcus: update to 5.1.0. --- srcpkgs/libArcus/patches/protobuf.patch | 42 ------------------------- srcpkgs/libArcus/template | 6 ++-- 2 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 srcpkgs/libArcus/patches/protobuf.patch diff --git a/srcpkgs/libArcus/patches/protobuf.patch b/srcpkgs/libArcus/patches/protobuf.patch deleted file mode 100644 index e138558cf2ba92..00000000000000 --- a/srcpkgs/libArcus/patches/protobuf.patch +++ /dev/null @@ -1,42 +0,0 @@ -Migrate away from previously deprecated functions dropped in protobuf>=3.18.0_1. - ---- a/src/Socket_p.h -+++ b/src/Socket_p.h -@@ -128,9 +128,6 @@ - - static const int keep_alive_rate = 500; //Number of milliseconds between sending keepalive packets - -- // This value determines when protobuf should warn about very large messages. -- static const int message_size_warning = 400 * 1048576; -- - // This value determines when protobuf should error out because the message is too large. - // Due to the way Protobuf is implemented, messages large than 512MiB will cause issues. - static const int message_size_maximum = 500 * 1048576; -@@ -362,11 +359,15 @@ - return; - } - -- uint32_t message_size = message->ByteSize(); -- if(platform_socket.writeUInt32(message_size) == -1) -+ auto message_size = message->ByteSizeLong(); -+ if (message_size > UINT32_MAX) { -+ error(ErrorCode::SendFailedError, "Message size is too large to send"); -+ return; -+ } -+ -+ if(platform_socket.writeUInt32(static_cast(message_size)) == -1) - { - error(ErrorCode::SendFailedError, "Could not send message size"); -- return; - } - - uint32_t type_id = message_types.getMessageTypeId(message); -@@ -548,7 +549,7 @@ - - google::protobuf::io::ArrayInputStream array(wire_message->data, wire_message->size); - google::protobuf::io::CodedInputStream stream(&array); -- stream.SetTotalBytesLimit(message_size_maximum, message_size_warning); -+ stream.SetTotalBytesLimit(message_size_maximum); - if(!message->ParseFromCodedStream(&stream)) - { - error(ErrorCode::ParseFailedError, "Failed to parse message:" + std::string(wire_message->data)); diff --git a/srcpkgs/libArcus/template b/srcpkgs/libArcus/template index 30a87aec87425c..b3e4a94ae9002c 100644 --- a/srcpkgs/libArcus/template +++ b/srcpkgs/libArcus/template @@ -1,7 +1,7 @@ # Template file for 'libArcus' pkgname=libArcus -version=4.13.1 -revision=2 +version=5.1.0 +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=51e865cb648750ad9ea315fa7632ee7016890273f911270f60d28c8a4bc50240 +checksum=62b6a594ec274cf5a4b3cf0a94a207439ac17639642d99c9fde85799036f2df5 libArcus-devel_package() { depends="${sourcepkg}>=${version}_${revision}" From dc0a82cf945aede4c5762cd2dec4606fc89dae2b Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Fri, 20 May 2022 21:11:04 -0400 Subject: [PATCH 3/8] Uranium: update to 5.1.0. --- srcpkgs/Uranium/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Uranium/template b/srcpkgs/Uranium/template index eb4bcf6670ee88..98b7f4a86f3d1f 100644 --- a/srcpkgs/Uranium/template +++ b/srcpkgs/Uranium/template @@ -1,6 +1,6 @@ # Template file for 'Uranium' pkgname=Uranium -version=4.13.1 +version=5.1.0 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=185db9e6353a4f44b69287ed5f6314d28f10a0dd43790485275d6db5b5907a41 +checksum=1885d98bc230d5178debe9f64ece4b3af7db45a08650db019395654d6243eaa8 post_install() { vmkdir usr/share/uranium/cmake From c5a432d33c630db70d96ef726c11c0c73573944d Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Fri, 20 May 2022 21:11:10 -0400 Subject: [PATCH 4/8] cura-engine: update to 5.1.0. --- 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 f5c611d2c5fe77..3ca3b667338c7b 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.13.1 -revision=2 +version=5.1.0 +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=283f62326c6072cdcef9d9b84cb8141a6072747f08e1cae6534d08ad85b1c657 +checksum=f6e3638f8d056ba29150c4515e61334c77f8e35042c43acb08f60a72ff75b329 post_install() { vlicense LICENSE From 791245b99962e1cc95f15dde87c1bf953383ca00 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Fri, 20 May 2022 21:11:15 -0400 Subject: [PATCH 5/8] libSavitar: update to 5.1.0. --- srcpkgs/libSavitar/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libSavitar/template b/srcpkgs/libSavitar/template index eaffe92be8ce2b..dc97ff10f875f5 100644 --- a/srcpkgs/libSavitar/template +++ b/srcpkgs/libSavitar/template @@ -1,6 +1,6 @@ # Template file for 'libSavitar' pkgname=libSavitar -version=4.13.1 +version=5.1.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=0bd50f54d557bed70f2c8420405c690b819b287156e81e10b6f51651cebce2e9 +checksum=462b1fd22ba06b09f2a5522ae100b224a3617ff53f0756e7ee99afa63774b7eb if [ "$CROSS_BUILD" ]; then hostmakedepends+=" python3-sip-devel" From 2a26eda1a66f1acb31677131de145a3fdfcb11be Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Fri, 20 May 2022 21:11:18 -0400 Subject: [PATCH 6/8] libCharon: update to 5.0.0. --- srcpkgs/libCharon/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libCharon/template b/srcpkgs/libCharon/template index b33e995d9dbea0..0df6701807b26d 100644 --- a/srcpkgs/libCharon/template +++ b/srcpkgs/libCharon/template @@ -1,6 +1,6 @@ # Template file for 'libCharon' pkgname=libCharon -version=4.13.0 +version=5.0.0 revision=1 build_style=cmake configure_args="INSTALL_SERVICE=OFF" @@ -11,4 +11,4 @@ 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 +checksum=7b58b921c6fd78329badc83de4b9987c058d048b6a450313be23756415372fbf From 328a8f082cb64dfe162df01c0d592cad610b7f49 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Fri, 20 May 2022 21:12:20 -0400 Subject: [PATCH 7/8] python3-pynest2d: update to 5.1.0. --- srcpkgs/python3-pynest2d/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/python3-pynest2d/template b/srcpkgs/python3-pynest2d/template index 3997bdb0ec4a35..3bd85d69c4095b 100644 --- a/srcpkgs/python3-pynest2d/template +++ b/srcpkgs/python3-pynest2d/template @@ -1,6 +1,6 @@ # Template file for 'python3-pynest2d' pkgname=python3-pynest2d -version=4.12.1 +version=5.1.0 revision=1 wrksrc="pynest2d-${version}" build_style=cmake @@ -14,4 +14,4 @@ maintainer="Karl Nilsson " license="LGPL-3.0-or-later" homepage="https://github.com/Ultimaker/pynest2d" distfiles="https://github.com/Ultimaker/pynest2d/archive/${version}.tar.gz" -checksum=d6cd634f0a9ea81c86e5fe1579cd7db8ce293171eb430e6a08d3d5b6523083f5 +checksum=b21033ad2311f48aad08d76fe42fe83709c82fb943b96df300d26a2272fbdb30 From a3b43c374d6361ef9f11db888a44dbb642b2e0d2 Mon Sep 17 00:00:00 2001 From: Karl Nilsson Date: Thu, 21 Apr 2022 12:10:32 -0400 Subject: [PATCH 8/8] cura: update to 5.1.0. --- srcpkgs/cura/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/cura/template b/srcpkgs/cura/template index 8e0cc09ab8d32b..5aba18b2590194 100644 --- a/srcpkgs/cura/template +++ b/srcpkgs/cura/template @@ -1,6 +1,6 @@ # Template file for 'cura' pkgname=cura -version=4.13.1 +version=5.1.0 revision=1 wrksrc="Cura-${version}" build_style=cmake @@ -18,4 +18,4 @@ 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=bda67f620a6245d0ddfbf6df7c2dcfdec88be152dfb7290ae06d8dcb35c4459c +checksum=a127be6330f766b6cf21104cc431412e6da62acd8a24143cd165ee09f1795255