Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libArcus for openSUSE:Factory checked in at 2022-01-31 22:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libArcus (Old) and /work/SRC/openSUSE:Factory/.libArcus.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libArcus" Mon Jan 31 22:56:42 2022 rev:16 rq:949970 version:4.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libArcus/libArcus.changes 2021-04-29 22:52:48.430052978 +0200 +++ /work/SRC/openSUSE:Factory/.libArcus.new.1898/libArcus.changes 2022-01-31 22:56:45.721807759 +0100 @@ -1,0 +2,15 @@ +Sun Jan 30 08:43:54 UTC 2022 - Stefan Br??ns <stefan.bru...@rwth-aachen.de> + +- Fix build with protobuf >= 3.18, add + 0001-Use-single-parameter-SetTotalBytesLimit-fix-protobuf.patch + +------------------------------------------------------------------- +Fri Jan 14 13:59:54 UTC 2022 - Paolo Stivanin <i...@paolostivanin.com> + +- update to 4.13.0 + Release notes: + * https://github.com/Ultimaker/Cura/releases/tag/4.13.0 +- Delete 0001-Fix-build-with-Python-3.8-and-no-undefined-linker-flags.patch +- Refresh libArcus-3.5.1-PyQt5.sip.patch + +------------------------------------------------------------------- Old: ---- 0001-Fix-build-with-Python-3.8-and-no-undefined-linker-flags.patch libArcus-4.9.0.tar.gz New: ---- 0001-Use-single-parameter-SetTotalBytesLimit-fix-protobuf.patch libArcus-4.13.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libArcus.spec ++++++ --- /var/tmp/diff_new_pack.r61bmP/_old 2022-01-31 22:56:46.245804231 +0100 +++ /var/tmp/diff_new_pack.r61bmP/_new 2022-01-31 22:56:46.253804177 +0100 @@ -1,7 +1,7 @@ # # spec file for package libArcus # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,8 +18,8 @@ %define sover 3 Name: libArcus -%define sversion 4.9 -Version: 4.9.0 +%define sversion 4.13 +Version: 4.13.0 Release: 0 Summary: 3D printer control software License: LGPL-3.0-only @@ -28,8 +28,8 @@ Source: https://github.com/Ultimaker/libArcus/archive/%{sversion}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE - use Qt5 sip import name, taken from Fedora Patch0: libArcus-3.5.1-PyQt5.sip.patch -# PATCH-FIX-UPSTREAM - https://github.com/Ultimaker/libArcus/pull/113 -Patch1: 0001-Fix-build-with-Python-3.8-and-no-undefined-linker-flags.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Use-single-parameter-SetTotalBytesLimit-fix-protobuf.patch BuildRequires: cmake >= 3.6 BuildRequires: gcc-c++ BuildRequires: protobuf-devel >= 3.0.0 ++++++ 0001-Use-single-parameter-SetTotalBytesLimit-fix-protobuf.patch ++++++ >From f7b29dae1d0969d2104da684ac8fdf25ed9cb8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Sun, 30 Jan 2022 09:29:25 +0100 Subject: [PATCH] Use single-parameter SetTotalBytesLimit, fix protobuf 3.18 build Since protobuf 3.6.0 the warning parameter has been ineffective and the corresponding method signature been deprecated. It was removed for protobuf 3.18. For details, see https://github.com/protocolbuffers/protobuf/blob/v3.6.0/src/google/protobuf/io/coded_stream.h#L387 --- CMakeLists.txt | 2 +- src/Socket_p.h | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a699a72..69bf39c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ endif() # However, if ProtobufConfig is used instead, there is a CMake option that controls # this, which defaults to OFF. We need to force this option to ON instead. set(protobuf_MODULE_COMPATIBLE ON CACHE INTERNAL "" FORCE) -find_package(Protobuf 3.0.0 REQUIRED) +find_package(Protobuf 3.6.0 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) #Required if a patch to libArcus needs to be made via templates. diff --git a/src/Socket_p.h b/src/Socket_p.h index 9c3c084..dea32f5 100644 --- a/src/Socket_p.h +++ b/src/Socket_p.h @@ -128,9 +128,6 @@ namespace Arcus 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; @@ -548,7 +545,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)); -- 2.34.1 ++++++ libArcus-3.5.1-PyQt5.sip.patch ++++++ --- /var/tmp/diff_new_pack.r61bmP/_old 2022-01-31 22:56:46.293803907 +0100 +++ /var/tmp/diff_new_pack.r61bmP/_new 2022-01-31 22:56:46.297803881 +0100 @@ -1,25 +1,12 @@ -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 +--- libArcus-4.13/cmake/FindSIP.cmake.orig 2022-01-14 14:57:37.563246117 +0100 ++++ libArcus-4.13/cmake/FindSIP.cmake 2022-01-14 14:58:20.795439183 +0100 +@@ -72,7 +72,7 @@ ) - + 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() - ++++++ libArcus-4.9.0.tar.gz -> libArcus-4.13.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.9/.github/workflows/cicd-mingw64.yml new/libArcus-4.13/.github/workflows/cicd-mingw64.yml --- old/libArcus-4.9/.github/workflows/cicd-mingw64.yml 2020-10-16 13:53:08.000000000 +0200 +++ new/libArcus-4.13/.github/workflows/cicd-mingw64.yml 2021-11-26 16:37:16.000000000 +0100 @@ -1,6 +1,12 @@ --- name: CI/CD for mingw64 debian package -on: [push, pull_request] +on: + push: + branches: + - master + pull_request: + branches: + - master jobs: build: name: Build debian package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.9/CMakeLists.txt new/libArcus-4.13/CMakeLists.txt --- old/libArcus-4.9/CMakeLists.txt 2020-10-16 13:53:08.000000000 +0200 +++ new/libArcus-4.13/CMakeLists.txt 2021-11-26 16:37:16.000000000 +0100 @@ -1,5 +1,5 @@ project(arcus) -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.8) include(GNUInstallDirs) include(CMakePackageConfigHelpers) @@ -24,10 +24,18 @@ if(BUILD_PYTHON) list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - # FIXME: Use FindPython3 to find Python, new in CMake 3.12. - # However currently on our CI server it finds the wrong Python version and then doesn't find the headers. - find_package(PythonInterp 3.4 REQUIRED) - find_package(PythonLibs 3.4 REQUIRED) + # FIXME: Remove the code for CMake <3.12 once we have switched over completely. + # FindPython3 is a new module since CMake 3.12. It deprecates FindPythonInterp and FindPythonLibs. + if(${CMAKE_VERSION} VERSION_LESS 3.12) + # FIXME: Use FindPython3 to find Python, new in CMake 3.12. + # However currently on our CI server it finds the wrong Python version and then doesn't find the headers. + find_package(PythonInterp 3.4 REQUIRED) + find_package(PythonLibs 3.4 REQUIRED) + + else() + # Use FindPython3 for CMake >=3.12 + find_package(Python3 3.4 REQUIRED COMPONENTS Interpreter Development) + endif() find_package(SIP REQUIRED) if(NOT DEFINED LIB_SUFFIX) @@ -37,7 +45,7 @@ include_directories(python/ src/ ${SIP_INCLUDE_DIRS} ${Python3_INCLUDE_DIRS}) endif() -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) if(APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") @@ -88,7 +96,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. -n PyQt5.sip is required to not get the PyCapsule error add_sip_python_module(Arcus python/Socket.sip Arcus) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.9/README.md new/libArcus-4.13/README.md --- old/libArcus-4.9/README.md 2020-10-16 13:53:08.000000000 +0200 +++ new/libArcus-4.13/README.md 2021-11-26 16:37:16.000000000 +0100 @@ -19,7 +19,7 @@ On Ubuntu 20.04 this can be achieved with: ``` -sudo apt install build-essentials cmake python3-dev python3-sip-dev protobuf-compiler libprotoc-dev libprotobuf-dev +sudo apt install build-essential cmake python3-dev python3-sip-dev protobuf-compiler libprotoc-dev libprotobuf-dev ``` Building the library can be done with: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.9/cmake/SIPMacros.cmake new/libArcus-4.13/cmake/SIPMacros.cmake --- old/libArcus-4.9/cmake/SIPMacros.cmake 2020-10-16 13:53:08.000000000 +0200 +++ new/libArcus-4.13/cmake/SIPMacros.cmake 2021-11-26 16:37:16.000000000 +0100 @@ -105,12 +105,7 @@ COMMAND ${SIP_EXECUTABLE} ${_sip_tags} ${_sip_x} ${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 - IF (CYGWIN OR APPLE) - ADD_LIBRARY(${_logical_name} MODULE ${_sip_output_files} ${SIP_EXTRA_SOURCE_FILES}) - ELSE (CYGWIN OR APPLE) - ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} ${SIP_EXTRA_SOURCE_FILES}) - ENDIF (CYGWIN OR APPLE) + ADD_LIBRARY(${_logical_name} MODULE ${_sip_output_files} ${SIP_EXTRA_SOURCE_FILES}) IF (NOT APPLE) IF ("${Python3_VERSION_MINOR}" GREATER 7) MESSAGE(STATUS "Python > 3.7 - not linking to libpython") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.9/docker/build.sh new/libArcus-4.13/docker/build.sh --- old/libArcus-4.9/docker/build.sh 2020-10-16 13:53:08.000000000 +0200 +++ new/libArcus-4.13/docker/build.sh 2021-11-26 16:37:16.000000000 +0100 @@ -6,7 +6,7 @@ PROJECT_DIR="$( cd "${SCRIPT_DIR}/.." && pwd )" # Make sure that environment variables are set properly -source /opt/rh/devtoolset-7/enable +source /opt/rh/devtoolset-8/enable export PATH="${CURA_BUILD_ENV_PATH}/bin:${PATH}" export PKG_CONFIG_PATH="${CURA_BUILD_ENV_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}"
