[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=17fae39

The following commit has been merged in the master branch:
commit 17fae397d14b90a725401f4fec302940826c29d4
Author: Howard Chan <smartboyhw at gmail.com>
Date:   Sun Sep 15 21:30:32 2013 +0800

    Cherry-pick commits 7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6 and
    b56d1552e9a8f8efe8fb8fd641126e78627c61a9 from upstream
    to fix the bug where "Show a launcher when not running"
    does not pin a launcher
---
 debian/changelog                                   |  9 +++++
 ...001-spin-event-loop-before-destroying-menu.diff | 41 ++++++++++++++++++++++
 .../0002-fix-show-a-launcher-when-not-running.diff | 41 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 93 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index baa79aa..f345a86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+kdeplasma-addons (4:4.11.1-0ubuntu2) saucy; urgency=low
+
+  * Cherry-pick commits 7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6 and
+    b56d1552e9a8f8efe8fb8fd641126e78627c61a9 from upstream
+    to fix the bug where "Show a launcher when not running"
+    does not pin a launcher
+
+ -- Howard Chan <smartboyhw at gmail.com>  Sun, 15 Sep 2013 21:23:18 +0800
+
 kdeplasma-addons (4:4.11.1-0ubuntu1) saucy; urgency=low
 
   * New upstream bugfix release.
diff --git a/debian/patches/0001-spin-event-loop-before-destroying-menu.diff b/debian/patches/0001-spin-event-loop-before-destroying-menu.diff
new file mode 100644
index 0000000..ae3807c
--- /dev/null
+++ b/debian/patches/0001-spin-event-loop-before-destroying-menu.diff
@@ -0,0 +1,41 @@
+Description: 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.
+ Author: Eike Hein <hein at kde.org>
+Origin: upstream, https://projects.kde.org/projects/kde/kdeplasma-addons/repository/revisions/7c3011e0a6459c00cf9d06d74da3a32f87f1a2f6
+Bug: https://bugs.kde.org/show_bug.cgi?id=324661
+Applied-Upstream: 4.11.2
+Reviewed-by: Howard Chan <smartboyhw at gmail.com>
+Last-Update: 2013-09-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+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;
+ }
+ 
diff --git a/debian/patches/0002-fix-show-a-launcher-when-not-running.diff b/debian/patches/0002-fix-show-a-launcher-when-not-running.diff
new file mode 100644
index 0000000..d592381
--- /dev/null
+++ b/debian/patches/0002-fix-show-a-launcher-when-not-running.diff
@@ -0,0 +1,41 @@
+Description: Fix it for non-running items too.
+ 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.
+Author: Eike Hein <hein at kde.org>
+Origin: upstream, https://projects.kde.org/projects/kde/kdeplasma-addons/repository/revisions/b56d1552e9a8f8efe8fb8fd641126e78627c61a9
+Bug: https://bugs.kde.org/show_bug.cgi?id=324661
+Applied-Upstream: 4.11.2
+Reviewed-by: Howard Chan <smartboyhw at gmail.com>
+Last-Update: 2013-09-15
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+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();
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 203c746..2d47165 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 kubuntu_01_news_applet_name.diff
 marble-4.7-compat.diff
+0001-spin-event-loop-before-destroying-menu.diff
+0002-fix-show-a-launcher-when-not-running.diff  

-- 
KDE Plasma Addons module packaging