Hello community,
here is the log from the commit of package plasma5-workspace for
openSUSE:Factory checked in at 2019-10-17 12:19:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma5-workspace (Old)
and /work/SRC/openSUSE:Factory/.plasma5-workspace.new.2352 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-workspace"
Thu Oct 17 12:19:10 2019 rev:120 rq:738648 version:5.17.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma5-workspace/plasma5-workspace.changes
2019-10-14 12:39:03.995082391 +0200
+++
/work/SRC/openSUSE:Factory/.plasma5-workspace.new.2352/plasma5-workspace.changes
2019-10-17 12:19:13.347633932 +0200
@@ -1,0 +2,6 @@
+Tue Oct 15 13:44:23 UTC 2019 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to fix race on startup (kde#412970):
+ * 0001-gmenu-dbusmenu-proxy-Don-t-create-.gtkrc-2.0.patch
+
+-------------------------------------------------------------------
New:
----
0001-gmenu-dbusmenu-proxy-Don-t-create-.gtkrc-2.0.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma5-workspace.spec ++++++
--- /var/tmp/diff_new_pack.IVHt7e/_old 2019-10-17 12:19:14.071632116 +0200
+++ /var/tmp/diff_new_pack.IVHt7e/_new 2019-10-17 12:19:14.075632106 +0200
@@ -40,6 +40,8 @@
%endif
Source3: baselibs.conf
Source4: plasmafullwayland.desktop
+# PATCH-FIX-UPSTREAM
+Patch1: 0001-gmenu-dbusmenu-proxy-Don-t-create-.gtkrc-2.0.patch
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
Patch501: 0001-Use-qdbus-qt5.patch
Patch502: 0001-Ignore-default-sddm-face-icons.patch
++++++ 0001-gmenu-dbusmenu-proxy-Don-t-create-.gtkrc-2.0.patch ++++++
>From da9ec45b9574097da9bed042f809062cb6c0bbe3 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fab...@ritter-vogt.de>
Date: Tue, 15 Oct 2019 15:27:16 +0200
Subject: [PATCH] [gmenu-dbusmenu-proxy] Don't create ~/.gtkrc-2.0
BUG: 412970
---
gmenu-dbusmenu-proxy/menuproxy.cpp | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/gmenu-dbusmenu-proxy/menuproxy.cpp
b/gmenu-dbusmenu-proxy/menuproxy.cpp
index 24542f286..8c2d2bd91 100644
--- a/gmenu-dbusmenu-proxy/menuproxy.cpp
+++ b/gmenu-dbusmenu-proxy/menuproxy.cpp
@@ -98,7 +98,7 @@ MenuProxy::MenuProxy()
enableGtkSettings(false);
}
- // kde-gtk-config just deletes and re-creates the gtkrc-2.0, watch this
and add out config to it again
+ // kde-gtk-config just deletes and re-creates the gtkrc-2.0, watch this
and add our config to it again
m_writeGtk2SettingsTimer->setSingleShot(true);
m_writeGtk2SettingsTimer->setInterval(1000);
connect(m_writeGtk2SettingsTimer, &QTimer::timeout, this,
&MenuProxy::writeGtk2Settings);
@@ -178,9 +178,15 @@ QString MenuProxy::gtk3SettingsIniPath()
void MenuProxy::writeGtk2Settings()
{
+ QFile rcFile(gtkRc2Path());
+ if (!rcFile.exists()) {
+ // Don't create it here, that would break writing default GTK-2.0
settings on first login,
+ // as the gtkbreeze kconf_update script only does so if it does not
exist
+ return;
+ }
+
qCDebug(DBUSMENUPROXY) << "Writing gtkrc-2.0 to" << (m_enabled ? "enable"
: "disable") << "global menu support";
- QFile rcFile(gtkRc2Path());
if (!rcFile.open(QIODevice::ReadWrite | QIODevice::Text)) {
return;
}
--
2.22.0
