diff --git a/0001-delete-the-views-before-containments.patch b/0001-delete-the-views-before-containments.patch deleted file mode 100644 index 9f7b2d6..0000000 --- a/0001-delete-the-views-before-containments.patch +++ /dev/null @@ -1,29 +0,0 @@ -From b4df3adace0ef5a471318250c4a948f6ee2b1322 Mon Sep 17 00:00:00 2001 -From: Marco Martin -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 - diff --git a/plasma5-workspace.changes b/plasma5-workspace.changes index 0ac012d..a2bb601 100644 --- a/plasma5-workspace.changes +++ b/plasma5-workspace.changes @@ -4,6 +4,7 @@ Thu Apr 23 13:27:33 UTC 2015 - hrvoje.senjan@gmail.com - Update to 5.3 Final: * For more details please see: https://www.kde.org/announcements/plasma-5.3.0.php +- Drop 0001-delete-the-views-before-containments.patch, merged upstream ------------------------------------------------------------------- Sat Apr 11 18:53:49 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/plasma5-workspace.spec b/plasma5-workspace.spec index 39e4bf4..495e53a 100644 --- a/plasma5-workspace.spec +++ b/plasma5-workspace.spec @@ -35,7 +35,6 @@ 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 @@ -192,7 +191,6 @@ 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