From ef2514a5db119d958228d2eb27fd9c799dfb1e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 12 Nov 2018 10:27:01 +0100 Subject: [PATCH] Update to 3.5.1 (#1644323) --- .gitignore | 1 + libArcus-3.4.1-sip_flags.patch | 66 ---------------------------------- libarcus.spec | 16 ++++----- sources | 2 +- 4 files changed, 9 insertions(+), 76 deletions(-) delete mode 100644 libArcus-3.4.1-sip_flags.patch diff --git a/.gitignore b/.gitignore index b49081e..5e5dc43 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /libarcus-3.2.1.tar.gz /libarcus-3.3.0.tar.gz /libarcus-3.4.1.tar.gz +/libarcus-3.5.1.tar.gz diff --git a/libArcus-3.4.1-sip_flags.patch b/libArcus-3.4.1-sip_flags.patch deleted file mode 100644 index 9c39e54..0000000 --- a/libArcus-3.4.1-sip_flags.patch +++ /dev/null @@ -1,66 +0,0 @@ -diff -up libArcus-3.4.1/cmake/FindSIP.cmake.sip_flags libArcus-3.4.1/cmake/FindSIP.cmake ---- libArcus-3.4.1/cmake/FindSIP.cmake.sip_flags 2017-10-28 17:28:39.000000000 -0500 -+++ libArcus-3.4.1/cmake/FindSIP.cmake 2018-08-28 11:04:13.654862074 -0500 -@@ -17,6 +17,8 @@ - # - # SIP_INCLUDE_DIR - Directory holding the SIP C++ header file. - # -+# SIP_FLAGS - PYQT_CONFIGURATION["sip_flags"] content -+# - # SIP_DEFAULT_SIP_DIR - Default directory where .sip files should be installed - # into. - -@@ -50,6 +52,7 @@ ELSE(SIP_VERSION) - STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_BINARY_PATH ${sip_config}) - STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) - STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) -+ STRING(REGEX REPLACE ".*\nsip_flags:([^\n]+).*$" "\\1" SIP_FLAGS ${sip_config}) - SET(SIP_FOUND TRUE) - ENDIF(sip_config_returncode EQUAL 0) - -diff -up libArcus-3.4.1/cmake/FindSIP.py.sip_flags libArcus-3.4.1/cmake/FindSIP.py ---- libArcus-3.4.1/cmake/FindSIP.py.sip_flags 2017-10-28 17:28:39.000000000 -0500 -+++ libArcus-3.4.1/cmake/FindSIP.py 2018-08-28 11:01:26.165708149 -0500 -@@ -54,9 +54,13 @@ except ImportError: - except ImportError: - fail("Unable to import sipconfig and determine your sip configuration.") - -+from PyQt5.Qt import PYQT_CONFIGURATION -+sip_flags = PYQT_CONFIGURATION["sip_flags"] -+ - print("sip_version:%06.0x" % sip_version) - print("sip_version_num:%d" % sip_version) - print("sip_version_str:%s" % sip_version_str) - print("sip_bin:%s" % sip_bin) - print("default_sip_dir:%s" % default_sip_dir) - print("sip_inc_dir:%s" % sip_inc_dir) -+print("sip_flags:%s" % sip_flags) -diff -up libArcus-3.4.1/cmake/SIPMacros.cmake.sip_flags libArcus-3.4.1/cmake/SIPMacros.cmake ---- libArcus-3.4.1/cmake/SIPMacros.cmake.sip_flags 2017-10-28 17:28:39.000000000 -0500 -+++ libArcus-3.4.1/cmake/SIPMacros.cmake 2018-08-28 11:06:51.802890122 -0500 -@@ -34,12 +34,16 @@ - # - # SIP_EXTRA_OPTIONS - Extra command line options which should be passed on to - # SIP. -+# -+# SIP_FLAGS - PYQT_CONFIGURATION["sip_flags"] content -+# - - SET(SIP_INCLUDES) - SET(SIP_TAGS) - SET(SIP_CONCAT_PARTS 8) - SET(SIP_DISABLE_FEATURES) - SET(SIP_EXTRA_OPTIONS) -+# - - MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) - -@@ -102,7 +106,7 @@ MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME - OUTPUT ${_sip_output_files} - COMMAND ${CMAKE_COMMAND} -E echo ${message} - COMMAND ${CMAKE_COMMAND} -E touch ${_sip_output_files} -- COMMAND ${SIP_BINARY_PATH} ${_sip_tags} ${_sip_x} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip} -+ COMMAND ${SIP_BINARY_PATH} ${_sip_tags} ${_sip_x} ${SIP_FLAGS} ${SIP_EXTRA_OPTIONS} -j ${SIP_CONCAT_PARTS} -c ${CMAKE_CURRENT_BINARY_DIR}/${_module_path} ${_sip_includes} ${_abs_module_sip} - DEPENDS ${_abs_module_sip} ${SIP_EXTRA_FILES_DEPEND} - ) - # not sure if type MODULE could be uses anywhere, limit to cygwin for now diff --git a/libarcus.spec b/libarcus.spec index 8961207..a7a19fa 100644 --- a/libarcus.spec +++ b/libarcus.spec @@ -1,25 +1,19 @@ Name: libarcus -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.5.1 +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.4.1-sip_flags.patch - - BuildRequires: protobuf-devel BuildRequires: python3-devel BuildRequires: python3-protobuf BuildRequires: python3-sip-devel -# patch1 introduces additional dependency -BuildRequires: python3-qt5-base BuildRequires: /usr/bin/sip BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: git +BuildRequires: git-core %description Arcus library contains C++ code and Python 3 bindings for creating a socket in @@ -45,6 +39,7 @@ Development files. %package -n python3-arcus Summary: Python 3 libArcus bindings +Requires: python3-sip %{?python_provide:%python_provide python3-arcus} %description -n python3-arcus @@ -83,6 +78,9 @@ make install DESTDIR=%{buildroot} %{python3_sitearch}/Arcus.so %changelog +* Mon Nov 12 2018 Miro Hrončok - 3.5.1-1 +- Update to 3.5.1 (#1644323) + * Tue Aug 28 2018 Rex Dieter - 3.4.1-2 - use more robust upstreamable sip_flags.patch (#1601917) diff --git a/sources b/sources index 99e7a47..762448b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libarcus-3.4.1.tar.gz) = 63ed8d8da389641b91ed955624c04ca5488f98d3ef409c4a94ad1962155d6aedd8d61ca0231543cfe4e92ae10beb00001f957eb48f74b0c21447a1bd9b66d85d +SHA512 (libarcus-3.5.1.tar.gz) = a3cf8599aee83aa080d23849c2c9760e1342fd738db58f4e4bb974a9c3f3dfa34dab1fead6292aa6e27ad9a659fda7b92f031c141039bc3118df8f97cc4b8712