Accepting request 960896 from KDE:Frameworks5

KDE Plasma 5.24.3 OBS-URL: https://build.opensuse.org/request/show/960896 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=186
2022-03-12 16:15:05 +00:00 · 2022-03-12 16:15:05 +00:00 · d858bf10c9
commit d858bf10c9
parent 7d0ae18e0e c836ac01de
7 changed files with 71 additions and 72 deletions
--- a/0001-startkde-Forward-stdout-stderr-of-started-processes.patch
+++ b/0001-startkde-Forward-stdout-stderr-of-started-processes.patch
@ -1,50 +0,0 @@
-From b525767c86cd90b21d5079a4642f01b64941fd79 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Wed, 23 Feb 2022 22:44:28 +0100
-Subject: [PATCH] startkde: Forward stdout/stderr of started processes
-
-QProcess::start defaults to capturing all output, but that got lost as it is
-never read. Set QProcess::ForwardedChannels explicitly where it was missing,
-so that output ends up in the correct place again.
-
-(cherry picked from commit d1155030afb5f94fc81e7afc4d1480d21d7d73f9)
---
- startkde/plasma-session/startup.cpp | 2 ++
- startkde/startplasma.cpp            | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
-index 246d88b35..9078c1f16 100644
--- a/startkde/plasma-session/startup.cpp
-+++ b/startkde/plasma-session/startup.cpp
-@@ -246,6 +246,7 @@ bool Startup::startDetached(const QString &program, const QStringList &args)
- 
- bool Startup::startDetached(QProcess *process)
- {
-+    process->setProcessChannelMode(QProcess::ForwardedChannels);
-     process->start();
-     const bool ret = process->waitForStarted();
-     if (ret) {
-@@ -428,6 +429,7 @@ StartProcessJob::StartProcessJob(const QString &process, const QStringList &args
- {
-     m_process->setProgram(process);
-     m_process->setArguments(args);
-+    m_process->setProcessChannelMode(QProcess::ForwardedChannels);
-     auto env = QProcessEnvironment::systemEnvironment();
-     env.insert(additionalEnv);
-     m_process->setProcessEnvironment(env);
-diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index a68e7c023..bd848dda0 100644
--- a/startkde/startplasma.cpp
-+++ b/startkde/startplasma.cpp
-@@ -500,6 +500,7 @@ QProcess *setupKSplash()
-         KConfigGroup ksplashCfg = cfg.group("KSplash");
-         if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
-             p = new QProcess;
-+            p->setProcessChannelMode(QProcess::ForwardedChannels);
-             p->start(QStringLiteral("ksplashqml"), {ksplashCfg.readEntry("Theme", QStringLiteral("Breeze"))});
-         }
-     }
-- 
-2.34.0
-
--- a/plasma-workspace-5.24.2.tar.xz
+++ b/plasma-workspace-5.24.2.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e7fd2ad7c067710401f7322789ce796c3ad5e02a3813bdfb84ebd5dbd8787d11
-size 18463172
--- a/plasma-workspace-5.24.2.tar.xz.sig
+++ b/plasma-workspace-5.24.2.tar.xz.sig
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmIU1mkACgkQ11dEg7tX
-sY3Xxg/7BwFIMi8CKT5rWJCrfQSbbSMtD2zMaM7ieM2IAqvE/VYWyNZcYxtV7yKk
-z8/he0M/A9UuN1H+4hd8O+U7Etd8rRZiNfvfVhKU7hJIvTuw6MI6vb1Ruk0vzfka
-AQqGFjUdxUEfvU9Yn8QMV/s78bhTaNbSCs3LYviuf+cnxidFlQZtvoJmZSt832Bf
-v0VJpZ2xO2GQmOSLjFJ5ZXc2Cp8oOvRCAouPyL94ROaZOd5CwoGPq/6C+XBP0c0q
-63ZPTwnsex+/2v1Vv6gJ97kZmz4DRRMN6KslAs44SJHHMW4hRt2I3zDBrMQg6ix7
-nc0Z/VZ1M8nojbyQt8E6UhoS6PKy18VcY14y+gn73kmkUGhLxtQB6Ckyg8LJOqtT
-wung3N3V5Bj8SUyYWRiLbfvUaPT2lfLShUYYFhIwupiJXSNdkL4iucix5EPdr3Uc
-oGXH1jC7Fn2QpaCeONNHIEuvm4UdXgV52ReGJ8i2nZV9SUMO/yK/2dWzh9mWyOj0
-57jaL9XvHx2ZJSRpiTef2Lk5nyibwvlFxYSROJ2NxiSzCXNKm4I4AJHqjGfQHwNF
-9K1PlX/OYUR25usg1ETPcNKJTCcXkHVv9AarVO2ly1lywn8yI14ovH0izhRA/f8J
-ClTmV37P02CEf6UcVD39jW7+72MnH9xvTb8RCz1qYMddPp8zVyE=
-=R0ua
-----END PGP SIGNATURE-----
--- a/plasma-workspace-5.24.3.tar.xz
+++ b/plasma-workspace-5.24.3.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:104c5c0ebb000f48c749a6bafdde4cbb1b06d188e1a23ef95a2d035cce442ab4
+size 18481188
--- a/plasma-workspace-5.24.3.tar.xz.sig
+++ b/plasma-workspace-5.24.3.tar.xz.sig
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmInP4EACgkQ11dEg7tX
+sY2TIw/+PpyN4ulZa+GK3HH/yDG1J13N6UE55gsE1ZnVVNOhhnogQusofoCvT8yj
+RU1TjM86jt3d004YcIYDy0oNRooPE+WmdhGMTI0KY7wJJI3M0dH5gD0o2R18W1xc
+P76Q1dQQ012pUyLXtGztO82LVjFAaf3/fCsNfJo9JZd9Yv6ZKfmk9twGB6V3m3R1
+H7B/cFRcbCYPmueN+1kMgEL3sGcOx+ij4/JZDIFUxMkD+WvGa9o5ejOddU4k02VN
+9becmcBv2/dU7hbk8Ti9C3GaMKF1W2HDYkpLFTKhKTvLD5gOgTaJEa8HVfvLIjxK
+8jFtkyX614C1Z+1Oj0KbtlFhXQmArx2Pt5MyQqs06uq24YvkQVpimj3p+1FCRpM/
+d5M88GhOihP6ktf1RaA720wCE+W48ALe0H3r2MHVgP4lOzsX1Kim8ii957UFEK9Y
+iNk2xCCmaG80FZs8WsLTIsLZ3U/ZZ9FAcuWAyRDu5hoAlml/Mw65eo2uRK3ntp1M
+L7Z9BADovuf10as6jdYWRnqftB1fyexVRegfk+AP4J8Iz6Mzm8xO/OZmt3L8L9We
+yvbnLJJpYVMYDJxN3u3JxPUa4xPbGbsR1Mb8+ABnqsepqfsZkP4Ezht+prcLsKyW
+PmItHAdGQRaSGMg4B6ZFDN99GxtdQn0m5ENDr9K4yumhmMpTjHY=
+=KmJ5
+-----END PGP SIGNATURE-----
--- a/plasma5-workspace.changes
+++ b/plasma5-workspace.changes
@ -1,3 +1,36 @@
+-------------------------------------------------------------------
+Tue Mar  8 18:10:02 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.24.3
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/plasma/5/5.24.3
+- Changes since 5.24.2:
+  * kcms/colors: Implement radio button layouts better
+  * kcms/colors: fix spacing between radio buttons and content
+  * [Battery Monitor] Only show charge threshold hint for power supply batteries (kde#451161)
+  * [Icons KCM] Give measure delegate a text
+  * wallpapers: Sort BackgroundListModel by title
+  * applets/digital-clock: Fix `Qt.formatDateTime` returns different date when minute changes (kde#436796)
+  * applets/systray: align applet labels with differing line counts in hidden view (kde#438347)
+  * Show panel config above other windows (kde#450794)
+  * Use current accent colour to set ColorDialog object in colour picker
+  * SystemDialog: Allow accepting the dialogs with the keyboard (kde#450223)
+  * applets/systemtray: Do not open context menu on mouse pressed for SNI (kde#409768)
+  * Revert "Fix overdraw on Wayland"
+  * startkde: Forward stdout/stderr of started processes
+  * SDDM theme: stop eliding people's names so aggressively (kde#450673)
+  * applets/digital-clock: Word-wrap date string for desktop representation (kde#450632)
+  * wrap completely the invariants timer in NDEBUG
+  * ScreenPool as the source of truth of QScreen info
+  * Always ensure there is an user selected (kde#450182)
+  * Prevent panel going out of screen boundaries
+  * applets/clipboard: Focus on text area when transition is done
+  * applets/clipboard: Fix highlight after exiting edit mode
+- Drop patches, now upstream:
+  * 0001-startkde-Forward-stdout-stderr-of-started-processes.patch
+- Restore compatibility with older kf5-filesystem
+
 -------------------------------------------------------------------
 Mon Mar  7 11:04:58 UTC 2022 - Christophe Giboudeaux <christophe@krop.fr>

--- a/plasma5-workspace.spec
+++ b/plasma5-workspace.spec
@ -29,7 +29,7 @@ Name:           plasma5-workspace
 %{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
 # Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
 %{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
-Version:        5.24.2
+Version:        5.24.3
 Release:        0
 Summary:        The KDE Plasma Workspace Components
 License:        GPL-2.0-or-later
@ -41,8 +41,6 @@ Source1:        https://download.kde.org/stable/plasma/%{version}/plasma-workspa
 Source2:        plasma.keyring
 %endif
 Source3:        xprop-kde-full-session.desktop
-# PATCH-FIX-UPSTREAM
-Patch1:         0001-startkde-Forward-stdout-stderr-of-started-processes.patch
 # PATCHES 501-??? are PATCH-FIX-OPENSUSE
 Patch501:       0001-Use-qdbus-qt5.patch
 Patch502:       0001-Ignore-default-sddm-face-icons.patch
@ -473,11 +471,20 @@ fi

 %config %{_kf5_configdir}/taskmanagerrulesrc
 %config %{_kf5_configdir}/plasmanotifyrc
+%if %{pkg_vcmp kf5-filesystem >= 20220307}
 %{_libexecdir}/ksmserver-logout-greeter
 %{_libexecdir}/plasma-changeicons
 %{_libexecdir}/baloorunner
 %{_libexecdir}/plasma-sourceenv.sh
 %{_libexecdir}/plasma-dbus-run-session-if-needed
+%else
+%dir %{_kf5_libdir}/libexec
+%{_kf5_libdir}/libexec/ksmserver-logout-greeter
+%{_kf5_libdir}/libexec/plasma-changeicons
+%{_kf5_libdir}/libexec/baloorunner
+%{_kf5_libdir}/libexec/plasma-sourceenv.sh
+%{_kf5_libdir}/libexec/plasma-dbus-run-session-if-needed
+%endif
 %{_kf5_libdir}/kconf_update_bin/krunnerglobalshortcuts
 %{_kf5_libdir}/kconf_update_bin/krunnerhistory
 %{_kf5_plugindir}/
@ -540,11 +547,20 @@ fi
 %{_kf5_sharedir}/kpackage/kcms/kcm_translations
 # %%{_kf5_sharedir}/kpackage/kcms/kcm_feedback
 %{_kf5_sharedir}/kpackage/kcms/kcm_desktoptheme
+%if %{pkg_vcmp kf5-filesystem >= 20220307}
 %dir %{_libexecdir}/kauth
 %{_libexecdir}/kauth/fontinst
 %{_libexecdir}/kauth/fontinst_helper
 %{_libexecdir}/kauth/fontinst_x11
 %{_libexecdir}/kfontprint
+%else
+%dir %{_kf5_libdir}/libexec/kauth
+%{_kf5_libdir}/libexec/kauth/fontinst
+%{_kf5_libdir}/libexec/kauth/fontinst_helper
+%{_kf5_libdir}/libexec/kauth/fontinst_x11
+%{_kf5_libdir}/libexec/kfontprint
+%endif
+
 %exclude %{_kf5_libdir}/libkfontinst.so
 %{_kf5_libdir}/libkfontinst.so.*
 %exclude %{_kf5_libdir}/libkfontinstui.so