Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libSavitar for openSUSE:Factory checked in at 2022-01-31 22:56:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libSavitar (Old) and /work/SRC/openSUSE:Factory/.libSavitar.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libSavitar" Mon Jan 31 22:56:41 2022 rev:11 rq:949660 version:4.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libSavitar/libSavitar.changes 2021-04-29 22:52:49.110049950 +0200 +++ /work/SRC/openSUSE:Factory/.libSavitar.new.1898/libSavitar.changes 2022-01-31 22:56:44.077818828 +0100 @@ -1,0 +2,9 @@ +Thu Jan 27 13:43:34 UTC 2022 - Guillaume GARDET <guillaume.gar...@opensuse.org> + +- update to 4.13.0 + Release notes: + * https://github.com/Ultimaker/Cura/releases/tag/4.13.0 +- Drop upstreamed patch: + * libSavitar-3.5.1-PyQt5.sip.patch + +------------------------------------------------------------------- Old: ---- libSavitar-3.5.1-PyQt5.sip.patch libSavitar-4.9.0.tar.gz New: ---- libSavitar-4.13.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libSavitar.spec ++++++ --- /var/tmp/diff_new_pack.ESNuJY/_old 2022-01-31 22:56:44.625815138 +0100 +++ /var/tmp/diff_new_pack.ESNuJY/_new 2022-01-31 22:56:44.629815112 +0100 @@ -1,7 +1,7 @@ # # spec file for package libSavitar # -# 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 0 Name: libSavitar -%define sversion 4.9 -Version: 4.9.0 +%define sversion 4.13.0 +Version: 4.13.0 Release: 0 Summary: C++ implementation of 3mf loading with SIP python bindings License: LGPL-3.0-only @@ -28,8 +28,6 @@ Source: https://github.com/Ultimaker/libSavitar/archive/%{sversion}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE -- Use system libraries instead of embedded ones. Patch0: use-system-libs.patch -# PATCH-FIX-OPENSUSE - use Qt5 sip import name, taken from Fedora -Patch1: libSavitar-3.5.1-PyQt5.sip.patch BuildRequires: cmake >= 2.8.12 BuildRequires: gmock BuildRequires: gtest ++++++ libSavitar-4.9.0.tar.gz -> libSavitar-4.13.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libSavitar-4.9/CMakeLists.txt new/libSavitar-4.13.0/CMakeLists.txt --- old/libSavitar-4.9/CMakeLists.txt 2021-03-02 11:33:23.000000000 +0100 +++ new/libSavitar-4.13.0/CMakeLists.txt 2021-11-05 16:21:07.000000000 +0100 @@ -1,5 +1,5 @@ project(savitar) -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.8) include(GNUInstallDirs) include(CMakePackageConfigHelpers) @@ -20,10 +20,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) @@ -33,7 +41,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++") @@ -85,7 +93,7 @@ if(BUILD_PYTHON) set(SIP_EXTRA_FILES_DEPEND python/Types.sip python/MeshData.sip python/SceneNode.sip python/Scene.sip) #set(SIP_EXTRA_SOURCE_FILES python/Types.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(Savitar python/ThreeMFParser.sip Savitar) endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libSavitar-4.9/docker/build.sh new/libSavitar-4.13.0/docker/build.sh --- old/libSavitar-4.9/docker/build.sh 2021-03-02 11:33:23.000000000 +0100 +++ new/libSavitar-4.13.0/docker/build.sh 2021-11-05 16:21:07.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}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libSavitar-4.9/src/ThreeMFParser.cpp new/libSavitar-4.13.0/src/ThreeMFParser.cpp --- old/libSavitar-4.9/src/ThreeMFParser.cpp 2021-03-02 11:33:23.000000000 +0100 +++ new/libSavitar-4.13.0/src/ThreeMFParser.cpp 2021-11-05 16:21:07.000000000 +0100 @@ -115,7 +115,7 @@ } if(scene_node->getMeshNode() != nullptr) { - if(object.child("metadatagroup")) + if(!object.child("metadatagroup")) { object.append_child("metadatagroup"); }
