[SCM] plasma-workspace packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%5.5.4-0ubuntu1-3-g4b6cabd

[Clive Johnston]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 4b6cabdced2a83fd591b970f4b674845bb735f9a
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Mar 12 15:36:27 2016 +0000

    Applying patch - plasma_applet_actions_crash.diff
    
    - Adding patch created by Michael Marley to fix a crash
---
 debian/changelog                                |  5 ++++
 debian/patches/plasma_applet_actions_crash.diff | 36 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dc55dea..d7495fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ 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.
+
  -- Philip Muškovac <yofel at kubuntu.org>  Tue, 08 Mar 2016 22:34:34 +0100
 
 plasma-workspace (4:5.5.4-0ubuntu1) xenial; urgency=medium
diff --git a/debian/patches/plasma_applet_actions_crash.diff b/debian/patches/plasma_applet_actions_crash.diff
new file mode 100644
index 0000000..2672d05
--- /dev/null
+++ b/debian/patches/plasma_applet_actions_crash.diff
@@ -0,0 +1,36 @@
+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 fed1404..846ba51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kubuntu_startkde-qtpath.diff
 install_missing_header
 disable_incompatible_tests
+plasma_applet_actions_crash.diff

-- 
plasma-workspace packaging