[kdeplasma-addons] Fix crash with Group Desktop plasma option

[Radek Novacek]

commit 6c3fc5436b7d07c79bbb945722637aff54dd6f6c
Author: Radek Novacek <rad.n at centrum.cz>
Date:   Mon Aug 8 09:13:21 2011 +0200

    Fix crash with Group Desktop plasma option

 kdebase-workspace-4.7.0-kde#278222.patch |   69 ++++++++++++++++++++++++++++++
 kdeplasma-addons.spec                    |   11 ++++-
 2 files changed, 79 insertions(+), 1 deletions(-)
---
diff --git a/kdebase-workspace-4.7.0-kde#278222.patch b/kdebase-workspace-4.7.0-kde#278222.patch
new file mode 100644
index 0000000..587295a
--- /dev/null
+++ b/kdebase-workspace-4.7.0-kde#278222.patch
@@ -0,0 +1,69 @@
+commit 67b5c56e564f5052238bab38342a85e5f4af570b
+Author: Christoph Feck <christoph at 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/kdeplasma-addons.spec b/kdeplasma-addons.spec
index 83eb623..6fc227b 100644
--- a/kdeplasma-addons.spec
+++ b/kdeplasma-addons.spec
@@ -1,7 +1,7 @@
 Name:           kdeplasma-addons
 Summary:        Additional plasmoids for KDE
 Version:        4.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2
 Group:          User Interface/Desktops
@@ -13,6 +13,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ## upstream patches
 
+# fix crash with Grid Desktop plasma option
+# https://bugs.kde.org/show_bug.cgi?id=278222#c16
+Patch100: kdebase-workspace-4.7.0-kde#278222.patch
+
 BuildRequires:  attica-devel
 BuildRequires:  boost-devel
 BuildRequires:  gettext
@@ -96,6 +100,7 @@ Requires: kdeedu-marble >= %{version}
 %prep
 %setup -q -n kdeplasma-addons-%{version}%{?alphatag}
 
+%patch100 -p1 -b .kde#278222
 
 %build
 
@@ -188,6 +193,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Aug 08 2011 Radek Novacek <rnovacek at redhat.com> 4.7.0-2
+- Fix crash with Group Desktop plasma option (fixed upstream)
+- https://bugs.kde.org/show_bug.cgi?id=278222#c16
+
 * Tue Jul 26 2011 Jaroslav Reznik <jreznik at redhat.com> 4.7.0-1
 - 4.7.0