diff options
Diffstat (limited to 'extra/kdebase-workspace')
| -rw-r--r-- | extra/kdebase-workspace/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/kdebase-workspace/kdebug-324574.patch | 55 |
2 files changed, 4 insertions, 59 deletions
diff --git a/extra/kdebase-workspace/PKGBUILD b/extra/kdebase-workspace/PKGBUILD index 254d9a7cf..5897f96c3 100644 --- a/extra/kdebase-workspace/PKGBUILD +++ b/extra/kdebase-workspace/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 195528 2013-10-01 15:15:58Z svenstaro $ +# $Id: PKGBUILD 202712 2013-12-25 21:25:47Z andyrtr $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.11.2 -pkgrel=1 +pkgver=4.11.4 +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' @@ -28,7 +28,7 @@ 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') -sha1sums=('fa19cf2b56f7cbcc8bb2200dc33a38150379f4ad' +sha1sums=('c1e2b669f5a1607bcce7e92d9213af1ee809d79e' '660eae40a707d2711d8d7f32a93214865506b795' '6aeecc9e0e221f0515c6bf544f9a3c11cb6961fe' '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8' diff --git a/extra/kdebase-workspace/kdebug-324574.patch b/extra/kdebase-workspace/kdebug-324574.patch deleted file mode 100644 index 053eef57e..000000000 --- a/extra/kdebase-workspace/kdebug-324574.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 - |