diff --git a/srcpkgs/libArcus-devel b/srcpkgs/libArcus-devel deleted file mode 120000 index 9ceef3bc1c0..00000000000 --- a/srcpkgs/libArcus-devel +++ /dev/null @@ -1 +0,0 @@ -libArcus \ No newline at end of file diff --git a/srcpkgs/libArcus-python3 b/srcpkgs/libArcus-python3 deleted file mode 120000 index 9ceef3bc1c0..00000000000 --- a/srcpkgs/libArcus-python3 +++ /dev/null @@ -1 +0,0 @@ -libArcus \ No newline at end of file diff --git a/srcpkgs/libArcus/patches/protobuf.patch b/srcpkgs/libArcus/patches/protobuf.patch deleted file mode 100644 index e138558cf2b..00000000000 --- 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 deleted file mode 100644 index 343eef52730..00000000000 --- a/srcpkgs/libArcus/template +++ /dev/null @@ -1,33 +0,0 @@ -# Template file for 'libArcus' -pkgname=libArcus -version=4.13.1 -revision=8 -build_style=cmake -configure_args="-DBUILD_EXAMPLES=OFF" -hostmakedepends="protobuf python3-sip-devel python3-setuptools" -makedepends="protobuf-devel libprotoc-devel python3-devel python3-sip-devel" -depends="python3-sip" -short_desc="Communication library for Ultimaker software components" -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 - -libArcus-devel_package() { - depends="${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/cmake - vmove "usr/lib/*.so" - } -} - -libArcus-python3_package() { - lib32disabled=yes - short_desc+=" - Python3 bindings" - pkg_install() { - vmove "usr/lib/python3*" - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index dd84cc149fb..868b14e836f 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -339,6 +339,9 @@ replaces=" ladish-devel<=1_11 ladish<=1_11 laditools<=1.1.0_3 + libArcus<=4.13.1_8 + libArcus-devel<=4.13.1_8 + libArcus-python3<=4.13.1_8 libXevie<=1.0.3_8 libXfontcache<=1.0.5_2 libXxf86misc<=1.0.4_1