[SCM] plasma-workspace packaging branch, kubuntu_unstable, updated. ubuntu/4%5.5.4-0ubuntu1-25-g8088013

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-workspace.git;a=commitdiff;h=8088013

The following commit has been merged in the kubuntu_unstable branch:
commit 8088013f05d2bd06b42e4cb9863cfc35c516211c
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Mar 12 22:21:54 2016 +0000

    Removed upstream patch plasma_applet_actions_crash.diff
---
 debian/changelog                                |  6 +----
 debian/patches/plasma_applet_actions_crash.diff | 36 -------------------------
 debian/patches/series                           |  1 -
 3 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ba7973..4b4c1ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,7 @@ plasma-workspace (4:5.5.5.2-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Clive Johnston ]
   * Another new upstream bugfix release
-
-  [ Michael Marley ]
-  * Cherrypicked fix ( plasma_applet_actions_crash.diff ) for
-    https://bugs.kde.org/show_bug.cgi?id=351777 which is a fix
-    upstream for Plasma 5.6.
+  * Removed plasma_applet_actions_crash.diff
 
  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 08 Mar 2016 22:34:34 +0100
 
diff --git a/debian/patches/plasma_applet_actions_crash.diff b/debian/patches/plasma_applet_actions_crash.diff
deleted file mode 100644
index 2672d05..0000000
--- a/debian/patches/plasma_applet_actions_crash.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From: David Edmundson <kde at davidedmundson.co.uk>
-Date: Mon, 01 Feb 2016 23:06:48 +0000
-Subject: Fix the Plasma::Applet::Actions crash
-X-Git-Url: http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=5a1a411b41f950e97d80ff7c898052fb6d02fb1a
----
-Fix the Plasma::Applet::Actions crash
-
-We were mixing KScreen and QScreen API.
-
-Corona.cpp checks we are requesting a containment for a valid screen
-if (screen >= 0 && screen < numScreens()) {
-
-This fails as numScreens() is Qt API based, whereas the signal we're
-adding the output for is ShellCorona::addOutput
-
-BUG: 351777
-REVIEW: 126961
----
-
-
---- a/shell/shellcorona.cpp
-+++ b/shell/shellcorona.cpp
-@@ -630,7 +630,11 @@
- 
- int ShellCorona::numScreens() const
- {
--    return QGuiApplication::screens().count();
-+    //don't start loading screens until kscreen has finished initialising.
-+    if (!m_screenConfiguration) {
-+        return 0;
-+    }
-+    return m_screenConfiguration->outputs().count();
- }
- 
- QRect ShellCorona::screenGeometry(int id) const
-
diff --git a/debian/patches/series b/debian/patches/series
index 846ba51..fed1404 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 kubuntu_startkde-qtpath.diff
 install_missing_header
 disable_incompatible_tests
-plasma_applet_actions_crash.diff

-- 
plasma-workspace packaging