pool/plasma5-workspace
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 738648 from KDE:Frameworks5

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/738648
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=120
This commit is contained in:
Dominique Leuenberger
2019-10-17 10:19:10 +00:00
committed by Git OBS Bridge
parent 6b9c31e88b 11e6f70420
commit 7ba02c3919
3 changed files with 51 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
0001-gmenu-dbusmenu-proxy-Don-t-create-.gtkrc-2.0.patch Normal file
View File

@@ -0,0 +1,43 @@
From da9ec45b9574097da9bed042f809062cb6c0bbe3 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@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

6
plasma5-workspace.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Oct 15 13:44:23 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- Add patch to fix race on startup (kde#412970):
* 0001-gmenu-dbusmenu-proxy-Don-t-create-.gtkrc-2.0.patch
-------------------------------------------------------------------
Thu Oct 10 14:25:48 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>

2
plasma5-workspace.spec
View File

@@ -40,6 +40,8 @@ Source2: plasma.keyring
%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