diff --git a/plasma-workspace-5.18.4.1-filter-environment.patch b/plasma-workspace-5.18.4.1-filter-environment.patch new file mode 100644 index 0000000..9c10fbe --- /dev/null +++ b/plasma-workspace-5.18.4.1-filter-environment.patch @@ -0,0 +1,29 @@ +diff -r -U3 plasma-workspace-5.18.4.1.orig/startkde/startplasma.cpp plasma-workspace-5.18.4.1/startkde/startplasma.cpp +--- plasma-workspace-5.18.4.1.orig/startkde/startplasma.cpp 2020-03-31 17:33:37.000000000 +0300 ++++ plasma-workspace-5.18.4.1/startkde/startplasma.cpp 2020-04-03 12:47:34.812587755 +0300 +@@ -22,6 +22,8 @@ + #include + #include + #include ++#include ++#include + #include + #include + +@@ -265,6 +267,16 @@ + // In that case, the update in startplasma might be too late. + bool syncDBusEnvironment() + { ++ const QRegularExpression re(QString::fromUtf8("[^A-Z0-9_]")); ++ const auto env = QProcessEnvironment::systemEnvironment(); ++ for (const auto &key : env.keys()) { ++ const auto match = re.match(key); ++ if (match.hasMatch()) { ++// qDebug() << "environment variable filtered:" << key; ++ qunsetenv(key.toUtf8().constData()); ++ } ++ } ++ + int exitCode; + // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment + if (!QStandardPaths::findExecutable(QStringLiteral("dbus-update-activation-environment")).isEmpty()) { diff --git a/plasma-workspace.spec b/plasma-workspace.spec index c646e58..db8b75f 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -7,7 +7,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.18.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://cgit.kde.org/%{name}.git @@ -44,6 +44,8 @@ Patch101: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch # and example, # https://github.com/notmart/artwork-lnf-netrunner-core/blob/master/usr/share/plasma/look-and-feel/org.kde.netrunner-core.desktop/contents/defaults Patch105: plasma-workspace-5.7.3-folderview_layout.patch +# workaround https://bugzilla.redhat.com/show_bug.cgi?id=1754395 +Patch106: plasma-workspace-5.18.4.1-filter-environment.patch ## upstreamable Patches @@ -378,6 +380,7 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee %endif #%patch102 -p1 -b .startkde %patch105 -p1 +%patch106 -p1 -b .bz1754395 %if 0%{?fedora} cp -a lookandfeel lookandfeel-fedora @@ -606,6 +609,9 @@ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.{klipper, %changelog +* Fri Apr 03 2020 Rex Dieter - 5.18.4-2 +- patch to workaround "Qt applications lose system theme if launched via dbus activation" (#1754395) + * Tue Mar 31 2020 Jan Grulich - 5.18.4-1 - 5.18.4