The package rpms/cura.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/cura.git/commit/?id=12e0239599cb4....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit c76efbe7de511159746e00dbfddea22ac7dfb519
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Aug 22 16:40:51 2022 +0200
Use the default flags for Python in the shebang of /usr/bin/cura
Fixes:
https://bugzilla.redhat.com/2117729
diff --git a/cura.spec b/cura.spec
index f9f0f5d..206e5b9 100644
--- a/cura.spec
+++ b/cura.spec
@@ -4,7 +4,7 @@
Name: cura
Epoch: 1
Version: %{major_minor_version}.%{patch_version}
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: 3D printer / slicing GUI
#
https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.o...
@@ -139,6 +139,9 @@ rm -r
%{buildroot}%{_prefix}/lib/cura/plugins/{SentryLogger,UFPReader,UFPWriter}
# Bytecompile the plugins
%py_byte_compile %{__python3} %{buildroot}%{_prefix}/lib/cura
+# Use the default flags in the shebang
+%py3_shebang_fix %{buildroot}%{_bindir}/*
+
%find_lang cura
%find_lang fdmextruder.def.json
%find_lang fdmprinter.def.json
@@ -166,6 +169,10 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Mon Aug 22 2022 Miro Hrončok <mhroncok(a)redhat.com> - 1:4.13.1-5
+- Use the default flags for Python in the shebang of /usr/bin/cura
+- Fixes: rhbz#2117729
+
* Wed Jul 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.13.1-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
commit 16f012aa4ca8106f42e7ae74da2e4d1e869d1f35
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Wed Jul 20 23:53:57 2022 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/cura.spec b/cura.spec
index 84f9cd7..f9f0f5d 100644
--- a/cura.spec
+++ b/cura.spec
@@ -4,7 +4,7 @@
Name: cura
Epoch: 1
Version: %{major_minor_version}.%{patch_version}
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: 3D printer / slicing GUI
#
https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.o...
@@ -166,6 +166,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.13.1-4
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Fri Jun 17 2022 Python Maint <python-maint(a)redhat.com> - 1:4.13.1-3
- Rebuilt for Python 3.11
commit 12e0239599cb4b3829050cc0ce85f6342cc53a43
Author: Miro Hrončok <miro(a)hroncok.cz>
Date: Mon Jul 18 14:44:55 2022 +0200
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
diff --git a/cura.spec b/cura.spec
index 8e1efaf..84f9cd7 100644
--- a/cura.spec
+++ b/cura.spec
@@ -22,6 +22,11 @@ Patch1: 028e7f7.patch
BuildArch: noarch
+#
https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10
+ExcludeArch: %{ix86}
+%endif
+
BuildRequires: cmake
BuildRequires: gcc
BuildRequires: gcc-c++
commit 07a31e1799b6cfbfda4cccf98b63aacc3a9c3587
Author: Python Maint <python-maint(a)redhat.com>
Date: Fri Jun 17 13:42:01 2022 +0200
Rebuilt for Python 3.11
diff --git a/cura.spec b/cura.spec
index c63a4f1..8e1efaf 100644
--- a/cura.spec
+++ b/cura.spec
@@ -4,7 +4,7 @@
Name: cura
Epoch: 1
Version: %{major_minor_version}.%{patch_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: 3D printer / slicing GUI
#
https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.o...
@@ -161,6 +161,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Fri Jun 17 2022 Python Maint <python-maint(a)redhat.com> - 1:4.13.1-3
+- Rebuilt for Python 3.11
+
* Wed Feb 02 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.13.1-2
- Fix error loading SentryLogger plugin
commit 09e47bc370e737e4033112c953f44a618a4805de
Author: Gabriel Féron <feron.gabriel(a)gmail.com>
Date: Wed Feb 2 22:54:48 2022 +0100
Remove SentryLogger plugin to avoid error on startup
diff --git a/028e7f7.patch b/028e7f7.patch
new file mode 100644
index 0000000..5d61daa
--- /dev/null
+++ b/028e7f7.patch
@@ -0,0 +1,35 @@
+From 028e7f7c4e6a2d3c93d179f4701111713c34cef3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <g(a)leirbag.net>
+Date: Wed, 2 Feb 2022 22:43:23 +0100
+Subject: [PATCH] Remove SentryLogger
+
+---
+ cura/CuraApplication.py | 3 ---
+ plugins/Cura-OctoPrintPlugin | 1 +
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+ create mode 160000 plugins/Cura-OctoPrintPlugin
+
+diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py
+index bf60da374b..146db339c9 100755
+--- a/cura/CuraApplication.py
++++ b/cura/CuraApplication.py
+@@ -782,9 +782,6 @@ class CuraApplication(QtApplication):
+
self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)),
"..", "plugins"))
+ self._plugin_registry.preloaded_plugins.append("ConsoleLogger")
+
+- # Since it's possible to get crashes in code before the sentrylogger is
loaded, we want to start this plugin
+- # as quickly as possible, as we might get unsolvable crash reports without it.
+- self._plugin_registry.preloaded_plugins.append("SentryLogger")
+ self._plugin_registry.loadPlugins()
+
+ if self.getBackend() is None:
+diff --git a/plugins/Cura-OctoPrintPlugin b/plugins/Cura-OctoPrintPlugin
+new file mode 160000
+index 0000000000..7bd73946fb
+--- /dev/null
++++ b/plugins/Cura-OctoPrintPlugin
+@@ -0,0 +1 @@
++Subproject commit 7bd73946fbf22d18337dc900a81a011ece26bee0
+--
+2.34.1
+
diff --git a/cura.spec b/cura.spec
index be974a8..c63a4f1 100644
--- a/cura.spec
+++ b/cura.spec
@@ -4,7 +4,7 @@
Name: cura
Epoch: 1
Version: %{major_minor_version}.%{patch_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D printer / slicing GUI
#
https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.o...
@@ -17,6 +17,9 @@ Source0:
https://github.com/Ultimaker/Cura/archive/%{version}.tar.gz#/%{n
# Can be removed when
https://github.com/Ultimaker/Cura/pull/11246 is merged
Patch0:
https://github.com/Ultimaker/Cura/commit/aad4180.patch
+# Skip forced loading SentryLogger to avoid an error on startup
+Patch1: 028e7f7.patch
+
BuildArch: noarch
BuildRequires: cmake
@@ -126,7 +129,7 @@ rm -rf
%{buildroot}%{_datadir}/%{name}/resources/themes/cura-light/fonts/
ln -s %{_datadir}/fonts/open-sans/
%{buildroot}%{_datadir}/%{name}/resources/themes/cura-light/fonts
# Remove failing plugins
-rm -r %{buildroot}%{_prefix}/lib/cura/plugins/{UFPReader,UFPWriter}
+rm -r %{buildroot}%{_prefix}/lib/cura/plugins/{SentryLogger,UFPReader,UFPWriter}
# Bytecompile the plugins
%py_byte_compile %{__python3} %{buildroot}%{_prefix}/lib/cura
@@ -158,6 +161,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Wed Feb 02 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.13.1-2
+- Fix error loading SentryLogger plugin
+
* Tue Feb 01 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.13.1-1
- Update to 4.13.1
commit 74ff62b3b2e5fd7bd743e8c52820122cbf0c5386
Author: Gabriel Féron <feron.gabriel(a)gmail.com>
Date: Tue Feb 1 11:09:18 2022 +0100
Update to 4.13.1
diff --git a/cura.spec b/cura.spec
index 21837f4..be974a8 100644
--- a/cura.spec
+++ b/cura.spec
@@ -1,6 +1,9 @@
+%global major_minor_version 4.13
+%global patch_version 1
+
Name: cura
Epoch: 1
-Version: 4.13.0
+Version: %{major_minor_version}.%{patch_version}
Release: 1%{?dist}
Summary: 3D printer / slicing GUI
@@ -39,14 +42,13 @@ Requires: python3-keyring
Requires: python3-pyserial
Requires: python3-pynest2d
Requires: python3-requests
-Requires: python3-charon >= 4.10
Requires: python3-savitar == %{version}
Requires: python3-uranium == %{version}
Requires: python3-zeroconf
Requires: qt5-qtquickcontrols
Requires: qt5-qtquickcontrols2
Requires: CuraEngine == %{epoch}:%{version}
-Requires: cura-fdm-materials >= %{version}
+Requires: cura-fdm-materials >= %{major_minor_version}
# Workaround for
https://bugzilla.redhat.com/show_bug.cgi?id=1494278
Requires: libglvnd-devel
@@ -123,6 +125,9 @@ popd
rm -rf %{buildroot}%{_datadir}/%{name}/resources/themes/cura-light/fonts/
ln -s %{_datadir}/fonts/open-sans/
%{buildroot}%{_datadir}/%{name}/resources/themes/cura-light/fonts
+# Remove failing plugins
+rm -r %{buildroot}%{_prefix}/lib/cura/plugins/{UFPReader,UFPWriter}
+
# Bytecompile the plugins
%py_byte_compile %{__python3} %{buildroot}%{_prefix}/lib/cura
@@ -153,6 +158,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Tue Feb 01 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.13.1-1
+- Update to 4.13.1
+
* Thu Jan 20 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.13.0-1
- Update to 4.13.0
diff --git a/sources b/sources
index a3ed8d7..d9421a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cura-4.12.1.tar.gz) =
397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
+SHA512 (cura-4.13.1.tar.gz) =
6483fd6312bd2181cc812bce78aadc7e8532ecf292f09c75ce5e7870f7efddd63e84315ab40eb73c775b15c2ed2ce7fc804fcbefb73b3d8aaac77d8b22f0cbd0
commit abdc2ce137906d079e4a5703c1fb0e3142a2f4a1
Author: Gabriel Féron <feron.gabriel(a)gmail.com>
Date: Tue Jan 11 21:00:11 2022 +0100
Add missing epoch in changelog entries
diff --git a/cura.spec b/cura.spec
index 328cc8e..21837f4 100644
--- a/cura.spec
+++ b/cura.spec
@@ -153,7 +153,7 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
-* Thu Jan 20 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.13.0-1
+* Thu Jan 20 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.13.0-1
- Update to 4.13.0
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.12.1-3
@@ -162,10 +162,10 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
* Sun Jan 02 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.12.1-2
- Backport fix for Python 3.10
-* Mon Dec 13 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.12.1-1
+* Mon Dec 13 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.12.1-1
- Update to 4.12.1
-* Mon Aug 16 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.10.0-1
+* Mon Aug 16 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.10.0-1
- Update to 4.10.0
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.9.1-2
@@ -177,7 +177,7 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 1:4.9.0-2
- Rebuilt for Python 3.10
-* Mon Apr 26 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.9.0-1
+* Mon Apr 26 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.9.0-1
- Update to 4.9.0
* Mon Mar 22 2021 Miro Hrončok <mhroncok(a)redhat.com> - 1:4.8.0-3
@@ -193,7 +193,7 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
* Thu Sep 03 2020 Miro Hrončok <mhroncok(a)redhat.com> - 1:4.7.1-1
- Update to 4.7.1
-* Mon Aug 31 2020 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.7.0-1
+* Mon Aug 31 2020 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.7.0-1
- Update to 4.7.0
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.6.1-3
@@ -202,16 +202,16 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
* Tue May 26 2020 Miro Hrončok <mhroncok(a)redhat.com> - 1:4.6.1-2
- Rebuilt for Python 3.9
-* Tue May 5 2020 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.6.0-1
+* Tue May 5 2020 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.6.0-1
- Update to 4.6.1
-* Tue Apr 21 2020 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.6.0-1
+* Tue Apr 21 2020 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.6.0-1
- Update to 4.6.0
* Tue Jan 28 2020 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.4.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-* Thu Nov 21 2019 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.4.0-1
+* Thu Nov 21 2019 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.4.0-1
- Update to 4.4.0
- Force X11 to workaround invisible window on Wayland
@@ -224,10 +224,10 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.1.0-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-* Tue Jun 18 2019 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.1.0-1
+* Tue Jun 18 2019 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.1.0-1
- Update to 4.1.0
-* Thu Apr 04 2019 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.0.0-1
+* Thu Apr 04 2019 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.0.0-1
- Update to 4.0.0
* Thu Jan 31 2019 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:3.6.0-2
commit 4a6409ff145e60febdb95ab3f55e2e9c89f03e13
Author: Gabriel Féron <feron.gabriel(a)gmail.com>
Date: Tue Jan 11 20:59:08 2022 +0100
Update to 4.13.0
diff --git a/aad4180.patch b/aad4180.patch
new file mode 100644
index 0000000..30d2297
--- /dev/null
+++ b/aad4180.patch
@@ -0,0 +1,22 @@
+From aad41807c365ccef001b787407d7dc756e11de02 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <g(a)leirbag.net>
+Date: Tue, 11 Jan 2022 20:28:41 +0100
+Subject: [PATCH] Remove unused import of sentry_sdk
+
+---
+ cura/CrashHandler.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py
+index c911a423504..35e9aa832be 100644
+--- a/cura/CrashHandler.py
++++ b/cura/CrashHandler.py
+@@ -12,8 +12,6 @@
+ import locale
+ from typing import cast, Any
+
+-import sentry_sdk
+-
+ try:
+ from sentry_sdk.hub import Hub
+ from sentry_sdk.utils import event_from_exception
diff --git a/cura.spec b/cura.spec
index 87ae744..328cc8e 100644
--- a/cura.spec
+++ b/cura.spec
@@ -1,11 +1,7 @@
-%global major_minor_version 4.12
-%global next_major_minor_version 4.13
-%global patch_version 1
-
Name: cura
Epoch: 1
-Version: %{major_minor_version}.%{patch_version}
-Release: 3%{?dist}
+Version: 4.13.0
+Release: 1%{?dist}
Summary: 3D printer / slicing GUI
#
https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.o...
@@ -14,10 +10,9 @@ License: LGPLv3+
URL:
https://ultimaker.com/en/products/cura-software
Source0:
https://github.com/Ultimaker/Cura/archive/%{version}.tar.gz#/%{name}-%{ve...
-# Cast pixels to integers, for Python 3.10+
-#
https://github.com/Ultimaker/Cura/issues/10785
-# Merged upstream, can be removed starting with 4.13
-Patch1:
https://github.com/Ultimaker/Cura/commit/e0e227404f.patch
+# Fixes wrong import
+# Can be removed when
https://github.com/Ultimaker/Cura/pull/11246 is merged
+Patch0:
https://github.com/Ultimaker/Cura/commit/aad4180.patch
BuildArch: noarch
@@ -44,13 +39,14 @@ Requires: python3-keyring
Requires: python3-pyserial
Requires: python3-pynest2d
Requires: python3-requests
+Requires: python3-charon >= 4.10
Requires: python3-savitar == %{version}
Requires: python3-uranium == %{version}
Requires: python3-zeroconf
Requires: qt5-qtquickcontrols
Requires: qt5-qtquickcontrols2
Requires: CuraEngine == %{epoch}:%{version}
-Requires: (cura-fdm-materials >= %{major_minor_version} with cura-fdm-materials
< %{next_major_minor_version})
+Requires: cura-fdm-materials >= %{version}
# Workaround for
https://bugzilla.redhat.com/show_bug.cgi?id=1494278
Requires: libglvnd-devel
@@ -157,6 +153,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Thu Jan 20 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.13.0-1
+- Update to 4.13.0
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.12.1-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/e0e227404f.patch b/e0e227404f.patch
deleted file mode 100644
index 3fc19bc..0000000
--- a/e0e227404f.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e0e227404f90d4d9d4e85612e9560b0843dec4e2 Mon Sep 17 00:00:00 2001
-From: Karl Nilsson <karl.robert.nilsson(a)gmail.com>
-Date: Thu, 18 Nov 2021 11:36:20 +0100
-Subject: [PATCH] Fix picking pixel on integer indices
-
-The QImage.pixel() function should only get integers.
-In theory an input position of -2,-2 would get rounded to 0 now. However that
shouldn't occur because the user can't click outside of the window. And if it does
occur, it's not really a problem either that it's theoretically picking a position
inside of the window when you click slightly next to it.
-
-Fixes #10785.
----
- cura/PickingPass.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cura/PickingPass.py b/cura/PickingPass.py
-index 54e886fe62a..4d6ef671df8 100644
---- a/cura/PickingPass.py
-+++ b/cura/PickingPass.py
-@@ -72,8 +72,8 @@ def getPickedDepth(self, x: int, y: int) -> float:
-
- window_size = self._renderer.getWindowSize()
-
-- px = (0.5 + x / 2.0) * window_size[0]
-- py = (0.5 + y / 2.0) * window_size[1]
-+ px = int((0.5 + x / 2.0) * window_size[0])
-+ py = int((0.5 + y / 2.0) * window_size[1])
-
- if px < 0 or px > (output.width() - 1) or py < 0 or py >
(output.height() - 1):
- return -1
commit 05ce9a5d346fb14ebe13b6e3953aeaa289d4dc83
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Thu Jan 20 00:08:09 2022 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/cura.spec b/cura.spec
index 48991b4..87ae744 100644
--- a/cura.spec
+++ b/cura.spec
@@ -5,7 +5,7 @@
Name: cura
Epoch: 1
Version: %{major_minor_version}.%{patch_version}
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: 3D printer / slicing GUI
#
https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.o...
@@ -157,6 +157,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.12.1-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
* Sun Jan 02 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.12.1-2
- Backport fix for Python 3.10
commit 18391ffb3e94af12f47572b729adbd149476be9d
Author: Gabriel Féron <feron.gabriel(a)gmail.com>
Date: Sun Jan 2 13:55:49 2022 +0100
Python 3.10 int/float fix, GitHub issue #10785
diff --git a/cura.spec b/cura.spec
index 72ebd26..48991b4 100644
--- a/cura.spec
+++ b/cura.spec
@@ -5,7 +5,7 @@
Name: cura
Epoch: 1
Version: %{major_minor_version}.%{patch_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D printer / slicing GUI
#
https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.o...
@@ -14,6 +14,11 @@ License: LGPLv3+
URL:
https://ultimaker.com/en/products/cura-software
Source0:
https://github.com/Ultimaker/Cura/archive/%{version}.tar.gz#/%{name}-%{ve...
+# Cast pixels to integers, for Python 3.10+
+#
https://github.com/Ultimaker/Cura/issues/10785
+# Merged upstream, can be removed starting with 4.13
+Patch1:
https://github.com/Ultimaker/Cura/commit/e0e227404f.patch
+
BuildArch: noarch
BuildRequires: cmake
@@ -152,6 +157,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Sun Jan 02 2022 Gabriel Féron <feron.gabriel(a)gmail.com> - 1:4.12.1-2
+- Backport fix for Python 3.10
+
* Mon Dec 13 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.12.1-1
- Update to 4.12.1
diff --git a/e0e227404f.patch b/e0e227404f.patch
new file mode 100644
index 0000000..3fc19bc
--- /dev/null
+++ b/e0e227404f.patch
@@ -0,0 +1,28 @@
+From e0e227404f90d4d9d4e85612e9560b0843dec4e2 Mon Sep 17 00:00:00 2001
+From: Karl Nilsson <karl.robert.nilsson(a)gmail.com>
+Date: Thu, 18 Nov 2021 11:36:20 +0100
+Subject: [PATCH] Fix picking pixel on integer indices
+
+The QImage.pixel() function should only get integers.
+In theory an input position of -2,-2 would get rounded to 0 now. However that
shouldn't occur because the user can't click outside of the window. And if it does
occur, it's not really a problem either that it's theoretically picking a position
inside of the window when you click slightly next to it.
+
+Fixes #10785.
+---
+ cura/PickingPass.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cura/PickingPass.py b/cura/PickingPass.py
+index 54e886fe62a..4d6ef671df8 100644
+--- a/cura/PickingPass.py
++++ b/cura/PickingPass.py
+@@ -72,8 +72,8 @@ def getPickedDepth(self, x: int, y: int) -> float:
+
+ window_size = self._renderer.getWindowSize()
+
+- px = (0.5 + x / 2.0) * window_size[0]
+- py = (0.5 + y / 2.0) * window_size[1]
++ px = int((0.5 + x / 2.0) * window_size[0])
++ py = int((0.5 + y / 2.0) * window_size[1])
+
+ if px < 0 or px > (output.width() - 1) or py < 0 or py >
(output.height() - 1):
+ return -1
commit e95f254b575b1686d9f532267af068dd5927a797
Author: Gabriel Féron <feron.gabriel(a)gmail.com>
Date: Mon Dec 13 09:53:50 2021 +0100
Update to 4.12.1
diff --git a/cura.spec b/cura.spec
index 347212d..72ebd26 100644
--- a/cura.spec
+++ b/cura.spec
@@ -1,6 +1,10 @@
+%global major_minor_version 4.12
+%global next_major_minor_version 4.13
+%global patch_version 1
+
Name: cura
Epoch: 1
-Version: 4.11.0
+Version: %{major_minor_version}.%{patch_version}
Release: 1%{?dist}
Summary: 3D printer / slicing GUI
@@ -41,7 +45,7 @@ Requires: python3-zeroconf
Requires: qt5-qtquickcontrols
Requires: qt5-qtquickcontrols2
Requires: CuraEngine == %{epoch}:%{version}
-Requires: cura-fdm-materials == %{version}
+Requires: (cura-fdm-materials >= %{major_minor_version} with cura-fdm-materials
< %{next_major_minor_version})
# Workaround for
https://bugzilla.redhat.com/show_bug.cgi?id=1494278
Requires: libglvnd-devel
@@ -148,6 +152,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Mon Dec 13 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.12.1-1
+- Update to 4.12.1
+
* Mon Aug 16 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.10.0-1
- Update to 4.10.0
diff --git a/sources b/sources
index 37d2999..a3ed8d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cura-4.11.0.tar.gz) =
39ca06047123a08e7e00a9c89f96fce2da2aad2e6c4a937bed8fb668602dc37c02fe8db5d0e653d180f2c84c8b2561631a3942ebfaf17deaf7f1fbe771aed164
+SHA512 (cura-4.12.1.tar.gz) =
397048e1ed93d2e3ec326a3b0564db2b6ee2b239843346e2dd44470b11b5aea86f3f519534270789e020261c87a0100bf3bba39ddbd3a1d8be0e38e68fd7e0c0
commit ce07b1dbb007a9ad431e56fc7d39512dfb7cff0c
Author: Gabriel Féron <feron.gabriel(a)gmail.com>
Date: Thu Sep 16 00:00:50 2021 +0200
Update to 4.11.0
diff --git a/cura.spec b/cura.spec
index 181b3da..347212d 100644
--- a/cura.spec
+++ b/cura.spec
@@ -1,6 +1,6 @@
Name: cura
Epoch: 1
-Version: 4.10.0
+Version: 4.11.0
Release: 1%{?dist}
Summary: 3D printer / slicing GUI
diff --git a/sources b/sources
index d510495..37d2999 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cura-4.10.0.tar.gz) =
8943fffa70acaf139c714d698588df4a503951adac70d130eaa7795040eaf6bb823fae53f9ee1adc3c2dab1e86ebe5cfe40ba5acb63d954ee97bfd7bfe134426
+SHA512 (cura-4.11.0.tar.gz) =
39ca06047123a08e7e00a9c89f96fce2da2aad2e6c4a937bed8fb668602dc37c02fe8db5d0e653d180f2c84c8b2561631a3942ebfaf17deaf7f1fbe771aed164
commit 2993aeb449155839d870cc250991929e309ba551
Author: Gabriel Féron <feron.gabriel(a)gmail.com>
Date: Mon Aug 16 12:10:16 2021 +0200
Update to 4.10.0
diff --git a/cura-9702.patch b/cura-9702.patch
deleted file mode 100644
index e45a4ae..0000000
--- a/cura-9702.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e26cf6f8102b5d7010a74b9257007d34e70b9ea8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <g(a)leirbag.net>
-Date: Mon, 26 Apr 2021 11:07:11 +0200
-Subject: [PATCH] Fix test_wrongServerResponses
-
----
- tests/TestOAuth2.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/TestOAuth2.py b/tests/TestOAuth2.py
-index 6b7e28917..731a31690 100644
---- a/tests/TestOAuth2.py
-+++ b/tests/TestOAuth2.py
-@@ -46,7 +46,7 @@ NO_REFRESH_AUTH_RESPONSE = AuthenticationResponse(
- success = True
- )
-
--MALFORMED_AUTH_RESPONSE = AuthenticationResponse()
-+MALFORMED_AUTH_RESPONSE = AuthenticationResponse(success=False)
-
-
- def test_cleanAuthService() -> None:
---
-2.31.1
-
diff --git a/cura.spec b/cura.spec
index 93e5b2b..181b3da 100644
--- a/cura.spec
+++ b/cura.spec
@@ -1,7 +1,7 @@
Name: cura
Epoch: 1
-Version: 4.9.1
-Release: 2%{?dist}
+Version: 4.10.0
+Release: 1%{?dist}
Summary: 3D printer / slicing GUI
#
https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.o...
@@ -10,9 +10,6 @@ License: LGPLv3+
URL:
https://ultimaker.com/en/products/cura-software
Source0:
https://github.com/Ultimaker/Cura/archive/%{version}.tar.gz#/%{name}-%{ve...
-#
https://github.com/Ultimaker/Cura/pull/9702
-Patch0: %{name}-9702.patch
-
BuildArch: noarch
BuildRequires: cmake
@@ -151,6 +148,9 @@ desktop-file-validate
%{buildroot}%{_datadir}/applications/%{reverse_dns_name}.d
%{_prefix}/lib/%{name}
%changelog
+* Mon Aug 16 2021 Gabriel Féron <feron.gabriel(a)gmail.com> - 4.10.0-1
+- Update to 4.10.0
+
* Wed Jul 21 2021 Fedora Release Engineering <releng(a)fedoraproject.org> -
1:4.9.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
diff --git a/sources b/sources
index 8c56b27..d510495 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cura-4.9.1.tar.gz) =
436b8e33514de67d6d680fe59ab9599a75a86caa7e63fbcd05297b12a435483ec0c9ca90557fe23f25590a24e533294915fc18a665fd5cdb77fcc3a05a9076bf
+SHA512 (cura-4.10.0.tar.gz) =
8943fffa70acaf139c714d698588df4a503951adac70d130eaa7795040eaf6bb823fae53f9ee1adc3c2dab1e86ebe5cfe40ba5acb63d954ee97bfd7bfe134426