Accepting request 924731 from KDE:Frameworks5

Plasma 5.23.0, lightly tested. KDE:Frameworks5 is already publish disabled. (forwarded request 924672 from Vogtinator)

OBS-URL: https://build.opensuse.org/request/show/924731
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=175
This commit is contained in:
Dominique Leuenberger 2021-10-13 16:03:46 +00:00 committed by Git OBS Bridge
commit caa5325ee2
11 changed files with 142 additions and 86 deletions

View File

@ -8,11 +8,11 @@ They are not compatible with the theme
lookandfeel/contents/components/UserList.qml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Index: plasma-workspace-5.15.80git.20200820T102416~bcaf3886d/lookandfeel/contents/components/UserList.qml
Index: plasma-workspace-5.17.80git.20210928T142611~d53fd656e/lookandfeel/contents/components/UserList.qml
===================================================================
--- plasma-workspace-5.15.80git.20200820T102416~bcaf3886d.orig/lookandfeel/contents/components/UserList.qml 2020-08-20 18:24:16.000000000 +0200
+++ plasma-workspace-5.15.80git.20200820T102416~bcaf3886d/lookandfeel/contents/components/UserList.qml 2020-08-20 21:38:45.160535922 +0200
@@ -47,7 +47,13 @@
--- plasma-workspace-5.17.80git.20210928T142611~d53fd656e.orig/lookandfeel/contents/components/UserList.qml 2021-09-28 16:26:11.000000000 +0200
+++ plasma-workspace-5.17.80git.20210928T142611~d53fd656e/lookandfeel/contents/components/UserList.qml 2021-09-28 22:02:18.756685636 +0200
@@ -34,7 +34,13 @@
interactive: count > 1
delegate: UserDelegate {
@ -26,4 +26,4 @@ Index: plasma-workspace-5.15.80git.20200820T102416~bcaf3886d/lookandfeel/content
+ }
iconSource: model.iconName || "user-identity"
fontSize: view.fontSize
vtNumber: model.vtNumber

View File

