[packages/cura] - updated to 4.13.2

Fri Sep 27 21:23:20 CEST 2024

commit b6ba134eb58ecbca2e011e8309094e9f0131de06
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Sep 27 21:26:22 2024 +0200

    - updated to 4.13.2

 cura.spec          | 72 ++++++++++++++++++++++++++++++++++--------------------
 plugins-path.patch | 20 +++++++--------
 2 files changed, 55 insertions(+), 37 deletions(-)
---

diff --git a/cura.spec b/cura.spec
index f89ca9e..a3463d4 100644
--- a/cura.spec
+++ b/cura.spec
@@ -1,40 +1,51 @@
 Summary:	3D printer control software
+Summary(pl.UTF-8):	Oprogramowanie do sterowania drukarkami 3D
 Name:		cura
-Version:	4.5.0
-Release:	4
+# keep in sync with CuraEngine, libArgus, libSavitar, python3-Uranium
+Version:	4.13.2
+Release:	1
 Epoch:		1
 Group:		Applications/Engineering
 # Code is AGPLv3
 # Icons AGPLv3 https://github.com/daid/Cura/issues/231#issuecomment-12209683
 # Example models are CC-BY-SA
 # TweakAtZ.py is CC-BY-SA
-License:	AGPLv3 and CC-BY-SA
+License:	AGPL v3 and CC-BY-SA
 Source0:	https://github.com/Ultimaker/Cura/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	b02b95a4669110cff62f96e1bb00b1b5
+# Source0-md5:	57405484fd44518dff522cc205fbf548
 Source1:	https://github.com/Ultimaker/fdm_materials/archive/%{version}/fdm_materials-%{version}.tar.gz
-# Source1-md5:	449b2301efb4a4616c5c610bae173d0d
+# Source1-md5:	db985047a2f859a77cb7c2468e2e0bbf
 Patch0:		plugins-path.patch
 URL:		https://ultimaker.com/en/products/cura-software
-BuildRequires:	cmake
+BuildRequires:	cmake >= 3.6
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 BuildRequires:	gettext-tools
+# UraniumTranslationTools
 BuildRequires:	python3-Uranium = %{version}
-BuildRequires:	python3-devel
+BuildRequires:	python3-devel >= 1:3.5
 BuildRequires:	python3-pytest
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 Requires:	CuraEngine = %{epoch}:%{version}
-Requires:	Qt5Quick-controls
+Requires:	Qt5Quick-controls >= 5.6.0
 Requires:	fonts-TTF-OpenSans
-Requires:	python3-PyOpenGL
-Requires:	python3-PyQt5
+Requires:	python3-PyQt5 >= 5.6.0
 Requires:	python3-Uranium = %{version}
+# for FirmwareUpdateChecker plugin
+Requires:	python3-certifi
 Requires:	python3-numpy
-Requires:	python3-power
-Requires:	python3-savitar >= 2.7.0
+# for 3MFReader and 3MFWriter plugins
+Requires:	python3-savitar = %{version}
 Requires:	python3-serial
 Requires:	python3-zeroconf
+# TODO:
+# for UFPReader and UFPWriter plugins
+#Requires:	python3-charon
+# for AMFReader and TrimeshReader plugins
+#Requires:	python3-trimesh
+# for SentryLogger plugin
+#Requires:	python3-sentry_sdk
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,11 +59,20 @@ scaling / positioning, can slice the model to G-Code, with sane
 editable configuration settings and send this G-Code to the 3D printer
 for printing.
 
+%description -l pl.UTF-8
+Cura to projekt, który ma być kompletnym oprogramowaniem do drukowania
+3D. Choć jest tworzony do użytku z drukarką Ultimaker 3D, może być
+używany także z innymi projektami opartymi na RepRap.
+
+Cura pomaga skonfigurować drukarkę Ultimaker, pokazuje model 3D,
+pozwala go skalować/pozycjonować, dzielić go na G-kod z rozsądnymi
+modyfikowalnymi ustawieniami i wysyłać go do drukarki 3D.
+
 %prep
 %setup -q -n Cura-%{version} -a1
 %patch0 -p1
 
-for bad_lang in de_DE es_ES fi_FI fr_FR it_IT ja_JP ko_KR nl_NL pl_PL pt_PT ru_RU tr_TR ; do
+for bad_lang in cs_CZ de_DE es_ES fi_FI fr_FR hu_HU it_IT ja_JP ko_KR nl_NL pl_PL pt_PT ru_RU tr_TR ; do
 	lang="$(echo $bad_lang | sed 's/_.*//')"
 	%{__mv} "resources/i18n/$bad_lang" "resources/i18n/$lang"
 done
@@ -61,13 +81,13 @@ done
 # We want to install to %{py3_sitescriptdir}
 %{__sed} -i 's|lib${LIB_SUFFIX}/python${Python3_VERSION_MAJOR}.*/.*-packages|%(echo %{py3_sitescriptdir} | sed -e s@%{_prefix}/@@)|g' CMakeLists.txt
 
