diff options
Diffstat (limited to 'extra/kdeplasma-addons')
| -rw-r--r-- | extra/kdeplasma-addons/PKGBUILD | 6 | ||||
| -rw-r--r-- | extra/kdeplasma-addons/kdebug-324661.patch | 76 |
2 files changed, 3 insertions, 79 deletions
diff --git a/extra/kdeplasma-addons/PKGBUILD b/extra/kdeplasma-addons/PKGBUILD index c1261c071..7ea2c4130 100644 --- a/extra/kdeplasma-addons/PKGBUILD +++ b/extra/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 195758 2013-10-01 15:34:46Z svenstaro $ +# $Id: PKGBUILD 202584 2013-12-22 12:49:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -77,7 +77,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-qmlwallpapers' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.11.2 +pkgver=4.12.0 pkgrel=1 arch=('i686' 'x86_64') url='https://projects.kde.org/projects/kde/kdeplasma-addons' @@ -86,7 +86,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'mesa') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('2060310ec0dbd2f5b12ac2f783de85689c9df9e8') +sha1sums=('0e0df64b06c77285a0119832cadd548b6b223ff1') prepare() { mkdir build diff --git a/extra/kdeplasma-addons/kdebug-324661.patch b/extra/kdeplasma-addons/kdebug-324661.patch deleted file mode 100644 index 92de3fcc9..000000000 --- a/extra/kdeplasma-addons/kdebug-324661.patch +++ /dev/null @@ -1,76 +0,0 @@ -commit 7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6 -Author: Eike Hein <hein@kde.org> -Date: Mon Sep 9 23:12:45 2013 +0200 - - Spin the event loop before destroying the menu. - - This allows the menu implementation to complete toggling the - launcher before the instance is destroyed. It's extremely un- - fortunate that the library currently requires this careful - handling; see e944d7ae in kde-workspace for a note on what - needs to be cleaned up there. - - BUG:324661 - -diff --git a/applets/icontasks/windowtaskitem.cpp b/applets/icontasks/windowtaskitem.cpp -index 970c19f..61b39ef 100644 ---- a/applets/icontasks/windowtaskitem.cpp -+++ b/applets/icontasks/windowtaskitem.cpp -@@ -406,17 +406,18 @@ void WindowTaskItem::showContextMenu(const QPoint &pos, bool showAppMenu) - actionList.append(configAction); - } - -- TaskManager::BasicMenu menu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>()); -- menu.adjustSize(); -+ TaskManager::BasicMenu * menu = new TaskManager::BasicMenu(0, m_task.data(), &m_applet->groupManager(), actionList, showAppMenu ? getAppMenu() : QList <QAction*>()); -+ menu->adjustSize(); - - if (m_applet->formFactor() != Plasma::Vertical) { -- menu.setMinimumWidth(size().width()); -+ menu->setMinimumWidth(size().width()); - } - - Q_ASSERT(m_applet->containment()); - Q_ASSERT(m_applet->containment()->corona()); - stopWindowHoverEffect(); -- menu.exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu.size()) : pos); -+ menu->exec(pos.isNull() ? m_applet->containment()->corona()->popupPosition(this, menu->size()) : pos); -+ menu->deleteLater(); - delete a; - } - -commit b56d1552e9a8f8efe8fb8fd641126e78627c61a9 -Author: Eike Hein <hein@kde.org> -Date: Mon Sep 9 23:33:30 2013 +0200 - - Fix it for non-running items too. - - BUG:324661 - -diff --git a/applets/icontasks/applauncheritem.cpp b/applets/icontasks/applauncheritem.cpp -index b5f646c..f721b5a 100644 ---- a/applets/icontasks/applauncheritem.cpp -+++ b/applets/icontasks/applauncheritem.cpp -@@ -100,17 +100,18 @@ void AppLauncherItem::contextMenuEvent(QGraphicsSceneContextMenuEvent *e) - actionList.append(configAction); - } - -- TaskManager::BasicMenu menu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu()); -- menu.adjustSize(); -+ TaskManager::BasicMenu *menu = new TaskManager::BasicMenu(0, m_launcher, &m_applet->groupManager(), actionList, getAppMenu()); -+ menu->adjustSize(); - - if (m_applet->formFactor() != Plasma::Vertical) { -- menu.setMinimumWidth(size().width()); -+ menu->setMinimumWidth(size().width()); - } - - Q_ASSERT(m_applet->containment()); - Q_ASSERT(m_applet->containment()->corona()); - stopWindowHoverEffect(); -- menu.exec(m_applet->containment()->corona()->popupPosition(this, menu.size())); -+ menu->exec(m_applet->containment()->corona()->popupPosition(this, menu->size())); -+ menu->deleteLater(); - } - - |