Hello community, here is the log from the commit of package libArcus for openSUSE:Factory checked in at 2018-10-25 08:12:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libArcus (Old) and /work/SRC/openSUSE:Factory/.libArcus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libArcus" Thu Oct 25 08:12:18 2018 rev:3 rq:642556 version:3.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libArcus/libArcus.changes 2018-07-28 12:44:08.820853080 +0200 +++ /work/SRC/openSUSE:Factory/.libArcus.new/libArcus.changes 2018-10-25 08:12:42.500173633 +0200 @@ -1,0 +2,6 @@ +Wed Oct 17 07:06:35 UTC 2018 - Adrian Schröter <[email protected]> + +- version update to 3.5.1 + * version change only + +------------------------------------------------------------------- Old: ---- libArcus-3.4.1.obscpio New: ---- libArcus-3.5.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libArcus.spec ++++++ --- /var/tmp/diff_new_pack.qQAlCP/_old 2018-10-25 08:12:43.088173248 +0200 +++ /var/tmp/diff_new_pack.qQAlCP/_new 2018-10-25 08:12:43.088173248 +0200 @@ -12,13 +12,13 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define sover 3 Name: libArcus -Version: 3.4.1 +Version: 3.5.1 Release: 0 Summary: 3D printer control software License: LGPL-3.0-only ++++++ _service ++++++ --- /var/tmp/diff_new_pack.qQAlCP/_old 2018-10-25 08:12:43.116173229 +0200 +++ /var/tmp/diff_new_pack.qQAlCP/_new 2018-10-25 08:12:43.116173229 +0200 @@ -2,8 +2,8 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/Ultimaker/libArcus</param> <param name="scm">git</param> - <param name="revision">3.4.1</param> - <param name="version">3.4.1</param> + <param name="revision">3.5.1</param> + <param name="version">3.5.1</param> <param name="submodules">disable</param> </service> <service mode="disabled" name="set_version" /> ++++++ libArcus-3.4.1.obscpio -> libArcus-3.5.1.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-3.4.1/CMakeLists.txt new/libArcus-3.5.1/CMakeLists.txt --- old/libArcus-3.4.1/CMakeLists.txt 2017-10-29 00:28:39.000000000 +0200 +++ new/libArcus-3.5.1/CMakeLists.txt 2018-06-29 09:39:16.000000000 +0200 @@ -8,7 +8,9 @@ option(BUILD_EXAMPLES "Build the example programs" ON) option(BUILD_STATIC "Build as a static library" OFF) -option(MSVC_STATIC_RUNTIME "Link the MSVC runtime statically" OFF) +if(WIN32) + option(MSVC_STATIC_RUNTIME "Link the MSVC runtime statically" OFF) +endif() # We want to have access to protobuf_generate_cpp and other FindProtobuf features. # However, if ProtobufConfig is used instead, there is a CMake option that controls @@ -63,7 +65,7 @@ set(ARCUS_VERSION 1.1.0) set(ARCUS_SOVERSION 3) -set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") +set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") if(BUILD_STATIC) add_library(Arcus STATIC ${arcus_SRCS}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-3.4.1/cmake/FindSIP.cmake new/libArcus-3.5.1/cmake/FindSIP.cmake --- old/libArcus-3.4.1/cmake/FindSIP.cmake 2017-10-29 00:28:39.000000000 +0200 +++ new/libArcus-3.5.1/cmake/FindSIP.cmake 2018-06-29 09:39:16.000000000 +0200 @@ -8,17 +8,12 @@ # # This file defines the following variables: # -# SIP_VERSION - The version of SIP found expressed as a 6 digit hex number -# suitable for comparision as a string. -# # SIP_VERSION_STR - The version of SIP found as a human readable string. # # SIP_BINARY_PATH - Path and filename of the SIP command line executable. # # SIP_INCLUDE_DIR - Directory holding the SIP C++ header file. # -# SIP_DEFAULT_SIP_DIR - Default directory where .sip files should be installed -# into. # Copyright (c) 2007, Simon Edwards <[email protected]> # Redistribution and use is allowed according to the terms of the BSD license. @@ -32,38 +27,33 @@ find_package(PythonInterp 3.4.0 REQUIRED) find_package(PythonLibs 3.4.0 REQUIRED) -IF(SIP_VERSION) - # Already in cache, be silent - SET(SIP_FOUND TRUE) -ELSE(SIP_VERSION) - - FIND_FILE(_find_sip_py FindSIP.py PATHS ${CMAKE_MODULE_PATH}) - - SET(ENV{PYTHONPATH} ${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES_DIR}) - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} - OUTPUT_VARIABLE sip_config - RESULT_VARIABLE sip_config_returncode) - IF(sip_config_returncode EQUAL 0) - STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config}) - STRING(REGEX REPLACE ".*\nsip_version_num:([^\n]+).*$" "\\1" SIP_VERSION_NUM ${sip_config}) - STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config}) - 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}) - SET(SIP_FOUND TRUE) - ENDIF(sip_config_returncode EQUAL 0) - - IF(SIP_FOUND) - IF(NOT SIP_FIND_QUIETLY) - MESSAGE(STATUS "Found SIP version: ${SIP_VERSION_STR}") - ENDIF(NOT SIP_FIND_QUIETLY) - - include(${CMAKE_MODULE_PATH}/SIPMacros.cmake) - ELSE(SIP_FOUND) - IF(SIP_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find SIP") - ENDIF(SIP_FIND_REQUIRED) - ENDIF(SIP_FOUND) +get_filename_component(PYTHON_BINARY_PATH ${PYTHON_EXECUTABLE} DIRECTORY) + +find_program(SIP_BINARY_PATH sip + HINTS ${CMAKE_INSTALL_PREFIX}/bin ${PYTHON_BINARY_PATH} ${PYTHON_BINARY_PATH}/site-packages/PyQt5 +) + +find_path(SIP_INCLUDE_DIR sip.h + HINTS ${CMAKE_INSTALL_PREFIX}/include ${PYTHON_INCLUDE_DIRS} ${PYTHON_BINARY_PATH}/site-packages/PyQt5 +) + +execute_process( + COMMAND ${PYTHON_EXECUTABLE} -c "import sip; print(sip.SIP_VERSION_STR)" + RESULT_VARIABLE _process_status + OUTPUT_VARIABLE _process_output + OUTPUT_STRIP_TRAILING_WHITESPACE +) + +if(${_process_status} EQUAL 0) + string(STRIP ${_process_output} SIP_VERSION_STR) +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Sip REQUIRED_VARS SIP_BINARY_PATH SIP_INCLUDE_DIR VERSION_VAR SIP_VERSION_STR) + +if(Sip_FOUND) + include(${CMAKE_CURRENT_LIST_DIR}/SIPMacros.cmake) +endif() -ENDIF(SIP_VERSION) +mark_as_advanced(SIP_BINARY_PATH SIP_INCLUDE_DIR SIP_VERSION_STR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-3.4.1/cmake/FindSIP.py new/libArcus-3.5.1/cmake/FindSIP.py --- old/libArcus-3.4.1/cmake/FindSIP.py 2017-10-29 00:28:39.000000000 +0200 +++ new/libArcus-3.5.1/cmake/FindSIP.py 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -# FindSIP.py -# -# Copyright (c) 2007, Simon Edwards <[email protected]> -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. - -import sys -import os.path - -def fail(msg="Unable to determine your sip configuration."): - print(msg) - sys.exit(1) - -try: - # Try the old sipconfig. Many Linux distros still ship this in their packages. - import sipconfig - sipcfg = sipconfig.Configuration() - - sip_version = sipcfg.sip_version - sip_version = sipcfg.sip_version - sip_version_str = sipcfg.sip_version_str - sip_bin = sipcfg.sip_bin - default_sip_dir = sipcfg.default_sip_dir - sip_inc_dir = sipcfg.sip_inc_dir - -except ImportError: - try: - if sys.platform == "win32": - # Collect the info from the sip module and guess the rest. - import sip - from distutils import sysconfig - - sip_version = sip.SIP_VERSION - sip_version_str = sip.SIP_VERSION_STR - - exe = sys.executable - if exe is None: - fail() - base_path = os.path.dirname(exe) - sip_bin = os.path.join(base_path, "Lib\\site-packages\\PyQt5\\sip.exe") - if not os.path.exists(sip_bin): - fail() - - sip_inc_dir = os.path.join(base_path, "Lib\\site-packages\\PyQt5\\include\\") - if not os.path.exists(sip_inc_dir): - fail() - - default_sip_dir = os.path.join(base_path, "Lib\\site-packages\\PyQt5\\sip\\") - if not os.path.exists(default_sip_dir): - fail() - else: - fail("Unable to import sipconfig and determine your sip configuration.") - - except ImportError: - fail("Unable to import sipconfig and determine your sip configuration.") - -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) ++++++ libArcus.obsinfo ++++++ --- /var/tmp/diff_new_pack.qQAlCP/_old 2018-10-25 08:12:43.276173125 +0200 +++ /var/tmp/diff_new_pack.qQAlCP/_new 2018-10-25 08:12:43.276173125 +0200 @@ -1,5 +1,5 @@ name: libArcus -version: 3.4.1 -mtime: 1509229719 -commit: e6cb33bc528e1422f81ab0f7a24041168f4cd05b +version: 3.5.1 +mtime: 1530257956 +commit: 4fe4a3f48ae8c2fa85732675ee586cce7bf21abe
