Hello community, here is the log from the commit of package libArcus for openSUSE:Factory checked in at 2020-06-07 21:55:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libArcus (Old) and /work/SRC/openSUSE:Factory/.libArcus.new.3606 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libArcus" Sun Jun 7 21:55:51 2020 rev:9 rq:812283 version:4.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libArcus/libArcus.changes 2020-01-03 17:36:24.235277787 +0100 +++ /work/SRC/openSUSE:Factory/.libArcus.new.3606/libArcus.changes 2020-06-07 21:55:53.636784906 +0200 @@ -1,0 +2,8 @@ +Sun Jun 7 17:55:54 UTC 2020 - Stefan Brüns <[email protected]> + +- update to version 4.6.1 + * no code changes +- Fix Arcus python import error with current PyQt5, add + libArcus-3.5.1-PyQt5.sip.patch + +------------------------------------------------------------------- Old: ---- libArcus-4.4.1.obscpio New: ---- libArcus-3.5.1-PyQt5.sip.patch libArcus-4.6.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libArcus.spec ++++++ --- /var/tmp/diff_new_pack.KnVVtu/_old 2020-06-07 21:55:54.804788582 +0200 +++ /var/tmp/diff_new_pack.KnVVtu/_new 2020-06-07 21:55:54.808788595 +0200 @@ -1,7 +1,7 @@ # # spec file for package libArcus # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,14 +18,16 @@ %define sover 3 Name: libArcus -Version: 4.4.1 +Version: 4.6.1 Release: 0 Summary: 3D printer control software License: LGPL-3.0-only Group: Development/Libraries/C and C++ URL: http://github.com/Ultimaker/%name Source: %name-%{version}.tar.xz -BuildRequires: cmake +# PATCH-FIX-OPENSUSE - use Qt5 sip import name, taken from Fedora +Patch0: libArcus-3.5.1-PyQt5.sip.patch +BuildRequires: cmake >= 3.6 BuildRequires: gcc-c++ BuildRequires: protobuf-devel >= 3.0.0 BuildRequires: python3-sip-devel @@ -53,6 +55,7 @@ %prep %setup +%patch0 -p1 %build %cmake ++++++ _service ++++++ --- /var/tmp/diff_new_pack.KnVVtu/_old 2020-06-07 21:55:54.836788683 +0200 +++ /var/tmp/diff_new_pack.KnVVtu/_new 2020-06-07 21:55:54.840788696 +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">v4.4.1</param> - <param name="version">4.4.1</param> + <param name="revision">4.6.1</param> + <param name="version">4.6.1</param> <param name="submodules">disable</param> </service> <service mode="disabled" name="set_version" /> ++++++ libArcus-3.5.1-PyQt5.sip.patch ++++++ 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() ++++++ libArcus-4.4.1.obscpio -> libArcus-4.6.1.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.4.1/.github/workflows/cicd-mingw64.yml new/libArcus-4.6.1/.github/workflows/cicd-mingw64.yml --- old/libArcus-4.4.1/.github/workflows/cicd-mingw64.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libArcus-4.6.1/.github/workflows/cicd-mingw64.yml 2020-05-25 11:30:03.000000000 +0200 @@ -0,0 +1,52 @@ +--- +name: CI/CD for mingw64 debian package +on: [push, pull_request] +jobs: + build: + name: Build debian package + timeout-minutes: 10 + runs-on: ubuntu-latest + container: debian:buster + steps: + - name: Checkout repository + uses: actions/checkout@v2 + - name: Install dependencies + run: | + apt-get update + apt-get upgrade -y + apt-get install -y curl cmake gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 + update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix + update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix + curl -1sLf 'https://dl.cloudsmith.io/public/ultimaker/cura-public/cfg/setup/bash.deb.sh' | bash + apt-get install -y cura-libprotobuf-mingw-w64-dev + - name: Build debian package + run: | + docker/build-deb-mingw64.sh + - name: Upload build directory + uses: actions/upload-artifact@v1 + with: + name: build + path: build/ + publish: + name: Publish debian package + if: github.event_name != 'pull_request' + needs: build + timeout-minutes: 5 + runs-on: ubuntu-latest + container: python:3.7-slim-buster + env: + CLOUDSMITH_API_KEY: "${{ secrets.CLOUDSMITH_API_KEY }}" + CLOUDSMITH_DEB_REPO: "${{ secrets.CLOUDSMITH_DEB_REPO }}" + steps: + - name: Check repository + uses: actions/checkout@v2 + - name: Prepare cloudsmith-cli + run: | + pip3 install --upgrade cloudsmith-cli + - name: Download artifacts + uses: actions/download-artifact@v1 + with: + name: build + - name: Publish debian package + run: | + docker/publish-debs.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.4.1/.github/workflows/cicd.yml new/libArcus-4.6.1/.github/workflows/cicd.yml --- old/libArcus-4.4.1/.github/workflows/cicd.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libArcus-4.6.1/.github/workflows/cicd.yml 2020-05-25 11:30:03.000000000 +0200 @@ -0,0 +1,13 @@ +--- +name: CI/CD +on: [push, pull_request] +jobs: + build: + name: Build and test + runs-on: ubuntu-latest + container: ultimaker/cura-build-environment + steps: + - name: Checkout master + uses: actions/[email protected] + - name: Build and test + run: docker/build.sh diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.4.1/.gitlab-ci.yml new/libArcus-4.6.1/.gitlab-ci.yml --- old/libArcus-4.4.1/.gitlab-ci.yml 2019-09-10 11:07:25.000000000 +0200 +++ new/libArcus-4.6.1/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,16 +0,0 @@ -image: registry.gitlab.com/ultimaker/cura/cura-build-environment:centos7 - -stages: - - build - -build and test linux: - stage: build - tags: - - cura - - docker - - linux - script: - - docker/build.sh - artifacts: - paths: - - build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.4.1/CMakeLists.txt new/libArcus-4.6.1/CMakeLists.txt --- old/libArcus-4.4.1/CMakeLists.txt 2019-09-10 11:07:25.000000000 +0200 +++ new/libArcus-4.6.1/CMakeLists.txt 2020-05-25 11:30:03.000000000 +0200 @@ -16,7 +16,7 @@ # 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 # this, which defaults to OFF. We need to force this option to ON instead. -set(protobuf_MODULE_COMPATIBLE ON CACHE "" INTERNAL FORCE) +set(protobuf_MODULE_COMPATIBLE ON CACHE INTERNAL "" FORCE) find_package(Protobuf 3.0.0 REQUIRED) set(CMAKE_POSITION_INDEPENDENT_CODE ON) #Required if a patch to libArcus needs to be made via templates. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.4.1/cmake/cpack_config_deb_mingw64.cmake new/libArcus-4.6.1/cmake/cpack_config_deb_mingw64.cmake --- old/libArcus-4.4.1/cmake/cpack_config_deb_mingw64.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/libArcus-4.6.1/cmake/cpack_config_deb_mingw64.cmake 2020-05-25 11:30:03.000000000 +0200 @@ -0,0 +1,26 @@ +set(CPACK_GENERATOR "DEB") +set(CPACK_CMAKE_GENERATOR "Unix Makefiles") + +set(CPACK_PACKAGE_NAME "cura-libarcus-mingw-w64-dev") +set(CPACK_PACKAGE_VENDOR "Ultimaker B.V.") +set(CPACK_PACKAGE_DESCRIPTION "(Cura) libArcus static library for MinGW-w64 targeting Win64") +set(CPACK_PACKAGE_CONTACT "Lipu Fei <[email protected]>") +set(CPACK_PACKAGING_INSTALL_PREFIX "/usr/x86_64-w64-mingw32") +set(CPACK_PACKAGE_VERSION "4.5.0") +set(CPACK_DEBIAN_PACKAGE_RELEASE 1) +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}-${CPACK_DEBIAN_PACKAGE_RELEASE}") + +set(CPACK_DEBIAN_PACKAGE_NAME "${CPACK_PACKAGE_NAME}") +set(CPACK_DEBIAN_PACKAGE_DESCRIPTION "${CPACK_PACKAGE_DESCRIPTION}") +set(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_CONTACT}") +set(CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION}") +set(CPACK_DEBIAN_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}.deb") +set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "all") +set(CPACK_DEBIAN_PACKAGE_SECTION "devel") +set(CPACK_DEBIAN_PACKAGE_PRIORITY "optional") + +set(_arcus_DEB_DEPENDS + "cura-libprotobuf-mingw-w64-dev (>= 3.9.2)" +) +string(REPLACE ";" ", " _arcus_DEB_DEPENDS "${_arcus_DEB_DEPENDS}") +set(CPACK_DEBIAN_PACKAGE_DEPENDS "${_arcus_DEB_DEPENDS}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.4.1/docker/build-deb-mingw64.sh new/libArcus-4.6.1/docker/build-deb-mingw64.sh --- old/libArcus-4.4.1/docker/build-deb-mingw64.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libArcus-4.6.1/docker/build-deb-mingw64.sh 2020-05-25 11:30:03.000000000 +0200 @@ -0,0 +1,27 @@ +#!/bin/sh +# +# This scripts uses CMake to build protobuf with static libraries using MinGW +# W64 targeting Windows x64. It also creates a debian package with cpack. The +# contents of the package are installed under "/usr/x86_64-w64-mingw32". +# + +# Include binaries in the cura development environment +CURA_DEV_ENV_ROOT=/opt/cura-dev +export PATH="${CURA_DEV_ENV_ROOT}/bin:${PATH}" + +mkdir build +cd build +cmake \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SYSTEM_NAME="Windows" \ + -DCMAKE_FIND_ROOT_PATH=/usr/x86_64-w64-mingw32 \ + -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc \ + -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ \ + -DBUILD_PYTHON=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_STATIC=ON \ + .. +make +cpack \ + --config ../cmake/cpack_config_deb_mingw64.cmake \ + -D CPACK_INSTALL_CMAKE_PROJECTS="$(pwd);libArcus;ALL;/" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libArcus-4.4.1/docker/publish-debs.sh new/libArcus-4.6.1/docker/publish-debs.sh --- old/libArcus-4.4.1/docker/publish-debs.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/libArcus-4.6.1/docker/publish-debs.sh 2020-05-25 11:30:03.000000000 +0200 @@ -0,0 +1,13 @@ +#!/bin/sh +# +# This scripts lists all the .deb files in the "build/" directory and +# publishes them one by one to Cloudsmith.io +# + +for f in build/*.deb +do + echo "Uploading '${f}' to Cloudsmith..." + cloudsmith push deb \ + --api-key "${CLOUDSMITH_API_KEY}" \ + --republish "${CLOUDSMITH_DEB_REPO}" "${f}" +done ++++++ libArcus.obsinfo ++++++ --- /var/tmp/diff_new_pack.KnVVtu/_old 2020-06-07 21:55:54.948789036 +0200 +++ /var/tmp/diff_new_pack.KnVVtu/_new 2020-06-07 21:55:54.948789036 +0200 @@ -1,5 +1,5 @@ name: libArcus -version: 4.4.1 -mtime: 1568106445 -commit: 20251c9343294de979e53f103af207bd14b3bc34 +version: 4.6.1 +mtime: 1590399003 +commit: 140bdc3fa7992fc728b873fbde07b3de3cd88d6a
