Backport patch from upstream fixing a race condition causing application-specific icons not to be loaded, wrt bug #484368.

(Portage version: 2.2.2/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

3 files changed, 81 insertions, 1 deletions

diff --git a/kde-base/qguiplatformplugin_kde/ChangeLog b/kde-base/qguiplatformplugin_kde/ChangeLog
index 045a79a03fd8..e013c6090a41 100644
--- a/kde-base/qguiplatformplugin_kde/ChangeLog
+++ b/kde-base/qguiplatformplugin_kde/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/qguiplatformplugin_kde
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.131 2013/09/03 19:50:30 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/ChangeLog,v 1.132 2013/09/11 17:06:15 kensington Exp $
+
+*qguiplatformplugin_kde-4.11.1-r1 (11 Sep 2013)
+
+  11 Sep 2013; Michael Palimaka <kensington@gentoo.org>
+  +files/qguiplatformplugin_kde-4.11.1-missingicons.patch,
+  +qguiplatformplugin_kde-4.11.1-r1.ebuild:
+  Backport patch from upstream fixing a race condition causing application-
+  specific icons not to be loaded, wrt bug #484368.
 
   03 Sep 2013; Chris Reffett <creffett@gentoo.org>
   -qguiplatformplugin_kde-4.11.0.ebuild:
diff --git a/kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch b/kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch
new file mode 100644
index 000000000000..ee5ca697b73f
--- /dev/null
+++ b/kde-base/qguiplatformplugin_kde/files/qguiplatformplugin_kde-4.11.1-missingicons.patch
@@ -0,0 +1,58 @@
+From 2e5a2450762f8dedf9ffd77028ed06b3a39a807d Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Mon, 9 Sep 2013 11:43:06 -0400
+Subject: [PATCH] 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 | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp b/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
+index ce22622..4f67cc5 100644
+--- a/qguiplatformplugin_kde/qguiplatformplugin_kde.cpp
++++ b/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 @@ class KQGuiPlatformPlugin : public QGuiPlatformPlugin
+ 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 @@ public: // ColorDialog
+     }
+ 
+ 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
+-- 
+1.8.3.2
+
diff --git a/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.1-r1.ebuild b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.1-r1.ebuild
new file mode 100644
index 000000000000..734e30420d7a
--- /dev/null
+++ b/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.1-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/qguiplatformplugin_kde/qguiplatformplugin_kde-4.11.1-r1.ebuild,v 1.1 2013/09/11 17:06:15 kensington Exp $
+
+EAPI=5
+
+KMNAME="kde-workspace"
+inherit kde4-meta
+
+DESCRIPTION="Helps integration of pure Qt applications with KDE Workspace"
+KEYWORDS=" ~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug"
+
+PATCHES=( "${FILESDIR}/${P}-missingicons.patch" )