Add upstream fix for plasma crash, bug 376791

(Portage version: 2.1.10.10/cvs/Linux x86_64)

3 files changed, 146 insertions, 1 deletions

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 80577e293221..a1993d20e00c 100644
--- a/kde-base/kdeplasma-addons/ChangeLog
+++ b/kde-base/kdeplasma-addons/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdeplasma-addons
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.99 2011/08/09 17:12:35 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/ChangeLog,v 1.100 2011/08/09 21:28:49 dilfridge Exp $
+
+*kdeplasma-addons-4.7.0-r1 (09 Aug 2011)
+
+  09 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  +kdeplasma-addons-4.7.0-r1.ebuild, +files/kdeplasma-addons-4.7.0-grid.patch:
+  Add upstream fix for plasma crash, bug 376791
 
   09 Aug 2011; Markos Chandras <hwoarang@gentoo.org>
   kdeplasma-addons-4.6.5.ebuild:
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-grid.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-grid.patch
new file mode 100644
index 000000000000..587295afc895
--- /dev/null
+++ b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-grid.patch
@@ -0,0 +1,69 @@
+commit 67b5c56e564f5052238bab38342a85e5f4af570b
+Author: Christoph Feck <christoph@maxiom.de>
+Date:   Sat Jul 30 19:15:28 2011 +0200
+
+    Fix assignment operator and add copy constructor
+    
+    This fixes the crash in Grid Desktop and Grouping Desktop.
+    Thanks to Aaron Seigo for investigation and patch review.
+    
+    BUG: 278222
+    FIXED-IN: 4.7.1
+
+diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containments/groupingdesktop/lib/groupinfo.cpp
+index 2106cca..c945551 100644
+--- a/containments/groupingdesktop/lib/groupinfo.cpp
++++ b/containments/groupingdesktop/lib/groupinfo.cpp
+@@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QString &prettyName)
+     d->prettyName = prettyName;
+ }
+ 
++GroupInfo::GroupInfo(const GroupInfo &other)
++          : d(new GroupInfoPrivate())
++{
++    *d = *other.d;
++}
++
+ GroupInfo::~GroupInfo()
+ {
+     delete d;
+@@ -78,13 +84,12 @@ QString GroupInfo::icon() const
+     return d->icon;
+ }
+ 
+-GroupInfo GroupInfo::operator=(const GroupInfo &gi)
++GroupInfo &GroupInfo::operator=(const GroupInfo &gi)
+ {
+-    GroupInfo g(gi.name(), gi.prettyName());
+-    g.setFormFactors(gi.formFactors());
+-    g.setIcon(gi.icon());
+-
+-    return g;
++    if (this != &gi) {
++        *d = *gi.d;
++    }
++    return *this;
+ }
+ 
+ bool GroupInfo::operator==(const GroupInfo &gi) const
+diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments/groupingdesktop/lib/groupinfo.h
+index f8cc66f..320c800 100644
+--- a/containments/groupingdesktop/lib/groupinfo.h
++++ b/containments/groupingdesktop/lib/groupinfo.h
+@@ -31,6 +31,7 @@ class GroupInfo
+ {
+     public:
+         explicit GroupInfo(const QString &name, const QString &prettyName = QString());
++        GroupInfo(const GroupInfo &other);
+         ~GroupInfo();
+         void setFormFactors(QSet<Plasma::FormFactor> formFactors);
+         void setIcon(const QString &icon);
+@@ -40,7 +41,7 @@ class GroupInfo
+         QSet<Plasma::FormFactor> formFactors() const;
+         QString icon() const;
+ 
+-        GroupInfo operator=(const GroupInfo &gi);
++        GroupInfo &operator=(const GroupInfo &gi);
+         bool operator==(const GroupInfo &gi) const;
+         bool operator<(const GroupInfo &gi) const;
+ 
diff --git a/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..83c9364c592a
--- /dev/null
+++ b/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeplasma-addons/kdeplasma-addons-4.7.0-r1.ebuild,v 1.1 2011/08/09 21:28:49 dilfridge Exp $
+
+EAPI=4
+
+KDE_SCM="git"
+inherit kde4-base
+
+DESCRIPTION="Extra Plasma applets and engines."
+HOMEPAGE="http://www.kde.org/"
+LICENSE="GPL-2 LGPL-2"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="attica debug desktopglobe exif qalculate qwt scim semantic-desktop"
+
+# krunner is only needed to generate dbus interface for lancelot
+COMMON_DEPEND="
+	app-crypt/qca:2
+	app-crypt/qca-ossl:2
+	$(add_kdebase_dep kdelibs 'semantic-desktop=')
+	$(add_kdebase_dep krunner)
+	$(add_kdebase_dep plasma-workspace 'semantic-desktop=')
+	x11-misc/shared-mime-info
+	attica? ( dev-libs/libattica )
+	desktopglobe? ( $(add_kdebase_dep marble) )
+	exif? ( $(add_kdebase_dep libkexiv2) )
+	qalculate? ( sci-libs/libqalculate )
+	qwt? ( x11-libs/qwt:5 )
+	scim? ( app-i18n/scim )
+	semantic-desktop? (
+		$(add_kdebase_dep kdepimlibs 'semantic-desktop')
+		$(add_kdebase_dep plasma-workspace 'rss')
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/eigen:2
+"
+# kde-misc/plasmaboard: moved here in 4.3.65
+# kde-misc/qalculate-applet: since 4.4.0
+RDEPEND="${COMMON_DEPEND}
+	!kde-misc/plasmaboard
+	!kde-misc/qalculate-applet
+"
+
+# kdebase-data: some svg icons moved from data directly here.
+add_blocker kdebase-data '<4.2.88'
+
+PATCHES=( "${FILESDIR}/${PN}-4.7.0-grid.patch" )
+
+src_prepare() {
+	use semantic-desktop || epatch "${FILESDIR}/${PN}-4.6.2-optional-akonadi.patch"
+	kde4-base_src_prepare
+}
+
+src_configure() {
+	mycmakeargs=(
+		-DDBUS_INTERFACES_INSTALL_DIR="${EPREFIX}/usr/share/dbus-1/interfaces/"
+		$(cmake-utils_use_with attica LibAttica)
+		$(cmake-utils_use_with desktopglobe Marble)
+		$(cmake-utils_use_with exif Kexiv2)
+		$(cmake-utils_use_with qalculate)
+		$(cmake-utils_use_with qwt)
+		$(cmake-utils_use_with semantic-desktop KdepimLibs)
+		$(cmake-utils_use_with semantic-desktop Nepomuk)
+		$(cmake-utils_use_with scim)
+	)
+
+	kde4-base_src_configure
+}