@ -14,19 +14,19 @@ reason not to have them.
3 files changed, 93 insertions(+)
create mode 100644 kioslave/desktop/Home.desktop
Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/CMakeLists.txt
Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/CMakeLists.txt
===================================================================
--- plasma-workspace-5.15.80git.20210121T134153~83e5f9011.orig/kioslave/desktop/CMakeLists.txt 2021-01-21 14:41:53.000000000 +0100
+++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/CMakeLists.txt 2021-01-22 08:39:23.984081176 +0100
@@ -33,3 +33,4 @@
install( FILES desktop.protocol DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
--- plasma-workspace-5.17.80git.20210531T011335~40d302afe.orig/kioslave/desktop/CMakeLists.txt 2021-05-31 03:13:35.000000000 +0200
+++ plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/CMakeLists.txt 2021-05-31 06:59:47.519362944 +0200
@@ -31,3 +31,4 @@
########### install files ###############
install(FILES directory.desktop directory.trash DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop)
+install(FILES Home.desktop DESTINATION ${KDE_INSTALL_DATADIR}/kio_desktop/DesktopLinks)
Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/Home.desktop
Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/Home.desktop
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/Home.desktop 2021-01-22 08:39:23.984081176 +0100
+++ plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/Home.desktop 2021-05-31 06:59:47.519362944 +0200
@@ -0,0 +1,88 @@
+[Desktop Entry]
+Encoding=UTF-8
@ -116,11 +116,11 @@ Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/Ho
+Icon=user-home
+Type=Link
+
Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/kio_desktop.cpp
Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/kio_desktop.cpp
===================================================================
--- plasma-workspace-5.15.80git.20210121T134153~83e5f9011.orig/kioslave/desktop/kio_desktop.cpp 2021-01-21 14:41:53.000000000 +0100
+++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/kioslave/desktop/kio_desktop.cpp 2021-01-22 08:39:23.984081176 +0100
@@ -83,6 +83,10 @@
--- plasma-workspace-5.17.80git.20210531T011335~40d302afe.orig/kioslave/desktop/kio_desktop.cpp 2021-05-31 03:13:35.000000000 +0200
+++ plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/kio_desktop.cpp 2021-05-31 06:59:47.519362944 +0200
@@ -90,6 +90,10 @@
// Copy the .directory file
QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.desktop")), desktopPath + "/.directory");

View File

@ -7,11 +7,11 @@ Subject: [PATCH] Use qdbus-qt5
startkde/startplasma-wayland.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: plasma-workspace-5.15.80git.20210121T134153~83e5f9011/startkde/startplasma-wayland.cpp
Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/startkde/startplasma-wayland.cpp
===================================================================
--- plasma-workspace-5.15.80git.20210121T134153~83e5f9011.orig/startkde/startplasma-wayland.cpp 2021-01-21 14:41:53.000000000 +0100
+++ plasma-workspace-5.15.80git.20210121T134153~83e5f9011/startkde/startplasma-wayland.cpp 2021-01-22 08:39:12.129799633 +0100
@@ -62,7 +62,7 @@
--- plasma-workspace-5.17.80git.20210531T011335~40d302afe.orig/startkde/startplasma-wayland.cpp 2021-05-31 03:13:35.000000000 +0200
+++ plasma-workspace-5.17.80git.20210531T011335~40d302afe/startkde/startplasma-wayland.cpp 2021-05-31 06:59:35.188774369 +0200
@@ -71,7 +71,7 @@
runEnvironmentScripts();
if (!qEnvironmentVariableIsSet("DBUS_SESSION_BUS_ADDRESS")) {

View File

@ -1,35 +0,0 @@
From 6379d1ec8d4a1fce141280eead930a6cdd9282d1 Mon Sep 17 00:00:00 2001
From: Peifeng Yu <7437103@gmail.com>
Date: Mon, 6 Sep 2021 05:24:15 +0000
Subject: [PATCH] Call UnInhibit with correct signature in powermanagement
dataengine
---
dataengines/powermanagement/powermanagementjob.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dataengines/powermanagement/powermanagementjob.cpp b/dataengines/powermanagement/powermanagementjob.cpp
index 90051cf33..dc7883d10 100644
--- a/dataengines/powermanagement/powermanagementjob.cpp
+++ b/dataengines/powermanagement/powermanagementjob.cpp
@@ -104,7 +104,7 @@ void PowerManagementJob::start()
QStringLiteral("/org/freedesktop/PowerManagement/Inhibit"),
QStringLiteral("org.freedesktop.PowerManagement.Inhibit"),
QStringLiteral("UnInhibit"));
- msg << parameters().value(QStringLiteral("cookie")).toInt();
+ msg << parameters().value(QStringLiteral("cookie")).toUInt();
QDBusReply<void> reply = QDBusConnection::sessionBus().call(msg);
setResult(reply.isValid());
return;
@@ -122,7 +122,7 @@ void PowerManagementJob::start()
QStringLiteral("/ScreenSaver"),
QStringLiteral("org.freedesktop.ScreenSaver"),
QStringLiteral("UnInhibit"));
- msg << parameters().value(QStringLiteral("cookie")).toInt();
+ msg << parameters().value(QStringLiteral("cookie")).toUInt();
QDBusReply<uint> reply = QDBusConnection::sessionBus().call(msg);
setResult(reply.isValid());
return;
--
GitLab

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f22e12dea303478d949f69b88fcf30787ef7f5d098be55595ec562aee4b13606
size 8401412

View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmEuGFoACgkQ7JTRj38F
mX7sKAf8DiFUsDze0Zo0mbtI0OMYALyC+wUwo402Foanlcb0+9GdZl5oSFDzb0tF
L25idzmvihewInHPDEk+a0bDDbhTm6NtAtkryVmfSCJvcfUCLjjOT5aJjfJEAxRb
24fCc6qad70h4zPVxgacK6aKQ3ISPv+tK37OTUdzB7MTXRxKHYtPNXMBJE8bm0Ur
6rJL3eq6HiaQUy8E01sk/vbUoTIyTlbgVKe4R+bfDbmeZlSq6mNV9/IQtTrUvJRC
YoeBtOJuQXGRlMYk5jNybCEOXOpI8/7Xmt2FDa4p+UU6iRFPAC0v7NlFH1ppYcnI
buY1xwIpPvMPgHrKmaTOWVkUUtCIng==
=FBkF
-----END PGP SIGNATURE-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49abcb19639a72eb5ffa916d5eca0a925d32a36e4a02658cc73ab479dea39965
size 8995284

