Thu Sep 12 01:42:53 PDT 2013

2 files changed, 63 insertions, 4 deletions

diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD
index a8207807f..216f5cddd 100644
--- a/extra/kdebase-workspace/PKGBUILD
+++ b/extra/kdebase-workspace/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 194052 2013-09-10 13:23:12Z andrea $
+# $Id: PKGBUILD 194252 2013-09-11 15:17:31Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=kdebase-workspace
 _pkgname=kde-workspace
 pkgver=4.11.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Provides the interface and basic tools for the KDE workspace"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kde-workspace'
@@ -27,7 +27,8 @@ install="${pkgname}.install"
 backup=('usr/share/config/kdm/kdmrc')
 source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz"
         'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'kdm.logrotate'
-        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
+        'etc-scripts.patch' 'terminate-server.patch' 'kdm-xinitrd.patch'
+        'kdebug-324574.patch')
 sha1sums=('4515c2909d2b9e711758a566ef6cd9e2f2181531'
           '660eae40a707d2711d8d7f32a93214865506b795'
           '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe'
@@ -36,7 +37,8 @@ sha1sums=('4515c2909d2b9e711758a566ef6cd9e2f2181531'
           'bbe55f2000217474ce7246f12ee437ceaaf7e9ae'
           'c079ebd157c836ba996190f0d2bcea1a7828d02c'
           'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
-          'd509dac592bd8b310df27991b208c95b6d907514')
+          'd509dac592bd8b310df27991b208c95b6d907514'
+          'd0269345377df58205dba7b0a1403df4f30afe93')
 
 prepare() {
         mkdir build
@@ -50,6 +52,8 @@ prepare() {
 
         # KDEBUG#202629
         patch -p0 -i "${srcdir}"/terminate-server.patch
+
+        patch -p1 -i "${srcdir}"/kdebug-324574.patch
 }
 
 build() {
diff --git a/extra/kdebase-workspace/kdebug-324574.patch b/extra/kdebase-workspace/kdebug-324574.patch
new file mode 100644
index 000000000..053eef57e
--- /dev/null
+++ b/extra/kdebase-workspace/kdebug-324574.patch
@@ -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
+---
+
+
+--- 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 @@
+ 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
+