commit: 05925f03204aa85f9e8a6c26f34b61150b6c5375 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Wed Apr 29 15:02:19 2015 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Wed Apr 29 15:02:19 2015 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=05925f03
[kde-plasma/plasma-workspace] Backport patch from upstream to fix upstream bug #346870. Package-Manager: portage-2.2.18 .../files/plasma-workspace-5.3.0-segfault.patch | 30 ++++++++++++++++++++++ ...3.0.ebuild => plasma-workspace-5.3.0-r1.ebuild} | 5 +++- 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.3.0-segfault.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.3.0-segfault.patch new file mode 100644 index 0000000..2a669cd --- /dev/null +++ b/kde-plasma/plasma-workspace/files/plasma-workspace-5.3.0-segfault.patch @@ -0,0 +1,30 @@ +From a234c0923767649cc6545866a563ffc4dba58de2 Mon Sep 17 00:00:00 2001 +From: Marco Martin <[email protected]> +Date: Wed, 29 Apr 2015 09:28:11 +0200 +Subject: [PATCH] check for model existence + +BUG:346870 +--- + wallpapers/image/image.cpp | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/wallpapers/image/image.cpp b/wallpapers/image/image.cpp +index a3b9c10..f5920bf 100644 +--- a/wallpapers/image/image.cpp ++++ b/wallpapers/image/image.cpp +@@ -799,6 +799,12 @@ void Image::removeWallpaper(QString name) + + void Image::commitDeletion() + { ++ //This is invokable from qml, so at any moment ++ //we can't be sure the model exists ++ if (!m_model) { ++ return; ++ } ++ + for (const QString wallpaperCandidate : m_model->wallpapersAwaitingDeletion()) { + removeWallpaper(wallpaperCandidate); + } +-- +2.0.5 + diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.3.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.3.0-r1.ebuild similarity index 97% rename from kde-plasma/plasma-workspace/plasma-workspace-5.3.0.ebuild rename to kde-plasma/plasma-workspace/plasma-workspace-5.3.0-r1.ebuild index 1445a90..7fb571f 100644 --- a/kde-plasma/plasma-workspace/plasma-workspace-5.3.0.ebuild +++ b/kde-plasma/plasma-workspace/plasma-workspace-5.3.0-r1.ebuild @@ -123,7 +123,10 @@ DEPEND="${COMMON_DEPEND} x11-proto/xproto " -PATCHES=( "${FILESDIR}/${PN}-startkde-script.patch" ) +PATCHES=( + "${FILESDIR}/${PN}-startkde-script.patch" + "${FILESDIR}/${P}-segfault.patch" +) RESTRICT="test"