View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmFe3toACgkQ11dEg7tX
sY0Qmw/+Iycidd50mPqACLZFoc0mwJJztRBJCXA8M896sAK4fumdIHKiei/EP5mS
gXqLeCs8ONWNvfJl/JWAEw7vin0crVaHIF+IRF49k5Kj87KKKFi5oNN38lS8v0I3
kSakRpBDBjBAspTipYJSgswt+RHGXC7GPU0XLuRED0dV08ibnFNfsn10ODD2vEdq
YXEUPO1w+DHxfswyO+mV+qDwDdWqY2dyJMOXroTGEpsRPsAmnFH09sxGtFGctvGD
S+3OntGXfpT8FAhtg4jIHQVb8954iRwuehJvrMsE5Pqwdli/LTwRB9YQU5Du+sFy
pcS1Lfv+KahJMgVj5jftsDkvoX+ckf4zboYA/AFrRtw96QWp5Js2W9f/Fv+Mi/l3
YdaQL4QjrVYbJ6XEytIAlwbS9ISI8TMlyb02JJUXFK1yQ/V4BzIsO3wVUUHKH7sk
zOm8WfYM+deTbbe1p9Jq6zpObWrcGZ0sfAdzC8cgX8ppKOxyqz/2a2XNPwcEDZ8O
7MIwIj/Va0WhjABOUDtltNCf2JpOUejPnjsa0IeGGpjCneuoDtqW5nINSvKjinx9
s41haMZ3gYySHJP7tg0uwADSLRg1TjdwIx060vhdiVgSrI0w5fKZGstt+CW6sew2
qKFOAgocwqG6RNa4WXKHIJkrNeeOGl3FUuGjFJ3G7pA1Eqed/GE=
=3o/N
-----END PGP SIGNATURE-----

Binary file not shown.

View File