-# Wrong shebang
-%{__sed} -i '1s=^#!%{_bindir}/\(python\|env python\)3*=#!%{__python3}=' cura_app.py
+# Adjust shebang
+%{__sed} -i '1s=/usr/bin/env python3=%{__python3}=' cura_app.py
 
 %build
 mkdir build
 cd build
-%{cmake} .. \
+%cmake .. \
 	-DCURA_VERSION:STRING=%{version}
 
 %{__make}
@@ -75,15 +95,18 @@ cd build
 cd ../fdm_materials-%{version}
 mkdir build
 cd build
-%{cmake} ..
+%cmake ..
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} -C build install DESTDIR=$RPM_BUILD_ROOT
-%{__make} -C fdm_materials-%{version}/build install DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C build install \
+	DESTDIR=$RPM_BUILD_ROOT
+
+%{__make} -C fdm_materials-%{version}/build install \
+	DESTDIR=$RPM_BUILD_ROOT
 
 # Sanitize the location of locale files
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/{cura/resources/i18n,locale}
@@ -91,10 +114,6 @@ ln -s ../../locale $RPM_BUILD_ROOT%{_datadir}/cura/resources/i18n
 %{__rm} $RPM_BUILD_ROOT%{_localedir}/*/*.po
 %{__rm} $RPM_BUILD_ROOT%{_localedir}/*.pot
 
-%py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_comp $RPM_BUILD_ROOT%{py_sitescriptdir}
-%py_postclean
-
 %find_lang cura --all-name
 
 %clean
@@ -108,10 +127,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f cura.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/%{name}
+%doc README.md
+%attr(755,root,root) %{_bindir}/cura
 %{py3_sitescriptdir}/cura
-%{_desktopdir}/%{name}.desktop
 %{_datadir}/%{name}
-%{_datadir}/metainfo/cura.appdata.xml
+%{_datadir}/metainfo/com.ultimaker.cura.appdata.xml
 %{_datadir}/mime/packages/cura.xml
+%{_desktopdir}/com.ultimaker.cura.desktop
 %{_iconsdir}/hicolor/*x*/apps/cura-icon.png
diff --git a/plugins-path.patch b/plugins-path.patch
index bd4761f..3393ac3 100644
--- a/plugins-path.patch
+++ b/plugins-path.patch
@@ -1,23 +1,21 @@
-diff -urNp -x '*.orig' Cura-4.5.0.org/cmake/CuraPluginInstall.cmake Cura-4.5.0/cmake/CuraPluginInstall.cmake
---- Cura-4.5.0.org/cmake/CuraPluginInstall.cmake	2020-02-25 16:16:45.000000000 +0100
-+++ Cura-4.5.0/cmake/CuraPluginInstall.cmake	2021-03-03 12:45:56.861128898 +0100
-@@ -84,7 +84,7 @@ foreach(_plugin_json_path ${_plugin_json
-         message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}")
+--- Cura-4.13.2/cmake/CuraPluginInstall.cmake.orig	2024-09-27 18:42:08.796126936 +0200
++++ Cura-4.13.2/cmake/CuraPluginInstall.cmake	2024-09-27 18:43:07.885806820 +0200
+@@ -88,7 +88,7 @@ foreach(_plugin_json_path ${_plugin_json
+         endif()
          get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir} DIRECTORY)
          install(DIRECTORY ${_rel_plugin_dir}
 -                DESTINATION lib${LIB_SUFFIX}/cura/${_rel_plugin_parent_dir}
-+                DESTINATION ${CMAKE_INSTALL_DATADIR}/cura/${_rel_plugin_parent_dir}
++		DESTINATION ${CMAKE_INSTALL_DATADIR}/cura/${_rel_plugin_parent_dir}
                  PATTERN "__pycache__" EXCLUDE
                  PATTERN "*.qmlc" EXCLUDE
                  )
-diff -urNp -x '*.orig' Cura-4.5.0.org/cura/CuraApplication.py Cura-4.5.0/cura/CuraApplication.py
---- Cura-4.5.0.org/cura/CuraApplication.py	2020-02-25 16:16:45.000000000 +0100
-+++ Cura-4.5.0/cura/CuraApplication.py	2021-03-03 12:45:56.861128898 +0100
-@@ -735,6 +735,7 @@ class CuraApplication(QtApplication):
+--- Cura-4.13.2/cura/CuraApplication.py.orig	2024-09-27 18:42:08.796126936 +0200
++++ Cura-4.13.2/cura/CuraApplication.py	2024-09-27 18:43:51.602236655 +0200
+@@ -778,6 +778,7 @@ class CuraApplication(QtApplication):
              lib_suffixes = {""}
          for suffix in lib_suffixes:
              self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "lib" + suffix, "cura"))
 +        self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "share", "cura"))
+ 
          if not hasattr(sys, "frozen"):
              self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "plugins"))
-             self._plugin_registry.loadPlugin("ConsoleLogger")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cura.git/commitdiff/b6ba134eb58ecbca2e011e8309094e9f0131de06

