Hello community, here is the log from the commit of package cura for openSUSE:Factory checked in at 2019-07-11 13:13:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cura (Old) and /work/SRC/openSUSE:Factory/.cura.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cura" Thu Jul 11 13:13:31 2019 rev:5 rq:712878 version:4.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cura/cura.changes 2018-11-19 23:31:13.415243873 +0100 +++ /work/SRC/openSUSE:Factory/.cura.new.4615/cura.changes 2019-07-11 13:13:44.742864956 +0200 @@ -1,0 +2,17 @@ +Thu Jun 13 06:49:49 UTC 2019 - Adrian Schröter <adr...@suse.de> + +- update to version 4.1.0 + * https://ultimaker.com/en/products/ultimaker-cura-software/release-notes + * Requires Qt 5.10 or later. So no builds for openSUSE Leap atm. + * added disable-code-style-check.patch fix-crash-on-start.patch fix-runtime.patch +- enable tests + * but skip code stylce checks disable-code-style-check.patch + +------------------------------------------------------------------- +Sat Mar 9 14:56:25 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Spec cleanup: + * Update URL to use https + * Remove %defattr + +------------------------------------------------------------------- Old: ---- Cura-3.6.0.obscpio New: ---- Cura-4.1.0.obscpio disable-code-style-check.patch fix-crash-on-start.patch fix-runtime.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cura.spec ++++++ --- /var/tmp/diff_new_pack.rNV6ht/_old 2019-07-11 13:13:47.202863941 +0200 +++ /var/tmp/diff_new_pack.rNV6ht/_new 2019-07-11 13:13:47.206863940 +0200 @@ -1,7 +1,7 @@ # # spec file for package cura # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,32 +17,55 @@ Name: cura -Version: 3.6.0 +Version: 4.1.0 Release: 0 Summary: 3D printer control software License: LGPL-3.0-only Group: Hardware/Printing Url: http://github.com/Ultimaker/Cura Source0: Cura-%{version}.tar.xz +# PATCH-FIX-OPENSUSE disable-code-style-check.patch code style is no distro buisiness +Patch1: disable-code-style-check.patch +# PATCH-FIX-OPENSUSE fix-runtime.patch +Patch2: fix-runtime.patch +# PATCH-FIX-OPENSUSE fix-crash-on-start.patch +Patch3: fix-crash-on-start.patch BuildRequires: cmake BuildRequires: fdupes +BuildRequires: libArcus3 +BuildRequires: python3-Savitar BuildRequires: python3-devel +BuildRequires: python3-numpy +BuildRequires: python3-pytest +BuildRequires: python3-qt5 +BuildRequires: python3-requests +BuildRequires: python3-scipy +BuildRequires: python3-shapely +BuildRequires: python3-zeroconf BuildRequires: update-desktop-files -BuildRequires: uranium >= %version -Requires: cura-engine >= %version +BuildRequires: uranium +# It builds with older Qt, but crashes due to missing qml features +BuildRequires: pkgconfig(Qt5Core) >= 5.10 +Requires: cura-engine >= 3.9.99 Requires: python3-numpy Requires: python3-pyserial -Requires: python3-qt5 +# Build and test suite works with older Qt, but no UI shows up due to usage +# of newer QML elements +Requires: python3-qt5 >= 5.10 Requires: python3-requests Requires: python3-scipy Requires: python3-shapely Requires: python3-typing -Requires: uranium >= %version +Requires: uranium >= 3.9.99 +Requires: pkgconfig(Qt5Core) >= 5.10 Recommends: cura-fdm-materials +Recommends: python3-Savitar Recommends: python3-zeroconf # for 3mf plugin Recommends: python3-Savitar BuildArch: noarch +# The CuraEngine is not supported on 32bit Linux anymore +ExcludeArch: %ix86 %arm %description Cura is a project which aims to be an single software solution for 3D printing. @@ -55,14 +78,25 @@ %prep %setup -q -n Cura-%version -sed -i 's:Version=.*:Version=1.0:; s:Icon=.*:Icon=cura-icon:' cura.desktop.in +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build CFLAGS="%{optflags}" export CFLAGS sed -i 's/PythonInterp 3.5.0/PythonInterp 3.4.0/' CMakeLists.txt cmake/CuraTests.cmake # Hack, remove LIB_SUFFIX for 64bit, which is correct as cura is pure python (i.e. noarch) -%cmake -DLIB_SUFFIX="" -DCURA_VERSION=%version +%cmake -DLIB_SUFFIX="" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCURA_BUILDTYPE=RPM \ + -DCURA_CLOUD_API_ROOT:STRING=https://api.ultimaker.com \ + -DCURA_CLOUD_API_VERSION:STRING=1 \ + -DCURA_CLOUD_ACCOUNT_API_ROOT:STRING=https://account.ultimaker.com \ + -DCURA_VERSION=%version \ + -DCURA_DEBUGMODE=OFF \ + -DCURA_SDK_VERSION="6.0.0" +# -DURANIUM_SCRIPTS_DIR= make %{?_smp_mflags} %install @@ -87,6 +121,10 @@ %fdupes -s %{buildroot}%{_datadir}/%{name} %suse_update_desktop_file cura Graphics 3DGraphics +%check +cd build +make CTEST_OUTPUT_ON_FAILURE=TRUE test + %files -f %{name}.lang %defattr (-,root,root,-) %license LICENSE ++++++ Cura-3.6.0.obscpio -> Cura-4.1.0.obscpio ++++++ /work/SRC/openSUSE:Factory/cura/Cura-3.6.0.obscpio /work/SRC/openSUSE:Factory/.cura.new.4615/Cura-4.1.0.obscpio differ: char 28, line 1 ++++++ Cura.obsinfo ++++++ --- /var/tmp/diff_new_pack.rNV6ht/_old 2019-07-11 13:13:47.254863921 +0200 +++ /var/tmp/diff_new_pack.rNV6ht/_new 2019-07-11 13:13:47.258863918 +0200 @@ -1,5 +1,5 @@ name: Cura -version: 3.6.0 -mtime: 1542034062 -commit: fe66d15b9e1b615ac894daddf24e1a1aeecb2408 +version: 4.1.0 +mtime: 1559037557 +commit: 63316fa4e9049043e36a35ff91bc2a9cd5aee465 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rNV6ht/_old 2019-07-11 13:13:47.282863908 +0200 +++ /var/tmp/diff_new_pack.rNV6ht/_new 2019-07-11 13:13:47.282863908 +0200 @@ -2,8 +2,8 @@ <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/Ultimaker/Cura.git</param> <param name="scm">git</param> - <param name="revision">3.6.0</param> - <param name="version">3.6.0</param> + <param name="revision">4.1.0</param> + <param name="version">4.1.0</param> <param name="submodules">disable</param> </service> <service mode="disabled" name="set_version" /> ++++++ disable-code-style-check.patch ++++++ diff --git a/cmake/CuraTests.cmake b/cmake/CuraTests.cmake index c0762e2b9..29c34c0b6 100644 --- a/cmake/CuraTests.cmake +++ b/cmake/CuraTests.cmake @@ -67,13 +67,6 @@ foreach(_plugin ${_plugins}) endif() endforeach() -#Add code style test. -add_test( - NAME "code-style" - COMMAND ${Python3_EXECUTABLE} run_mypy.py - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} -) - #Add test for whether the shortcut alt-keys are unique in every translation. add_test( NAME "shortcut-keys" ++++++ fix-crash-on-start.patch ++++++ diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 2f845c710..8cf10ae3d 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -855,6 +855,9 @@ class CuraApplication(QtApplication): # Initialize QML engine self.setMainQml(Resources.getPath(self.ResourceTypes.QmlFiles, "Cura.qml")) self._qml_import_paths.append(Resources.getPath(self.ResourceTypes.QmlFiles)) + from cura.API import CuraAPI + qmlRegisterSingletonType(CuraAPI, "Cura", 1, 1, "API", self.getCuraAPI) + self.initializeEngine() # Initialize UI state @@ -1070,9 +1073,6 @@ class CuraApplication(QtApplication): qmlRegisterType(PrinterOutputDevice, "Cura", 1, 0, "PrinterOutputDevice") - from cura.API import CuraAPI - qmlRegisterSingletonType(CuraAPI, "Cura", 1, 1, "API", self.getCuraAPI) - # As of Qt5.7, it is necessary to get rid of any ".." in the path for the singleton to work. actions_url = QUrl.fromLocalFile(os.path.abspath(Resources.getPath(CuraApplication.ResourceTypes.QmlFiles, "Actions.qml"))) qmlRegisterSingletonType(actions_url, "Cura", 1, 0, "Actions") ++++++ fix-runtime.patch ++++++ diff --git a/cura_app.py b/cura_app.py index 1978e0f5f..80bd27208 100755 --- a/cura_app.py +++ b/cura_app.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 # Copyright (c) 2018 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher.