@ -1,3 +1,89 @@
-------------------------------------------------------------------
Thu Oct 7 13:50:12 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.23.0
* New bugfix release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.23.0
- Changes since 5.22.90:
* Revert "xembed: adapt to changes in KNotifications" (kde#442758)
* sddm-theme: Fix using mouse movements to show the UI
* [systemtray] Check for menuItemFactory.object existence (kde#443377)
* applets/devicenotifier: Remove applet list item animations
* sddm-theme: Fix use of needsPassword and related button layout
* [klipper] Fix shortcut of OK button in the clipboard content edit dialog (kde#400623)
* Fix Kickoff context menu actions for System Settings results (kde#442522)
* klipper: Fix reading from plasma on wayland
* Fix build with gpsd 3.23.1
* Unbreak fontinst KCM (kde#442748)
* Address regression in VT switching code (kde#442852)
* libtaskmanager: Don't request dmabuf if not supported (kde#428284)
* Port away from Kirigami.Units.devicePixelRatio
* lookandfeel: don't nuke accent colour (kde#442812)
* kcm/colors: Improve some bindings on accent colors
* sddm-theme: fix default username font size
* PipeWire: Include defines for older PipeWire versions
* pipewire: Properly compare pipewire versions using QVersionNumber
* [Klipper] Guard against broken data fetches
* [Klipper] Handle incoming UTF-8 mime types (kde#424694)
* PipeWire: Make sure thumbnails properly use dmabuf again
* [shell/panel] Fix ability to type in textfield (kde#442557)
- Drop patches, now upstream:
* 0001-Fix-build-with-gpsd-3.23.1.patch
* 0001-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch
* 0002-libtaskmanager-Don-t-request-dmabuf-if-not-supported.patch
* 0002-shell-panel-Fix-ability-to-type-in-textfield.patch
* 0003-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch
* 0004-PipeWire-Make-sure-thumbnails-properly-use-dmabuf-ag.patch
* 0005-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch
* 0006-Klipper-Handle-incoming-UTF-8-mime-types.patch
* 0007-Klipper-Guard-against-broken-data-fetches.patch
* 0008-pipewire-Properly-compare-pipewire-versions-using-QV.patch
* 0009-PipeWire-Include-defines-for-older-PipeWire-versions.patch
* 0010-sddm-theme-fix-default-username-font-size.patch
* 0011-Revert-xembed-adapt-to-changes-in-KNotifications.patch
- Refresh 0001-Ignore-default-sddm-face-icons.patch
- Add new key + signature to plasma.keyring
-------------------------------------------------------------------
Fri Sep 24 10:09:15 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix build with gpsd:
* 0001-Fix-build-with-gpsd-3.23.1.patch
- Add patch to fix window thumbnails if dmabuf is not supported (kde#428284):
* 0002-libtaskmanager-Don-t-request-dmabuf-if-not-supported.patch
-------------------------------------------------------------------
Wed Sep 22 07:18:36 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patches from Plasma/5.23 branch:
* 0001-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch
* 0002-shell-panel-Fix-ability-to-type-in-textfield.patch
* 0003-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch
* 0004-PipeWire-Make-sure-thumbnails-properly-use-dmabuf-ag.patch
* 0005-SVN_SILENT-made-messages-.desktop-file-always-resolv.patch
* 0006-Klipper-Handle-incoming-UTF-8-mime-types.patch
* 0007-Klipper-Guard-against-broken-data-fetches.patch
* 0008-pipewire-Properly-compare-pipewire-versions-using-QV.patch
* 0009-PipeWire-Include-defines-for-older-PipeWire-versions.patch
* 0010-sddm-theme-fix-default-username-font-size.patch
- Add patch to fix XEmbed context menus (kde#442758)
* 0011-Revert-xembed-adapt-to-changes-in-KNotifications.patch
-------------------------------------------------------------------
Fri Sep 17 11:45:09 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.22.90
* New feature release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.22.90
- Too many changes to list here
- Refresh patches:
* 0001-Revert-No-icons-on-the-desktop-by-default.patch
* 0001-Use-qdbus-qt5.patch
- Drop patches, now upstream:
* Call-UnInhibit-with-correct-signature-in-powermanagement-dataengine.patch
-------------------------------------------------------------------
Thu Sep 16 21:51:26 UTC 2021 - Wolfgang Bauer <wbauer@tmo.at>

View File

@ -30,19 +30,17 @@ 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.22.5
Version: 5.23.0
Release: 0
Summary: The KDE Plasma Workspace Components
License: GPL-2.0-or-later
Group: System/GUI/KDE
URL: http://www.kde.org/
Source: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
Source: plasma-workspace-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
Source1: plasma-workspace-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
# PATCH-FIX-UPSTREAM
Patch0: Call-UnInhibit-with-correct-signature-in-powermanagement-dataengine.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
@ -50,6 +48,9 @@ Patch502: 0001-Ignore-default-sddm-face-icons.patch
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
%if 0%{?suse_version} < 1550
BuildRequires: gcc10-c++
%endif
BuildRequires: kf5-filesystem
BuildRequires: libQt5Gui-private-headers-devel
BuildRequires: libQt5PlatformHeaders-devel >= 5.4.0
@ -312,6 +313,9 @@ Plasma 5 session with Wayland from a display manager.
%autosetup -p1 -n plasma-workspace-%{version}
%build
%if 0%{?suse_version} < 1550
export CXX=g++-10
%endif
%cmake_kf5 -d build -- -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
%cmake_build
@ -388,7 +392,7 @@ fi
--remove default-xsession.desktop %{_datadir}/xsessions/plasma5.desktop
%files libs
%license COPYING*
%license LICENSES/*
%{_kf5_libdir}/libkworkspace5.so.*
%{_kf5_libdir}/libplasma-geolocation-interface.so.*
%{_kf5_libdir}/libtaskmanager.so.*
@ -398,7 +402,7 @@ fi
%{_kf5_libdir}/libkrdb.so
%files
%license COPYING*
%license LICENSES/*
%{_kf5_applicationsdir}/org.kde.kcolorschemeeditor.desktop
%{_kf5_applicationsdir}/org.kde.kfontview.desktop
%{_kf5_bindir}/kcminit
@ -410,6 +414,7 @@ fi
%{_kf5_bindir}/ksmserver
%{_kf5_bindir}/ksplashqml
%{_kf5_bindir}/plasmashell
%{_kf5_bindir}/plasma-interactiveconsole
%{_kf5_bindir}/plasmawindowed
%{_kf5_bindir}/systemmonitor
%{_kf5_bindir}/plasma_waitforname
@ -420,7 +425,6 @@ fi
%{_kf5_bindir}/kde-systemd-start-condition
%{_kf5_bindir}/lookandfeeltool
%{_kf5_bindir}/kcolorschemeeditor
%{_kf5_bindir}/krdb
%{_kf5_bindir}/plasma-apply-colorscheme
%{_kf5_bindir}/plasma-apply-cursortheme
%{_kf5_bindir}/plasma-apply-desktoptheme
@ -446,8 +450,6 @@ fi
%dir %{_kf5_libdir}/libexec
%{_kf5_libdir}/libexec/ksmserver-logout-greeter
%{_kf5_libdir}/libexec/plasma-changeicons
%{_kf5_libdir}/libkdeinit5_kcminit.so
%{_kf5_libdir}/libkdeinit5_kcminit_startup.so
%{_kf5_libdir}/kconf_update_bin/krunnerglobalshortcuts
%{_kf5_libdir}/kconf_update_bin/krunnerhistory
%{_kf5_libdir}/libexec/baloorunner
@ -465,7 +467,6 @@ fi
# %%{_kf5_configkcfgdir}/feedbacksettings.kcfg
%dir %{_kf5_sharedir}/krunner/
%dir %{_kf5_sharedir}/krunner/dbusplugins/
%{_kf5_sharedir}/kdisplay/
%{_kf5_sharedir}/kpackage/
%{_kf5_sharedir}/kfontinst/
%{_kf5_sharedir}/kxmlgui5/
@ -540,17 +541,17 @@ fi
%{_userunitdir}/plasma-core.target
%files -n xembedsniproxy
%license COPYING*
%license LICENSES/*
%{_kf5_bindir}/xembedsniproxy
%{_kf5_configdir}/autostart/xembedsniproxy.desktop
%files -n gmenudbusmenuproxy
%license COPYING*
%license LICENSES/*
%{_kf5_bindir}/gmenudbusmenuproxy
%{_kf5_configdir}/autostart/gmenudbusmenuproxy.desktop
%files devel
%license COPYING*
%license LICENSES/*
%{_kf5_prefix}/include/kworkspace5/
%{_kf5_prefix}/include/plasma/
%{_kf5_prefix}/include/taskmanager/
@ -568,18 +569,17 @@ fi
%{_kf5_libdir}/libweather_ion.so
%{_kf5_libdir}/libcolorcorrect.so
%{_kf5_libdir}/libnotificationmanager.so
%{_kf5_sharedir}/kdevappwizard/
%{_kf5_sharedir}/dbus-1/interfaces/
%files -n plasma5-session
%license COPYING*
%license LICENSES/*
%{_kf5_sharedir}/xsessions/plasma5.desktop
%{_kf5_sharedir}/xsessions/kde-plasma.desktop
%ghost %{_sysconfdir}/alternatives/default-xsession.desktop
%{_kf5_sharedir}/xsessions/default.desktop
%files -n plasma5-session-wayland
%license COPYING*
%license LICENSES/*
%dir %{_datadir}/wayland-sessions/
%{_datadir}/wayland-sessions/plasmawayland.desktop