From 49eae4a00f2d3a11adf780419835dfe4f0566c393b8f761fa37d71e621c3dc91 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Wed, 25 May 2022 05:38:14 +0000 Subject: [PATCH] Plasma 5.25 Beta, untested. oxygen5-sounds is a separate package now, kwayland-server got merged into kwin5 and plasma5-phone-components renamed to plasma5-mobile. kinfocenter5 kauth review requested as boo#1199735. kwayland-server and plasma-mobile-components need to be deleted manually! OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=643 --- ...u-fix-top-level-menu-text-coloration.patch | 40 ------------------ ...e-find-metadata.json-when-loading-Th.patch | 41 ------------------- plasma-workspace-5.24.5.tar.xz | 3 -- plasma-workspace-5.24.5.tar.xz.sig | 16 -------- plasma-workspace-5.24.90.tar.xz | 3 ++ plasma-workspace-5.24.90.tar.xz.sig | 16 ++++++++ plasma5-workspace.changes | 12 ++++++ plasma5-workspace.spec | 28 ++----------- 8 files changed, 35 insertions(+), 124 deletions(-) delete mode 100644 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch delete mode 100644 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch delete mode 100644 plasma-workspace-5.24.5.tar.xz delete mode 100644 plasma-workspace-5.24.5.tar.xz.sig create mode 100644 plasma-workspace-5.24.90.tar.xz create mode 100644 plasma-workspace-5.24.90.tar.xz.sig diff --git a/0001-applets-appmenu-fix-top-level-menu-text-coloration.patch b/0001-applets-appmenu-fix-top-level-menu-text-coloration.patch deleted file mode 100644 index f506491..0000000 --- a/0001-applets-appmenu-fix-top-level-menu-text-coloration.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4d3f99558cff95259590e70dfbf854a479f772ce Mon Sep 17 00:00:00 2001 -From: Nate Graham -Date: Wed, 4 May 2022 10:45:52 -0600 -Subject: [PATCH] applets/appmenu: fix top-level menu text coloration - -28537cf3ff3cd9210f7568f40334ac3a2c9bed18 made the color dynamic, but -neglected to respect the Plasma color scheme, if any. This causes -problems with Plasma themes that have their own colors and don't -respect the systemwide color scheme, such as Breeze Twilight. - -Fix it by using the appropriate colors from the PlasmaCore color scheme -object, not the systemwide object provided by Qt. - -BUG: 453348 -FIXED-IN: 5.24.6 - - -(cherry picked from commit 19d9bc7e395d8c6e007afdc3b3b5c11a7d02190e) ---- - applets/appmenu/package/contents/ui/MenuDelegate.qml | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/applets/appmenu/package/contents/ui/MenuDelegate.qml b/applets/appmenu/package/contents/ui/MenuDelegate.qml -index 441e99016..afb37589a 100644 ---- a/applets/appmenu/package/contents/ui/MenuDelegate.qml -+++ b/applets/appmenu/package/contents/ui/MenuDelegate.qml -@@ -66,9 +66,6 @@ AbstractButton { - - contentItem: PC3.Label { - text: controlRoot.Kirigami.MnemonicData.richTextLabel -- // Kirigami.Theme.highlightedTextColor returns different colors -- // depending on window focus, which does not apply to this applet -- // instead, we use palette.highlightedText here, which returns consistent result -- color: background.state == MenuDelegate.State.Rest ? palette.windowText : palette.highlightedText -+ color: background.state == MenuDelegate.State.Rest ? PlasmaCore.Theme.textColor : PlasmaCore.Theme.highlightedTextColor - } - } --- -2.36.0 - diff --git a/0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch b/0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch deleted file mode 100644 index 86752d7..0000000 --- a/0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59 Mon Sep 17 00:00:00 2001 -From: Fushan Wen -Date: Mon, 16 May 2022 16:18:00 +0800 -Subject: [PATCH] kcms/desktoptheme: find metadata.json when loading - ThemesModel - -Before this commit ThemesModel only finds metadata.desktop, but after -KF5.94, the default theme metadata files have been ported to json format. - -BUG: 453830 - - -(cherry picked from commit 10aa9bb8dca91e92e3009ed57613d43d610da63e) ---- - kcms/desktoptheme/themesmodel.cpp | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/kcms/desktoptheme/themesmodel.cpp b/kcms/desktoptheme/themesmodel.cpp -index 6f0ecf4e3..296951742 100644 ---- a/kcms/desktoptheme/themesmodel.cpp -+++ b/kcms/desktoptheme/themesmodel.cpp -@@ -155,7 +155,15 @@ void ThemesModel::load() - const QDir cd(ppath); - const QStringList &entries = cd.entryList(QDir::Dirs | QDir::Hidden | QDir::NoDotAndDotDot); - for (const QString &pack : entries) { -- const QString _metadata = ppath + QLatin1Char('/') + pack + QStringLiteral("/metadata.desktop"); -+ const QString prefix = QStringLiteral("%1%2%3%4metadata.").arg(ppath, QDir::separator(), pack, QDir::separator()); -+ -+ QString _metadata = QStringLiteral("%1json").arg(prefix); -+ if (QFile::exists(_metadata)) { -+ themes << _metadata; -+ continue; -+ } -+ -+ _metadata = QStringLiteral("%1desktop").arg(prefix); - if (QFile::exists(_metadata)) { - themes << _metadata; - } --- -2.36.0 - diff --git a/plasma-workspace-5.24.5.tar.xz b/plasma-workspace-5.24.5.tar.xz deleted file mode 100644 index 3d37207..0000000 --- a/plasma-workspace-5.24.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b9912691e0becfa0839dbf7750ea24729b72bad0216bef27584f9faf882064f6 -size 18490588 diff --git a/plasma-workspace-5.24.5.tar.xz.sig b/plasma-workspace-5.24.5.tar.xz.sig deleted file mode 100644 index cff6c99..0000000 --- a/plasma-workspace-5.24.5.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmJxBm4ACgkQ11dEg7tX -sY1d+A//SK87vszjt4XgRT0bB1Dk6vd705eDgnOvN0jrWFtxvl9DgzptIZgJ2jr2 -tilUQXavRNvue5/LIdsl+jW9IgAigvSNqgFxhNgSDTIwqOxHd75zeNWQtl4Eig/R -ec7AGDk1KznucG0HxDUkRZgcGy+vfHIcZExmak4jqPHkv7UYh5EcACFJMo8He1zT -I8l1KszVkTZmrYcZ0CpTXHxNbuwLYoYOfg7beLZ8jEcJut1GXD/El6w0hLPq+RpG -LAonvemjH6MZ45eeSQc4PdHcM+kRRwUEUbiuXJo+IUOmpeV9BmO/tt2q3+8zt8hV -selnNILbOVEL0qgFOCXsXZy3qDzYCEMxbS+JUmy6ZwmofUYY3PKW7d6UahraMvZK -0GbbyZgnVTnLmDOcYe+F0ha8n6OV9TpmVmV+z37R1WFq2bhyIWnZFPRJuuE6EQMs -rguV2JNIcFFU+yIaEUXym1QLMfG1zjbHhgerrM9PA0AbeAH7onIaV8YXAW9ILXQM -g0ReItXjwakd+L7wfmeWFqSAMvJT1V/NMdWBedzohAzMf76oUEC3C0NO9YSb/ky7 -LPuBqMLB+jqTnLclxzKKQ21/2DmsG7EbY4PfJ6jUP+pf1YB079LFbAW36YwlX5E2 -Hk3K6vdrRHtGzb+Kc13WxB3fFZmEGre7MmdxdZJ5yV1ya8ClMEw= -=yO51 ------END PGP SIGNATURE----- diff --git a/plasma-workspace-5.24.90.tar.xz b/plasma-workspace-5.24.90.tar.xz new file mode 100644 index 0000000..0e1672b --- /dev/null +++ b/plasma-workspace-5.24.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71f21366c20768f0eceab3a0e2e6dee3ec470b7dd8645fd41550ce4eec0246d9 +size 18565464 diff --git a/plasma-workspace-5.24.90.tar.xz.sig b/plasma-workspace-5.24.90.tar.xz.sig new file mode 100644 index 0000000..7e28239 --- /dev/null +++ b/plasma-workspace-5.24.90.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmKGHqEACgkQ11dEg7tX +sY1jzg/9GP10tVRA2oFcUt5Ko4GqTYHYWMgYnCxY+YAD9rNLmgJY/j1eoHW8C5Dh +kMAJnTAYW5yaM/EHz9OPXJJJFoL7wHABDJT9ISYCwiw64p3OJSskfF/BtwpNLGpb +9Vx/MWGPxhCe+EQiy2UNaGrATjn3wBE9Zkd4UmXOJ1IBGPoRBXo/ZfBwF8Af8IP0 +QXzgdd2kyvfKjiox16LwmN8AcUMFQjEmeAknPnuoCbwOdEy0BnBI11gpLiOw9gPa +JUm/LDypACxRCm6hw0FaHVrXfcHTE/tdBpW/lGo2ghqX+7qJ5sl1b1IfR57eR4H5 +csonb3g+D+Vl9V7TmGDThX/8QBO9ChNCiASod4XLXcG8VvyvGoqKh1jr5MHFLb5J +kAR69kslwHJRimwKmqhjHfftxfLB++uSIA7T1jzbx4rl2638HJSPgWw/0eQ+pa5T +QoiruzazWjgFEKQHjF+ouvgcG2CbKk4EMx5dzwXTOdYAuQ9sUrCM/1bc4bbmSHGm +pzN4Rth1y+0y3P+1oS7PJrUQ/9sm6QrQBQ4e84423Uo/FoTYQsHdKge1FqEyKuBX +sK+OAUMiVUmADjl/50I+3+wMO4YX2A/VgD3CCd4dQd1FfHAeKL7GdJBAxd60RsEq +geOygp+NXnTQ4eFtGr6pBNlfUm573z5iLeFIsh7As+u6g93cWUw= +=ZGut +-----END PGP SIGNATURE----- diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 524002d..388571c 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu May 19 19:46:06 UTC 2022 - Fabian Vogt + +- Update to 5.24.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.24.90 +- Too many changes to list here +- Drop patches, now upstream: + * 0001-applets-appmenu-fix-top-level-menu-text-coloration.patch + * 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch + ------------------------------------------------------------------- Wed May 18 18:34:03 UTC 2022 - Fabian Vogt diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index a594354..977bc93 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -29,21 +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.24.5 +Version: 5.24.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-applets-appmenu-fix-top-level-menu-text-coloration.patch -Patch2: 0001-kcms-desktoptheme-find-metadata.json-when-loading-Th.patch # PATCHES 501-??? are PATCH-FIX-OPENSUSE Patch501: 0001-Use-qdbus-qt5.patch Patch502: 0001-Ignore-default-sddm-face-icons.patch @@ -57,6 +54,7 @@ BuildRequires: gcc10-c++ BuildRequires: kf5-filesystem BuildRequires: libQt5Gui-private-headers-devel BuildRequires: libQt5PlatformHeaders-devel >= 5.4.0 +BuildRequires: libicu-devel BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: cmake(AppStreamQt) >= 0.10.4 @@ -474,20 +472,11 @@ 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}/ @@ -550,20 +539,11 @@ 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