diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2022-05-18 19:41:22 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2022-05-19 06:59:45 +0200 |
| commit | 781dadc7c48445babee46ea66de0cbcfa031424e (patch) | |
| tree | b30daeb10ed9ba236fdf55fdb7b5be060d833444 /source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch | |
| parent | 4a337c4eaa20f87da8efa21735437e6cee5a2b3e (diff) | |
| download | current-781dadc7c48445babee46ea66de0cbcfa031424e.tar.gz current-781dadc7c48445babee46ea66de0cbcfa031424e.tar.xz | |
Wed May 18 19:41:22 UTC 202220220518194122
a/f2fs-tools-1.15.0-x86_64-1.txz: Upgraded.
a/kernel-firmware-20220516_251d290-noarch-1.txz: Upgraded.
a/kernel-generic-5.17.9-x86_64-1.txz: Upgraded.
a/kernel-huge-5.17.9-x86_64-1.txz: Upgraded.
a/kernel-modules-5.17.9-x86_64-1.txz: Upgraded.
d/kernel-headers-5.17.9-x86-1.txz: Upgraded.
d/ninja-1.11.0-x86_64-1.txz: Upgraded.
k/kernel-source-5.17.9-noarch-1.txz: Upgraded.
kde/calligra-3.2.1-x86_64-19.txz: Rebuilt.
Recompiled against gsl-2.7.1.
kde/krita-5.0.6-x86_64-5.txz: Rebuilt.
Recompiled against gsl-2.7.1.
kde/plasma-workspace-5.24.5-x86_64-2.txz: Rebuilt.
[PATCH] kcms/desktoptheme: find metadata.json when loading ThemesModel.
Thanks to Heinz Wiesinger for the link to the patch.
kde/step-22.04.1-x86_64-2.txz: Rebuilt.
Recompiled against gsl-2.7.1.
l/gsl-2.7.1-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
n/mutt-2.2.5-x86_64-1.txz: Upgraded.
x/igt-gpu-tools-1.26-x86_64-2.txz: Rebuilt.
Recompiled against gsl-2.7.1.
xap/xsnow-3.5.0-x86_64-2.txz: Rebuilt.
Recompiled against gsl-2.7.1.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to '')
| -rw-r--r-- | source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch b/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch new file mode 100644 index 000000000..352bed917 --- /dev/null +++ b/source/kde/kde/patch/plasma-workspace/f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59.patch @@ -0,0 +1,41 @@ +From f77b7284e39b14b0e9a8b4d2b77c0b93b2c9ea59 Mon Sep 17 00:00:00 2001 +From: Fushan Wen <qydwhotmail@gmail.com> +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; + } +-- +GitLab + |