Hello community, here is the log from the commit of package cura for openSUSE:Factory checked in at 2020-12-07 15:01:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cura (Old) and /work/SRC/openSUSE:Factory/.cura.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cura" Mon Dec 7 15:01:57 2020 rev:13 rq:853556 version:4.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cura/cura.changes 2020-11-23 18:40:54.764772563 +0100 +++ /work/SRC/openSUSE:Factory/.cura.new.5913/cura.changes 2020-12-07 15:01:58.344819806 +0100 @@ -1,0 +2,6 @@ +Mon Dec 7 10:12:24 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Resurrect 0001-Avoid-crash-caused-by-KDE-qqc2-desktop-style.patch +- Correct icon install paths + +------------------------------------------------------------------- New: ---- 0001-Avoid-crash-caused-by-KDE-qqc2-desktop-style.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cura.spec ++++++ --- /var/tmp/diff_new_pack.jaB0Nb/_old 2020-12-07 15:01:59.108820660 +0100 +++ /var/tmp/diff_new_pack.jaB0Nb/_new 2020-12-07 15:01:59.112820664 +0100 @@ -27,6 +27,8 @@ Source: https://github.com/Ultimaker/Cura/archive/%{sversion}.tar.gz#/%{name}-%{version}.tar.gz # PATCH-FIX-OPENSUSE disable-code-style-check.patch code style is no distro business Patch1: disable-code-style-check.patch +# PATCH-FIX-OPENSUSE -- avoid bad UI layout and crash in preview +Patch2: 0001-Avoid-crash-caused-by-KDE-qqc2-desktop-style.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: python3-Arcus >= %{version} @@ -80,6 +82,7 @@ %prep %setup -q -n Cura-%sversion %patch1 -p1 +%patch2 -p1 sed -i -e '1 s/env python3/python3/' cura_app.py %build @@ -100,8 +103,8 @@ %cmake_install for x in 128 64 48 32; do - install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/${x}x${x} - install -m 644 icons/cura-${x}.png %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/cura-icon.png + install -m 755 -d %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps/ + install -m 644 icons/cura-${x}.png %{buildroot}%{_datadir}/icons/hicolor/${x}x${x}/apps/cura-icon.png done # i18n sources (po/pot) are installed in cura/resources, .mo in uranium/resources ++++++ 0001-Avoid-crash-caused-by-KDE-qqc2-desktop-style.patch ++++++ From d54db37c125ecc057246f656c014ea849f6a0dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de> Date: Sun, 7 Jun 2020 20:05:23 +0200 Subject: [PATCH] Avoid crash caused by KDE qqc2-desktop-style https://bugs.kde.org/show_bug.cgi?id=417900 --- cura_app.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cura_app.py b/cura_app.py index a78e7cabd..7c9771d20 100755 --- a/cura_app.py +++ b/cura_app.py @@ -230,5 +230,11 @@ if ApplicationMetadata.CuraDebugMode: ssl_conf.setPeerVerifyMode(QSslSocket.VerifyNone) QSslConfiguration.setDefaultConfiguration(ssl_conf) +# WORKAROUND: CURA-5488 +# When using the KDE qqc2-desktop-style, the UI layout is completely broken, and +# even worse, it crashes when switching to the "Preview" pane. +if Platform.isLinux(): + os.environ["QT_QUICK_CONTROLS_STYLE"] = "material" + app = CuraApplication() app.run() -- 2.26.2 _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
