[SCM] plasma-workspace packaging branch, master, updated. debian/5.3.2-3-4-g8586883

Jeremy Lainé sharky at moszumanska.debian.org
Sun Jul 26 14:01:51 UTC 2015


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

The following commit has been merged in the master branch:
commit 3d56b675ae10595fc7c2222a367a40afeece388a
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Sun Jul 26 15:21:55 2015 +0200

    Apply upstream patch to avoid crash on shutdown
---
 debian/changelog                           |  1 +
 debian/patches/fix_crash_on_shutdown.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c51a2c3..ec9229a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ plasma-workspace (4:5.3.2-4) UNRELEASED; urgency=medium
   [ Jeremy Lainé ]
   * Apply patch from Michael Musenbrock to avoid null pointer dereferencing in
     PlasmoidTask constructor (Closes: #792875).
+  * Apply upstream patch to avoid crash on shutdown (Closes: #793513).
 
  -- Felix Geyer <fgeyer at debian.org>  Sat, 25 Jul 2015 16:17:06 +0200
 
diff --git a/debian/patches/fix_crash_on_shutdown.patch b/debian/patches/fix_crash_on_shutdown.patch
new file mode 100644
index 0000000..fa1f364
--- /dev/null
+++ b/debian/patches/fix_crash_on_shutdown.patch
@@ -0,0 +1,25 @@
+From: Kai Uwe Broulik <kde at privat.broulik.de>
+Date: Sat, 11 Jul 2015 00:06:52 +0000
+Subject: Clear view lists in destructor
+
+This fixes a crash on shutdown when it has already deleted its
+views but someone calls into availableScreenRect
+
+Origin: upstream, http://quickgit.kde.org/?p=plasma-workspace.git&a=commitdiff&h=4942878b67c6a5ae82df11264eb751944cea4a69
+Bug: https://bugs.kde.org/show_bug.cgi?id=348511
+Bug-Debian: http://bugs.debian.org/793513
+
+--- a/shell/shellcorona.cpp
++++ b/shell/shellcorona.cpp
+@@ -196,8 +196,10 @@
+ ShellCorona::~ShellCorona()
+ {
+     qDeleteAll(m_views);
++    m_views.clear();
+     qDeleteAll(containments());
+     qDeleteAll(m_panelViews);
++    m_panelViews.clear();
+ }
+ 
+ KPackage::Package ShellCorona::lookAndFeelPackage()
+
diff --git a/debian/patches/series b/debian/patches/series
index 56b0abf..d9a16a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ install_missing_header
 plasma-workspace-upstream-replace_reference_to_license_with_the_bsd_license
 check_signals_defined.diff
 plasmoid_creation_fix_null_check.patch
+fix_crash_on_shutdown.patch

-- 
plasma-workspace packaging



More information about the pkg-kde-commits mailing list