pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Plasma 5.25.90, lightly tested.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=660
This commit is contained in:
Christophe Giboudeaux 2022-09-17 10:40:33 +00:00 committed by Git OBS Bridge
parent ccbabe322f
commit ff4fc358ba
10 changed files with 68 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
0001-Ignore-default-sddm-face-icons.patch
View File

@ -8,13 +8,13 @@ They are not compatible with the theme
lookandfeel/contents/components/UserList.qml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Index: plasma-workspace-5.17.80git.20210928T142611~d53fd656e/lookandfeel/contents/components/UserList.qml
Index: plasma-workspace-5.17.80git.20220531T124808~09e811ca3/lookandfeel/org.kde.breeze/contents/components/UserList.qml
===================================================================
--- 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 @@
--- plasma-workspace-5.17.80git.20220531T124808~09e811ca3.orig/lookandfeel/org.kde.breeze/contents/components/UserList.qml 2022-05-31 12:48:08.000000000 +0200
+++ plasma-workspace-5.17.80git.20220531T124808~09e811ca3/lookandfeel/org.kde.breeze/contents/components/UserList.qml 2022-05-31 22:01:30.368435010 +0200
@@ -54,7 +54,13 @@
interactive: count > 1
delegate: UserDelegate {
- avatarPath: model.icon || ""
+ avatarPath: {
@ -26,4 +26,4 @@ Index: plasma-workspace-5.17.80git.20210928T142611~d53fd656e/lookandfeel/content
+ }
iconSource: model.iconName || "user-identity"
fontSize: view.fontSize
vtNumber: model.vtNumber
needsPassword: model.needsPassword !== undefined ? model.needsPassword : true

20
0001-Revert-No-icons-on-the-desktop-by-default.patch
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.17.80git.20210531T011335~40d302afe/kioslave/desktop/CMakeLists.txt
Index: plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/CMakeLists.txt
===================================================================
--- 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 @@
--- plasma-workspace-5.17.80git.20220531T124808~09e811ca3.orig/kioslave/desktop/CMakeLists.txt 2022-05-31 12:48:08.000000000 +0200
+++ plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/CMakeLists.txt 2022-05-31 22:01:39.580389443 +0200
@@ -24,3 +24,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.17.80git.20210531T011335~40d302afe/kioslave/desktop/Home.desktop
Index: plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/Home.desktop
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/Home.desktop 2021-05-31 06:59:47.519362944 +0200
+++ plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/Home.desktop 2022-05-31 22:01:39.580389443 +0200
@@ -0,0 +1,88 @@
+[Desktop Entry]
+Encoding=UTF-8
@ -116,11 +116,11 @@ Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/Ho
+Icon=user-home
+Type=Link
+
Index: plasma-workspace-5.17.80git.20210531T011335~40d302afe/kioslave/desktop/kio_desktop.cpp
Index: plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/kio_desktop.cpp
===================================================================
--- 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 @@
--- plasma-workspace-5.17.80git.20220531T124808~09e811ca3.orig/kioslave/desktop/kio_desktop.cpp 2022-05-31 12:48:08.000000000 +0200
+++ plasma-workspace-5.17.80git.20220531T124808~09e811ca3/kioslave/desktop/kio_desktop.cpp 2022-05-31 22:01:39.580389443 +0200
@@ -77,6 +77,10 @@
// Copy the .directory file
QFile::copy(QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kio_desktop/directory.desktop")), desktopPath + "/.directory");

8
0001-Use-qdbus-qt5.patch
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.17.80git.20210928T142611~d53fd656e/startkde/startplasma-wayland.cpp
Index: plasma-workspace-5.17.80git.20220531T124808~09e811ca3/startkde/startplasma-wayland.cpp
===================================================================
--- plasma-workspace-5.17.80git.20210928T142611~d53fd656e.orig/startkde/startplasma-wayland.cpp 2021-09-28 16:26:11.000000000 +0200
+++ plasma-workspace-5.17.80git.20210928T142611~d53fd656e/startkde/startplasma-wayland.cpp 2021-09-28 22:02:12.820708290 +0200
@@ -58,7 +58,7 @@
--- plasma-workspace-5.17.80git.20220531T124808~09e811ca3.orig/startkde/startplasma-wayland.cpp 2022-05-31 12:48:08.000000000 +0200
+++ plasma-workspace-5.17.80git.20220531T124808~09e811ca3/startkde/startplasma-wayland.cpp 2022-05-31 22:01:24.572464278 +0200
@@ -61,7 +61,7 @@
runEnvironmentScripts();
if (!qEnvironmentVariableIsSet("DBUS_SESSION_BUS_ADDRESS")) {

34
0001-widgetexplorer-Don-t-recurse-into-applet-s-containme.patch
View File

@ -1,34 +0,0 @@
From 7fbac131624007745e726e7006706d0e8761e463 Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Sun, 21 Aug 2022 16:33:50 +0200
Subject: [PATCH] [widgetexplorer] Don't recurse into applet's containments
The intention of this code appears to be finding system tray applets, since the systemtray is a containment within another applet/containment
However the code causes an infinit recursion since we are calling addContainment on the same containment again
The recursion also is unnecessary since corona->containments() already lists the system tray containment, so we don't need to find it by recursing through the panel's children
(cherry picked from commit c7ba560ccaac5e469cb2d6bf66c39e1acf967454)
---
components/shellprivate/widgetexplorer/widgetexplorer.cpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/components/shellprivate/widgetexplorer/widgetexplorer.cpp b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
index bd7db9518..0022a1247 100644
--- a/components/shellprivate/widgetexplorer/widgetexplorer.cpp
+++ b/components/shellprivate/widgetexplorer/widgetexplorer.cpp
@@ -280,10 +280,6 @@ void WidgetExplorerPrivate::addContainment(Containment *containment)
foreach (Applet *applet, containment->applets()) {
if (applet->pluginMetaData().isValid()) {
- Containment *childContainment = applet->property("containment").value<Containment *>();
- if (childContainment) {
- addContainment(childContainment);
- }
runningApplets[applet->pluginMetaData().pluginId()]++;
} else {
qDebug() << "Invalid plugin metadata. :(";
--
2.37.3

3
plasma-workspace-5.25.5.tar.xz
View File

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

16
plasma-workspace-5.25.5.tar.xz.sig
View File

@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmMXP0gACgkQ11dEg7tX
sY0GRg/8Dq3451MqYx+w8kRpAB1dGL1zIrwBrHtBzdWGwBEgrB8R4OO5t6LtDC4C
D12W77ogiXD4XXhifVMr2pDqlhHoGirFZ67skrMl3JuBCh+vEnb9EgrPQhP6IbTx
I6IIQVYGsiSzW3gQV7Wsmc68naNLkeG0k94BMHC/Z9YUcw0n/5773zTA9dpv7b5Q
0xDkOGLTA5DiCh6UF+Q+z/v+dSI6Ox0fTD0ZVAGM1l2LAGzxgvratIz7reAIemav
jfjFJNd1+iKF/NvTy+Y+0GTIN92EEvGt1XQoGYY3RaUWpYiFxgP9cegzBQAybwwq
TmN1epqNxzoO+Lo3FIMYV7/myF1fWQ8IhHFnmjp91cKiwDjaodFrGbuRByivNGzf
4nR2cE4XHKXOttpgBtaG7HvvNWgLlXKaRGlp+pU8bK6SSSoo1i7T8hq2qhOhVQDU
5X5q2HFp4Q0TZAwNwue1sbp7qd0XLhbbS4xyBmwQElygptdnywuP2lWboKg7wXkH
h7Do2mpGZHqM+TY0VcmykAu481HvxZ/YbR53N1umKSFUIOM92qRFtIaXU8RtDl4p
hQOsSji788U5MzmizkzzjG9JdwWWeMPtQMRNeU11Jl7qW8LwfsfiTJ7J9b/1cAvg
HmIt9bNiQBngJoDL3PV4i1dTsf7AwvWl9SYcW/O515NTBqCSFuU=
=W0UR
-----END PGP SIGNATURE-----

3
plasma-workspace-5.25.90.tar.xz Normal file
View File

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

16
plasma-workspace-5.25.90.tar.xz.sig Normal file
View File

@ -0,0 +1,16 @@
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmMjFWAACgkQ11dEg7tX
sY0J5RAAoN5D1xWreOgfF66CEEE19W6I6qimkE9X4EjFgDRgU4Sn3QeOGZSwtk6f
liXMiLotPiTKs6EjpAzk/LarB7dsPJx3RqS72AYKExKEI0VcnWHfp3KSgq+CefBZ
xBViOCzNqKRHnr94lOqYeytZzs7Lwx399+xSu7+t/mBiqQyT4smeI8VlTOu9xKhX
+MbWKjiYbOt5YAxMcVN3CFQoW8YAGIrcihxQi1zrlALXtqdyHlYRtz4fol2TLfQU
Hfe8Y3dXLyNBG70rw/S/K6Lwym9smDl8tmgJ2+ryMxOKe/Qnh01irt3GXPfcOB4H
9Fx1HZ61rPcxdMCSrTDvb+9fUBSD7FeKWQr5PSsDTV0A5AdEoeou3z47q6XS2/f3
pE4vRaGe1j8Ggit/7eA/J50+zAYm40Wm0GO/fLhNZDHqRSv1fFfi0jHXwu/ESwnD
x4G0NDK9eYOcNP4QlWUaM9tBnI8gO2uFoTaE/r8Oj2GYj5w9No2wEfa4TdAuje9y
Xj6WksOw0zrQ1hLslYzF5aid2d1rZWYnIqPNNJLJygnT4KKw8FcpFwfhRdDgaVv7
uUW4YfA8kM7the0gsUk8zP+i0YLkvc9089Tr9Y6mzeIxHRGfCb2P3DQFYFu05gAc
xuvoz5WhsbuI3n/g5KrT0d9JoW7OvlyQTobgwElFRz6I9xXEetY=
=SLun
-----END PGP SIGNATURE-----

15
plasma5-workspace.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Thu Sep 15 20:47:39 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
- Update to 5.25.90
* New feature release
* For more details please see:
* https://kde.org/announcements/plasma/5/5.25.90
- Too many changes to list here
- Drop patches, now upstream:
* 0001-widgetexplorer-Don-t-recurse-into-applet-s-containme.patch
- Refresh patches:
* 0001-Ignore-default-sddm-face-icons.patch
* 0001-Revert-No-icons-on-the-desktop-by-default.patch
* 0001-Use-qdbus-qt5.patch
-------------------------------------------------------------------
Thu Sep 8 20:29:10 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>

27
plasma5-workspace.spec
View File

@ -16,12 +16,12 @@
#
%global __requires_exclude qmlimport\\((org\\.kde\\.plasma\\.private|org\\.kde\\.private\\.kcm|org\\.kde\\.plasma\\.kcm|LocaleListModel|FingerprintModel).*
%global __requires_exclude qmlimport\\((org\\.kde\\.plasma\\.private|org\\.kde\\.private\\.kcm|org\\.kde\\.plasma\\.kcm|LocaleListModel|FingerprintModel|kcmregionandlang).*
#Compat macro for new _fillupdir macro introduced in Nov 2017
%{!?_fillupdir: %global _fillupdir %{_localstatedir}/adm/fillup-templates}
%define kf5_version 5.58.0
%define kf5_version 5.98.0
%bcond_without released
Name: plasma5-workspace
@ -29,20 +29,18 @@ 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.25.5
Version: 5.25.90
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: https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz
%if %{with released}
Source1: https://download.kde.org/stable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
Source1: https://download.kde.org/unstable/plasma/%{version}/plasma-workspace-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
Source3: xprop-kde-full-session.desktop
# PATCH-FIX-UPSTREAM
Patch1: 0001-widgetexplorer-Don-t-recurse-into-applet-s-containme.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
@ -51,6 +49,7 @@ Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
BuildRequires: breeze5-icons
BuildRequires: fdupes
%if 0%{?suse_version} < 1550
BuildRequires: gcc10-PIE
BuildRequires: gcc10-c++
%endif
BuildRequires: kf5-filesystem
@ -76,6 +75,7 @@ BuildRequires: cmake(KF5I18n) >= %{kf5_version}
BuildRequires: cmake(KF5IdleTime) >= %{kf5_version}
BuildRequires: cmake(KF5KCMUtils) >= %{kf5_version}
BuildRequires: cmake(KF5KDELibs4Support) >= %{kf5_version}
BuildRequires: cmake(KF5KExiv2)
BuildRequires: cmake(KF5NetworkManagerQt) >= %{kf5_version}
BuildRequires: cmake(KF5NewStuff) >= %{kf5_version}
BuildRequires: cmake(KF5NotifyConfig) >= %{kf5_version}
@ -94,6 +94,7 @@ BuildRequires: cmake(KF5TextWidgets) >= %{kf5_version}
BuildRequires: cmake(KF5Wallet) >= %{kf5_version}
BuildRequires: cmake(KF5Wayland) >= %{kf5_version}
BuildRequires: cmake(KF5XmlRpcClient)
BuildRequires: cmake(KPipeWire)
BuildRequires: cmake(KScreenLocker) >= %{_plasma5_version}
# Disabled until upstream complies with the KDE policies
#BuildRequires: cmake(KUserFeedback)
@ -102,6 +103,7 @@ BuildRequires: cmake(PlasmaWaylandProtocols) >= 1.1.0
#!BuildIgnore: kdialog
BuildRequires: cmake(KWinDBusInterface) >= %{_plasma5_version}
BuildRequires: cmake(LayerShellQt)
BuildRequires: cmake(PolkitQt5-1)
BuildRequires: cmake(Qt5Concurrent) >= 5.4.0
BuildRequires: cmake(Qt5DBus) >= 5.4.0
BuildRequires: cmake(Qt5Gui) >= 5.4.0
@ -326,7 +328,7 @@ Plasma 5 session with Wayland from a display manager.
%if 0%{?suse_version} < 1550
export CXX=g++-10
%endif
%cmake_kf5 -d build -- -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
%cmake_kf5 -d build -- -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} -DGLIBC_LOCALE_GENERATED=TRUE -DGLIBC_LOCALE_GEN=OFF
%cmake_build
%install
@ -420,16 +422,14 @@ fi
%{_kf5_applicationsdir}/kcm_autostart.desktop
%{_kf5_applicationsdir}/kcm_colors.desktop
%{_kf5_applicationsdir}/kcm_cursortheme.desktop
%{_kf5_applicationsdir}/kcm_desktoptheme.desktop
%{_kf5_applicationsdir}/kcm_fontinst.desktop
%{_kf5_applicationsdir}/kcm_fonts.desktop
%{_kf5_applicationsdir}/kcm_formats.desktop
%{_kf5_applicationsdir}/kcm_icons.desktop
%{_kf5_applicationsdir}/kcm_lookandfeel.desktop
%{_kf5_applicationsdir}/kcm_nightcolor.desktop
%{_kf5_applicationsdir}/kcm_notifications.desktop
%{_kf5_applicationsdir}/kcm_regionandlang.desktop
%{_kf5_applicationsdir}/kcm_style.desktop
%{_kf5_applicationsdir}/kcm_translations.desktop
%{_kf5_applicationsdir}/kcm_users.desktop
%{_kf5_bindir}/kcminit
%{_kf5_bindir}/kcminit_startup
@ -519,12 +519,14 @@ fi
%{_kf5_servicesdir}/
%{_kf5_servicetypesdir}/
%dir %{_kf5_sharedir}/kglobalaccel
%dir %{_kf5_sharedir}/kio
%dir %{_kf5_sharedir}/kio/servicemenus
%{_kf5_sharedir}/kglobalaccel/org.kde.krunner.desktop
%{_kf5_sharedir}/ksplash/
%{_kf5_sharedir}/kstyle/
%{_kf5_plasmadir}/
%{_kf5_sharedir}/solid/
%{_kf5_sharedir}/kio_desktop/
%{_kf5_sharedir}/kio/servicemenus/setaswallpaper.desktop
%{_kf5_iconsdir}/hicolor/32x32/apps/preferences-desktop-color.svg
%{_kf5_iconsdir}/hicolor/48x48/apps/klipper.svg
%{_kf5_iconsdir}/hicolor/*/mimetypes/fonts-package.png
@ -538,7 +540,6 @@ fi
%{_kf5_debugdir}/*.categories
%dir %{_kf5_sharedir}/kpackage
%dir %{_kf5_sharedir}/kpackage/kcms
%{_kf5_sharedir}/kpackage/kcms/kcm_translations
# %%{_kf5_sharedir}/kpackage/kcms/kcm_feedback
%{_kf5_sharedir}/kpackage/kcms/kcm_desktoptheme
%dir %{_libexecdir}/kauth