From 1e925633b686b7a2be039170b9cacea39ef69298 Mon Sep 17 00:00:00 2001 From: Gabriel Féron Date: Aug 16 2021 10:18:22 +0000 Subject: Update to 4.10.0 --- diff --git a/libArcus-3.10.0-PyQt5.sip.patch b/libArcus-3.10.0-PyQt5.sip.patch new file mode 100644 index 0000000..3474500 --- /dev/null +++ b/libArcus-3.10.0-PyQt5.sip.patch @@ -0,0 +1,12 @@ +diff -up libArcus-4.10.0/cmake/FindSIP.cmake.sip libArcus-4.10.0/cmake/FindSIP.cmake +--- libArcus-4.10.0/cmake/FindSIP.cmake.sip ++++ libArcus-4.10.0/cmake/FindSIP.cmake +@@ -70,7 +70,7 @@ find_path(SIP_INCLUDE_DIRS sip.h + ) + + execute_process( +- COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)" ++ COMMAND ${Python3_EXECUTABLE} -c "import PyQt5.sip; print(PyQt5.sip.SIP_VERSION_STR)" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/libArcus-3.5.1-PyQt5.sip.patch b/libArcus-3.5.1-PyQt5.sip.patch deleted file mode 100644 index 6f2cb24..0000000 --- a/libArcus-3.5.1-PyQt5.sip.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up libArcus-4.1.0/cmake/FindSIP.cmake.sip libArcus-4.1.0/cmake/FindSIP.cmake ---- libArcus-4.1.0/cmake/FindSIP.cmake.sip 2019-04-10 02:00:57.000000000 -0500 -+++ libArcus-4.1.0/cmake/FindSIP.cmake 2019-09-16 10:55:35.906667181 -0500 -@@ -64,7 +64,7 @@ find_path(SIP_INCLUDE_DIRS sip.h - ) - - execute_process( -- COMMAND ${Python3_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)" -+ COMMAND ${Python3_EXECUTABLE} -c "import PyQt5.sip; print(PyQt5.sip.SIP_VERSION_STR)" - RESULT_VARIABLE _process_status - OUTPUT_VARIABLE _process_output - OUTPUT_STRIP_TRAILING_WHITESPACE -diff -up libArcus-4.1.0/CMakeLists.txt.sip libArcus-4.1.0/CMakeLists.txt ---- libArcus-4.1.0/CMakeLists.txt.sip 2019-04-10 02:00:57.000000000 -0500 -+++ libArcus-4.1.0/CMakeLists.txt 2019-09-16 10:53:36.334104707 -0500 -@@ -93,7 +93,7 @@ endif() - 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.spec b/libarcus.spec index 5a7dd60..d309ddb 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,13 +1,13 @@ Name: libarcus -Version: 4.9.1 -Release: 2%{?dist} +Version: 4.10.0 +Release: 1%{?dist} Summary: Communication library between internal components for Ultimaker software License: LGPLv3+ URL: https://github.com/Ultimaker/libArcus Source0: %{url}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz # https://bugzilla.redhat.com/show_bug.cgi?id=1601917 -Patch1: libArcus-3.5.1-PyQt5.sip.patch +Patch1: libArcus-3.10.0-PyQt5.sip.patch BuildRequires: protobuf-devel BuildRequires: python3-devel @@ -89,6 +89,9 @@ sed -i 's/Python3_SITELIB/Python3_SITEARCH/' cmake/SIPMacros.cmake %{python3_sitearch}/Arcus.so %changelog +* Mon Aug 16 2021 Gabriel Féron - 4.10.0-1 +- Update to 4.10.0 + * Thu Jul 22 2021 Fedora Release Engineering - 4.9.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 0a5e956..d8675a7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-4.9.1.tar.gz) = 5124b80647cb0715ad94c5eaaeac797a867319de9a8064b689783fdb28598903a69e3a61393db90f5e0b3d10ee30aed844170cab63dc4b7c70509d5129a17cdd +SHA512 (libarcus-4.10.0.tar.gz) = 452c541360d74a8f58ab1b20df59efd36756812a9ecd09804ba16877956fb240d367bd968271a9c010496598ef0b459f62aa287553d4ba3fdb4cd2742c25553f