jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

kde-workspace: added patch for loading of app-specific icons, via Arch.

Browse source
This commit is contained in:
Juan RP 2013-09-11 18:40:39 +02:00
parent 8e8a601e05
commit 941244613d
2 changed files with 56 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
srcpkgs/kde-workspace/patches/kdebug-324574.patch Normal file
View file

@ -0,0 +1,55 @@
From: Weng Xuetian <wengxt@gmail.com>
Date: Mon, 09 Sep 2013 15:43:06 +0000
Subject: Delay KDE class initialization to main loop
X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&a=commitdiff&h=2e5a2450762f8dedf9ffd77028ed06b3a39a807d
---
Delay KDE class initialization to main loop
Gui platform plugin is loaded during QApplication construction, but it
relies on some KApplication/QApplication data to work correctly.
This patch delays the initialization to main loop, to ensure
KApplication/QApplication is already constructed.
BUG: 324574
FIXED-IN: 4.11.2
REVIEW: 112602
---
--- qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+++ qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
@@ -28,6 +28,7 @@
#include <KDE/KFileDialog>
#include <KDE/KColorDialog>
#include <QtCore/QHash>
+#include <QtCore/QTimer>
#include <QtGui/QFileDialog>
#include <QtGui/QColorDialog>
#include <QtGui/QApplication>
@@ -153,9 +154,7 @@
public:
KQGuiPlatformPlugin()
{
- connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
- connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
- connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
+ QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
}
virtual QStringList keys() const { return QStringList() << QLatin1String("kde"); }
@@ -340,6 +339,13 @@
}
private slots:
+ void init()
+ {
+ connect(KIconLoader::global(), SIGNAL(iconLoaderSettingsChanged()), this, SLOT(updateToolbarIcons()));
+ connect(KGlobalSettings::self(), SIGNAL(toolbarAppearanceChanged(int)), this, SLOT(updateToolbarStyle()));
+ connect(KGlobalSettings::self(), SIGNAL(kdisplayStyleChanged()), this, SLOT(updateWidgetStyle()));
+ }
+
void updateToolbarStyle()
{
//from gtksymbol.cpp

2
srcpkgs/kde-workspace/template
View file

@ -1,7 +1,7 @@
# Template file for 'kde-workspace'
pkgname=kde-workspace
version=4.11.1
revision=2
revision=3
short_desc="Provides the interface and basic tools for the KDE workspace"
maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL, LGPL, FDL"