[neon/kde/plasma-workspace/Neon/unstable] debian/patches: remove patch now in branch
Jonathan Esk-Riddell
null at kde.org
Thu Feb 9 11:20:31 GMT 2023
Git commit 97e84a7868dbbcdb664067f4a164edcaf56e91fb by Jonathan Esk-Riddell.
Committed on 09/02/2023 at 11:20.
Pushed by jriddell into branch 'Neon/unstable'.
remove patch now in branch
D +0 -31 debian/patches/neon_fix-first-run.diff
M +0 -1 debian/patches/series
https://invent.kde.org/neon/kde/plasma-workspace/commit/97e84a7868dbbcdb664067f4a164edcaf56e91fb
diff --git a/debian/patches/neon_fix-first-run.diff b/debian/patches/neon_fix-first-run.diff
deleted file mode 100644
index 77f754a..0000000
--- a/debian/patches/neon_fix-first-run.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/kcms/lookandfeel/lookandfeelmanager.cpp b/kcms/lookandfeel/lookandfeelmanager.cpp
-index 9c36a0602..7a9f5d623 100644
---- a/kcms/lookandfeel/lookandfeelmanager.cpp
-+++ b/kcms/lookandfeel/lookandfeelmanager.cpp
-@@ -20,6 +20,7 @@
- #include <KSharedConfig>
- #include <QDBusConnection>
- #include <QDBusMessage>
-+#include <QGuiApplication>
- #include <QStyle>
- #include <QStyleFactory>
-
-@@ -229,11 +230,13 @@ void LookAndFeelManager::setWidgetStyle(const QString &style)
- return;
- }
-
-- // Some global themes use styles that may not be installed.
-- // Test if style can be installed before updating the config.
-- std::unique_ptr<QStyle> testStyle(QStyleFactory::create(style));
-- if (!testStyle) {
-- return;
-+ if (qobject_cast<QGuiApplication *>(QCoreApplication::instance())) {
-+ // Some global themes use styles that may not be installed.
-+ // Test if style can be installed before updating the config.
-+ std::unique_ptr<QStyle> testStyle(QStyleFactory::create(style));
-+ if (!testStyle) {
-+ return;
-+ }
- }
-
- writeNewDefaults(QStringLiteral("kdeglobals"), QStringLiteral("KDE"), QStringLiteral("widgetStyle"), style, KConfig::Notify);
diff --git a/debian/patches/series b/debian/patches/series
index e21d3ee..03db5ec 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
disable_incompatible_tests
-neon_fix-first-run.diff
More information about the Neon-commits
mailing list