Hello community, here is the log from the commit of package cura-lulzbot for openSUSE:Factory checked in at 2018-04-20 17:27:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cura-lulzbot (Old) and /work/SRC/openSUSE:Factory/.cura-lulzbot.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cura-lulzbot" Fri Apr 20 17:27:31 2018 rev:2 rq:596278 version:3.2.16 Changes: -------- --- /work/SRC/openSUSE:Factory/cura-lulzbot/cura-lulzbot.changes 2018-01-09 14:51:48.603692804 +0100 +++ /work/SRC/openSUSE:Factory/.cura-lulzbot.new/cura-lulzbot.changes 2018-04-20 17:28:08.685422632 +0200 @@ -1,0 +2,35 @@ +Mon Mar 26 06:55:25 UTC 2018 - [email protected] + +- update to version 3.2.16 + * Changed Marlin FW to v1.1.8.21 + * fixed profiles filter in preferences page + * fix bed pre-heat button + * updating Polylite Standard print temp + * Further UI and material updates +- compile in cura version + +------------------------------------------------------------------- +Thu Mar 8 20:26:14 UTC 2018 - [email protected] + +- update to version 3.2.9 + * Updates for various printers + +------------------------------------------------------------------- +Wed Jan 31 13:05:31 UTC 2018 - [email protected] + +- Say what the package does, not what it aims to do in future. + +------------------------------------------------------------------- +Wed Jan 31 08:34:30 UTC 2018 - [email protected] + +- update to version 3.2.1 + * entire rewrite + * supports network and headless mode +- Patches: + dynamic-linking.patch was never applied on the package, but + factory check scripts got confused due + to rename + fix-build.patch: adapt SUSE python installation pathes + CuraEngine-lulzbot.patch: Find the LulzBot CuraEngine by default + +------------------------------------------------------------------- @@ -14 +49 @@ -- Fix grammatica errors. +- Fix grammatical errors. Old: ---- curaengine-14.03.obscpio curaengine.obsinfo dynamic-linking.patch lulzbot-21.06.tar.gz New: ---- CuraEngine-lulzbot.patch cura-lulzbot-3.2.16.obscpio cura-lulzbot.obsinfo fix-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cura-lulzbot.spec ++++++ --- /var/tmp/diff_new_pack.sPs6bX/_old 2018-04-20 17:28:10.229366642 +0200 +++ /var/tmp/diff_new_pack.sPs6bX/_new 2018-04-20 17:28:10.233366497 +0200 @@ -1,8 +1,7 @@ # -# spec file for package cura1 +# spec file for package cura-lulzbot # -# Copyright (c) 2015 Ferry Huberts -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,94 +16,83 @@ # -%global _curaName Cura -%global _baseDir scripts/linux/fedora - Name: cura-lulzbot -Version: 21.06 -Release: 1%{?dist} -Summary: 3D printing software aimed at RepRaps, Ultimaker and LulzBot -License: AGPL-3.0+ -Group: Applications/Engineering - -Url: https://code.alephobjects.com/diffusion/CURA/ -Source0: lulzbot-%{version}.tar.gz -Source1: curaengine-14.03.tar.xz -Patch1: dynamic-linking.patch - -%if 0%{?suse_version} -BuildRequires: gcc-c++ -BuildRequires: glibc-devel +Version: 3.2.16 +Release: 0 +Summary: 3D printer control software +License: AGPL-3.0-only +Group: Hardware/Printing +Url: https://code.alephobjects.com/source/cura-lulzbot.git +Source0: %name-%{version}.tar.xz +# PATCH-FIX-OPENSUSE fix-build.patch -- adapt SUSE python install path +Patch1: fix-build.patch +# PATCH-FIX-OPENSUSE CuraEngine-lulzbot.patch -- use lulzbot variant of CuraEngine by default +Patch2: CuraEngine-lulzbot.patch +BuildArch: noarch +Provides: cura2-lulzbot +Obsoletes: cura2-lulzbot < 3 +BuildRequires: cmake +BuildRequires: dos2unix BuildRequires: fdupes -Requires: python-numpy >= 1.6.2 -Requires: python-opengl >= 3.0.2 -Requires: python-pyserial >= 2.6 -%else -BuildRequires: glibc -BuildRequires: libstdc++ -Requires: PyOpenGL >= 3.0.2 -Requires: numpy >= 1.6.2 -Requires: pyserial >= 2.6 -%endif -Requires: curl -Requires: python-power >= 1.2 -Requires: wxPython >= 3.0.0 -Requires: libglut3 +BuildRequires: gcc-c++ +BuildRequires: icoutils +BuildRequires: python3-devel +BuildRequires: update-desktop-files +BuildRequires: uranium-lulzbot +Requires: cura-engine-lulzbot = %version +Requires: uranium-lulzbot +# dependency scripts do not find qtquickcontrols automatically +Requires: libqt5-qtquickcontrols +Requires: python3-numpy +Requires: python3-opengl +Requires: python3-power +Requires: python3-pyserial +Requires: python3-qt5 +Requires: python3-scipy +Requires: python3-sip +Requires: python3-zeroconf -%description -%{_curaName} is a software solution for 3D printing, aimed at RepRaps, -the Ultimaker and LulzBot. This package comes with its own version of CuraEngine. +# There is a hardcoded version to the firmware in the code :/ +Requires: uranium-firmware-lulzbot = %( tar xf %{S:0} --wildcards \*/USBPrinterOutputDeviceManager.py --to-command='sed -n -e "s,.*Marlin_Mini_SingleExtruder_\([^_]*_[^_]*\).hex.*,\1,p"' ) -This is the fork from AlephObjects to support also LulzBot printers. +%description +Cura is a software solution for 3D printing. +While it is developed to be used with the Ultimaker 3D printer, it can be used +with other RepRap based designs. + +Cura helps in setting up an Ultimaker, shows 3D models, allows for scaling / +positioning, can slice the model to G-Code, has editable configuration +settings, and send this G-Code to the 3D printer for printing. %prep -%setup -q -n Cura-lulzbot-%{version} -a 1 -mv curaengine-* CuraEngine -cd CuraEngine +%setup -q %patch1 -p1 +%patch2 -p1 %build -make -C CuraEngine VERSION=%{version} - -# move to arch dependend dir for CuraEngine and to avoid conflicts with cura 2 -dstDir="%{_baseDir}%{_libdir}/cura-lulzbot" -sed -i -e 's,/usr/share/cura/,%{_libdir}/cura-lulzbot/,g' scripts/linux/fedora/usr/bin/cura -sed -i -e 's,/usr/share/cura/,%{_libdir}/cura-lulzbot/,g' scripts/linux/fedora/usr/share/applications/cura.desktop - -rm -frv "$dstDir" -mkdir -pv "$dstDir" - -cp -av -t "$dstDir" \ - Cura \ - resources \ - plugins \ - CuraEngine/build/CuraEngine \ - scripts/linux/cura.py +%cmake -DURANIUM_DIR=/usr/lib/uranium -DURANIUM_SCRIPTS_DIR=/usr/share/uranium/resources/scripts \ + -DCURA_VERSION=%version \ + -DCURA_BUILDTYPE=release +make %{?_smp_mflags} %install -mkdir -pv "%{buildroot}" -cp -av -t "%{buildroot}" "%{_baseDir}/usr" -rm "%{buildroot}/usr/share/.gitignore" -mv "%{buildroot}/usr/bin/cura" "%{buildroot}/usr/bin/cura-lulzbot" -mv "%{buildroot}/usr/share/applications/cura.desktop" "%{buildroot}/usr/share/applications/cura-lulzbot.desktop" - -sed -i -e 's,^Categories=.*,Categories=Education;Engineering;,' \ - -e 's,^Icon=.*,Icon=%_libdir/cura-lulzbot/resources/images/c.png,' \ - %{buildroot}/usr/share/applications/cura-lulzbot.desktop -%if 0%{?suse_version} -%fdupes -s %{buildroot}%{_libdir} -%endif - -%{find_lang} Cura +cd build +%make_install +%suse_update_desktop_file cura-lulzbot Graphics 3DGraphics +sed -i -e 's,^Exec=.*,Exec=cura-lulzbot %F,' \ + -e 's,^#!/usr/bin/env.*,#!/usr/bin/python3,' \ + %{buildroot}%{_datadir}/applications/cura-lulzbot.desktop +%fdupes %buildroot -%files -f Cura.lang +%files +%defattr (-,root,root,-) %doc LICENSE README.md +%{python3_sitelib}/cura +%{_datadir}/cura +%{_datadir}/applications/cura-lulzbot.desktop +%{_datadir}/mime/packages/cura.xml +%{_datadir}/appdata/cura.appdata.xml %{_bindir}/cura-lulzbot -%attr(644, root, root) %{_datarootdir}/applications/cura-lulzbot.desktop -%attr(755, root, root) %{_libdir}/cura-lulzbot/Cura/cura.py -%attr(755, root, root) %{_libdir}/cura-lulzbot/Cura/util/pymclevel/mce.py -%attr(755, root, root) %{_libdir}/cura-lulzbot/CuraEngine -%attr(755, root, root) %{_libdir}/cura-lulzbot/cura.py -%{_libdir}/cura-lulzbot +/usr/lib/cura %changelog ++++++ CuraEngine-lulzbot.patch ++++++ diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index cbe6b421a..910f01d2e 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -42,7 +42,7 @@ class CuraEngineBackend(QObject, Backend): super().__init__(parent = parent) # Find out where the engine is located, and how it is called. # This depends on how Cura is packaged and which OS we are running on. - executable_name = "CuraEngine" + executable_name = "CuraEngine-lulzbot" if Platform.isWindows(): executable_name += ".exe" default_engine_location = executable_name ++++++ _service ++++++ --- /var/tmp/diff_new_pack.sPs6bX/_old 2018-04-20 17:28:10.285364611 +0200 +++ /var/tmp/diff_new_pack.sPs6bX/_new 2018-04-20 17:28:10.285364611 +0200 @@ -1,9 +1,13 @@ <services> - <service name="obs_scm" mode="disabled"> - <param name="url">https://code.alephobjects.com/diffusion/CE/curaengine.git</param> + <service mode="disabled" name="obs_scm"> + <param name="url">https://code.alephobjects.com/source/cura-lulzbot.git</param> <param name="scm">git</param> - <param name="version">14.03</param> + <param name="revision">v3.2.16</param> + <param name="version">3.2.16</param> + <param name="submodules">disable</param> </service> + <service mode="disabled" name="set_version" /> + <service mode="buildtime" name="tar" /> <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> ++++++ cura-lulzbot.obsinfo ++++++ name: cura-lulzbot version: 3.2.16 mtime: 1523014297 commit: 9bce10c6e65f02ac1d091e52e3fbcce89ebddd3c ++++++ fix-build.patch ++++++ diff --git a/CMakeLists.txt b/CMakeLists.txt index e7267015..93d9345e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,13 +46,8 @@ if (NOT BUILD_PYTHON) endif() if(NOT PYTHON_SITE_PACKAGES_DIR) - if(APPLE OR WIN32) - set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages - CACHE STRING "Directory to install Python bindings to") - else() - set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}/dist-packages - CACHE STRING "Directory to install Python bindings to") - endif() + set(PYTHON_SITE_PACKAGES_DIR lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages + CACHE STRING "Directory to install Python bindings to") set(CURA_INSTALL_PLUGINS_PATH lib/cura) else() set(CURA_INSTALL_PLUGINS_PATH ${CMAKE_INSTALL_LIBDIR}/cura)
