[packages/libArcus] - updated to 4.13.2, added fix for protobuf 3.11+

qboosh qboosh at pld-linux.org
Fri Sep 27 21:13:05 CEST 2024


commit 57ddd27d1881a66b86287880076a0b65fe84c3f9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Sep 27 21:16:00 2024 +0200

    - updated to 4.13.2, added fix for protobuf 3.11+

 PyQt5-sip.patch         | 11 -----------
 libArcus-protobuf.patch | 11 +++++++++++
 libArcus.spec           | 17 +++++++++--------
 3 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/libArcus.spec b/libArcus.spec
index 141f6e0..5aea26a 100644
--- a/libArcus.spec
+++ b/libArcus.spec
@@ -1,19 +1,20 @@
 Summary:	Communication library between internal components for Ultimaker software
 Summary(pl.UTF-8):	Biblioteka komunikacji między wewnętrznymi komponentami oprogramowania Ultimaker
 Name:		libArcus
-Version:	4.5.0
-Release:	9
+# keep in sync with CuraEngine, cura, libSavitar, python3-Uranium
+Version:	4.13.2
+Release:	1
 License:	AGPL v3+
 Group:		Libraries
-#Source0Download: https://github.com/Ultimaker/libArcus/releases
+#Source0Download: https://github.com/Ultimaker/libArcus/tags
 Source0:	https://github.com/Ultimaker/libArcus/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	2966fc6e19f0ace9803cc90754a5f0fd
-Patch0:		PyQt5-sip.patch
+# Source0-md5:	a946cea7e2ca1de0f3f3c5d634220829
+Patch0:		%{name}-protobuf.patch
 URL:		https://github.com/Ultimaker/libArcus
-BuildRequires:	cmake >= 2.8.12
-BuildRequires:	libstdc++-devel >= 6:4.7
+BuildRequires:	cmake >= 3.8
+BuildRequires:	libstdc++-devel >= 6:7
 BuildRequires:	protobuf-devel >= 3.0.0
-BuildRequires:	python3-devel >= 1:3.2
+BuildRequires:	python3-devel >= 1:3.4
 BuildRequires:	python3-sip-devel
 BuildRequires:	sip
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/PyQt5-sip.patch b/PyQt5-sip.patch
deleted file mode 100644
index ccfd1bf..0000000
--- a/PyQt5-sip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libArcus-3.5.1/CMakeLists.txt~	2018-06-29 09:39:16.000000000 +0200
-+++ libArcus-3.5.1/CMakeLists.txt	2018-11-04 12:51:51.067737106 +0100
-@@ -90,7 +90,7 @@
- if(BUILD_PYTHON)
-     set(SIP_EXTRA_FILES_DEPEND python/SocketListener.sip python/Types.sip python/PythonMessage.sip python/Error.sip)
-     set(SIP_EXTRA_SOURCE_FILES python/PythonMessage.cpp)
--    set(SIP_EXTRA_OPTIONS -g) # -g means always release the GIL before calling C++ methods.
-+    set(SIP_EXTRA_OPTIONS -g -n PyQt5.sip) # -g means always release the GIL before calling C++ methods.
-     add_sip_python_module(Arcus python/Socket.sip Arcus)
- endif()
- 
diff --git a/libArcus-protobuf.patch b/libArcus-protobuf.patch
new file mode 100644
index 0000000..43ea5fe
--- /dev/null
+++ b/libArcus-protobuf.patch
@@ -0,0 +1,11 @@
+--- libArcus-4.13.0/src/Socket_p.h.orig	2021-11-26 16:37:16.000000000 +0100
++++ libArcus-4.13.0/src/Socket_p.h	2024-09-26 20:47:17.810182760 +0200
+@@ -548,7 +548,7 @@ namespace Arcus
+ 
+         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));
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libArcus.git/commitdiff/57ddd27d1881a66b86287880076a0b65fe84c3f9



More information about the pld-cvs-commit mailing list