Hrvoje Senjan 2015-04-13 09:53:16 +00:00 committed by Git OBS Bridge
parent 94f0851ca3
commit 8362c1d47a
3 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,29 @@
From b4df3adace0ef5a471318250c4a948f6ee2b1322 Mon Sep 17 00:00:00 2001
From: Marco Martin <notmart@gmail.com>
Date: Mon, 13 Apr 2015 11:33:34 +0200
Subject: [PATCH 1/1] delete the views before containments
if we delete containments before views, an invalid delete
will be done at views delete
BUG:345758
---
shell/shellcorona.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 9c9d52c198fe06222d99f29ea0778b8617cb85ec..4aff26e4173ae3428a5f159d21505f608a6b4c3d 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -180,8 +180,8 @@ ShellCorona::ShellCorona(QObject *parent)
ShellCorona::~ShellCorona()
{
- qDeleteAll(containments());
qDeleteAll(m_views);
+ qDeleteAll(containments());
qDeleteAll(m_panelViews);
}
--
2.3.4

View File

@ -6,6 +6,8 @@ Sat Apr 11 18:53:49 UTC 2015 - hrvoje.senjan@gmail.com
* For more details please see:
https://www.kde.org/announcements/plasma-5.2.95.php
- Update required Qt version to 5.4.0
- Added 0001-delete-the-views-before-containments.patch from upstream,
(kde#345758)
-------------------------------------------------------------------
Fri Mar 27 17:09:18 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -35,6 +35,7 @@ Patch1: create_kdehome.patch
Patch2: 0003-Remove-export-of-QT_PLUGIN_PATH.patch
# PATCHES 100-200 and above are from upstream 5.3 branch
# PATCHES 201-300 and above are from upstream master/5.4 branch
Patch201: 0001-delete-the-views-before-containments.patch
BuildRequires: alsa-devel
BuildRequires: baloo5-devel >= %{version}
BuildRequires: kactivities5-devel >= 5.8.0
@ -191,6 +192,7 @@ workspace. Development files.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch201 -p1
%build
%cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE_DEFAULT_HOME=.kde4 -DCMAKE_INSTALL_LOCALEDIR=share/locale/kf5