Refresh default look-and-feel patch to fix for Plasma 5.24

plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch

@@ -0,0 +1,26 @@
+diff --git a/shell/packageplugins/lookandfeel/lookandfeel.cpp b/shell/packageplugins/lookandfeel/lookandfeel.cpp
+index d50b3e96f..556877af6 100644
+--- a/shell/packageplugins/lookandfeel/lookandfeel.cpp
++++ b/shell/packageplugins/lookandfeel/lookandfeel.cpp
+@@ -10,7 +10,7 @@
+ #include <KLocalizedString>
+ #include <KPackage/PackageLoader>
+ 
+-#define DEFAULT_LOOKANDFEEL "org.kde.breeze.desktop"
++#define DEFAULT_LOOKANDFEEL "@DEFAULT_LOOKANDFEEL@"
+ 
+ void LookAndFeelPackage::initPackage(KPackage::Package *package)
+ {
+diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
+index bd848dda0..43978a712 100644
+--- a/startkde/startplasma.cpp
++++ b/startkde/startplasma.cpp
+@@ -365,7 +365,7 @@ void setupPlasmaEnvironment()
+     qputenv("XDG_CONFIG_DIRS", extraConfigDir + ":" + currentConfigDirs);
+ 
+     const KConfig globals;
+-    const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("org.kde.breeze.desktop"));
++    const QString currentLnf = KConfigGroup(&globals, QStringLiteral("KDE")).readEntry("LookAndFeelPackage", QStringLiteral("@DEFAULT_LOOKANDFEEL@"));
+     QFile activeLnf(QString::fromUtf8(extraConfigDir + "/package"));
+     activeLnf.open(QIODevice::ReadOnly);
+     if (activeLnf.readLine() != currentLnf.toUtf8()) {

plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch

@@ -1,13 +0,0 @@
-diff --git a/shell/packageplugins/lookandfeel/lookandfeel.cpp b/shell/packageplugins/lookandfeel/lookandfeel.cpp
-index a6cef04..82c6d36 100644
---- a/shell/packageplugins/lookandfeel/lookandfeel.cpp
-+++ b/shell/packageplugins/lookandfeel/lookandfeel.cpp
-@@ -23,7 +23,7 @@
- #include <KLocalizedString>
- #include <KPackage/PackageLoader>
- 
--#define DEFAULT_LOOKANDFEEL "org.kde.breeze.desktop"
-+#define DEFAULT_LOOKANDFEEL "@DEFAULT_LOOKANDFEEL@"
- 
- void LookAndFeelPackage::initPackage(KPackage::Package *package)
- {

plasma-workspace.spec

@@ -28,7 +28,7 @@
 Name:    plasma-workspace
 Summary: Plasma workspace, applications and applets
 Version: 5.24.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv2+
 URL:     https://invent.kde.org/plasma/%{name}
@@ -64,7 +64,7 @@ Source41:       spice-vdagent.conf
 
 ## downstream Patches
 Patch100:       plasma-workspace-konsole-in-contextmenu.patch
-Patch101:       plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch
+Patch101:       plasma-workspace-5.24.0-set-fedora-default-look-and-feel.patch
 # default to folderview (instead of desktop) containment, see also
 # https://mail.kde.org/pipermail/distributions/2016-July/000133.html
 # and example,
@@ -468,11 +468,11 @@ BuildArch: noarch
 
 ## downstream patches
 %patch100 -p1 -b .konsole-in-contextmenu
-# FIXME/TODO:  it is unclear whether this is needed or even a good idea anymore -- rex
+# XXX: This is horribly broken and needs fixes upstream -- ngompa
 %if 0%{?default_lookandfeel:1}
 %patch101 -p1 -b .set-fedora-default-look-and-feel
 sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfeel:org.kde.breeze.desktop}|g" \
-  shell/packageplugins/lookandfeel/lookandfeel.cpp
+  shell/packageplugins/lookandfeel/lookandfeel.cpp startkde/startplasma.cpp
 %endif
 %patch105 -p1
 
@@ -785,6 +785,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper,
 
 
 %changelog
+* Mon Feb 28 2022 Neal Gompa <ngompa@fedoraproject.org> - 5.24.2-2
+- Refresh default look-and-feel patch to fix for Plasma 5.24
+
 * Tue Feb 22 2022 Rex Dieter <rdieter@fedoraproject.org> - 5.24.2-1
 - 5.24.2