Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kdebump2.git;a=commitdiff;h=d70fd9899b23c170f6f36576bce6894701b3c86c
commit d70fd9899b23c170f6f36576bce6894701b3c86c Author: Melko <[email protected]> Date: Mon Sep 9 17:56:00 2013 +0200 kdebase-workspace-4.11.1-3-i686 * add patch to fix bug with icons see https://bugs.kde.org/show_bug.cgi?id=324574 diff --git a/source/kde/kdebase-workspace/0001-Delay-KDE-class-initialization-to-main-loop.patch b/source/kde/kdebase-workspace/0001-Delay-KDE-class-initialization-to-main-loop.patch new file mode 100644 index 0000000..053eef5 --- /dev/null +++ b/source/kde/kdebase-workspace/0001-Delay-KDE-class-initialization-to-main-loop.patch @@ -0,0 +1,55 @@ +From: Weng Xuetian <[email protected]> +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 + diff --git a/source/kde/kdebase-workspace/FrugalBuild b/source/kde/kdebase-workspace/FrugalBuild index fa50722..36ad63d 100644 --- a/source/kde/kdebase-workspace/FrugalBuild +++ b/source/kde/kdebase-workspace/FrugalBuild @@ -9,7 +9,7 @@ USE_GPSD=${USE_GPSD:-"n"} USE_NETWORKMANAGER=${USE_NETWORKMANAGER:-"y"} pkgname=kdebase-workspace -pkgrel=2 +pkgrel=3 pkgdesc="Programs specific for the KDE4 desktop." groups=('kde' 'kde-minimal') archs=('i686' 'x86_64') @@ -35,6 +35,7 @@ source=("${source[@]}" \ kdm.service \ kdebase-workspace-4.4.92-kdm_plymouth081.patch \ kdebase-workspace-4.7.0-enable-lcdfilter.patch \ + 0001-Delay-KDE-class-initialization-to-main-loop.patch \ shutdownfix.patch) sha1sums=("${sha1sums[@]}" \ 'e1f706c984fc81633663c662e674b6f2c64d2f83' \ @@ -43,6 +44,7 @@ sha1sums=("${sha1sums[@]}" \ '8322ef283c3070dda27ce9cb443ee2cc8e89c37d' \ '5924185ad7a9f16964edd36e68cb3714ba406253' \ '48e6d8e6a38438d93ba53fff3784662814a2adb1' \ + 'd0269345377df58205dba7b0a1403df4f30afe93' \ '0385f30d7dd28a2d2365edebed4a4833ac9171f6') provides=("libksysguard" "$pkgname-extra-cursors" "plasma-scriptengine-google-gadgets") _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
