[SCM] KDE Plasma Addons module packaging branch, master, updated. debian/4.13.1-1-333-g5d6336c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdeplasma-addons.git;a=commitdiff;h=1c7aac6

The following commit has been merged in the master branch:
commit 1c7aac688ffbfe5f4b919859f73ba96ed86abf4f
Author: Philip Muskovac <yofel at gmx.net>
Date:   Sat Jul 30 20:04:29 2011 +0200

    Cherry-pick upstream commit 67b5c56e564f5052238bab38342a85e5f4af570b
    as kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
    to fix crash when using the desktop grid layout.
---
 debian/changelog                                   |  8 +++
 ...signment-operator-and-add-copy-constructor.diff | 75 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 84 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9544774..b6b8427 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+kdeplasma-addons (4:4.7.0-0ubuntu2) oneiric; urgency=low
+
+  * Cherry-pick upstream commit 67b5c56e564f5052238bab38342a85e5f4af570b
+    as kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
+    to fix crash when using the desktop grid layout.
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Sat, 30 Jul 2011 20:01:32 +0200
+
 kdeplasma-addons (4:4.7.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release
diff --git a/debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff b/debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
new file mode 100644
index 0000000..cc65f3b
--- /dev/null
+++ b/debian/patches/kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff
@@ -0,0 +1,75 @@
+From 67b5c56e564f5052238bab38342a85e5f4af570b Mon Sep 17 00:00:00 2001
+From: Christoph Feck <christoph at maxiom.de>
+Date: Sat, 30 Jul 2011 19:15:28 +0200
+Subject: [PATCH] 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
+---
+ containments/groupingdesktop/lib/groupinfo.cpp |   17 +++++++++++------
+ containments/groupingdesktop/lib/groupinfo.h   |    3 ++-
+ 2 files changed, 13 insertions(+), 7 deletions(-)
+
+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;
+ 
+-- 
+1.7.5.4
+
diff --git a/debian/patches/series b/debian/patches/series
index fc93edc..368ddc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 kubuntu_04_kimpanel_disable_scim.diff
 #kubuntu_02_microblog_default_configuration.diff
 #kubuntu_03_opendestop_setup.diff
+kubuntu_Fix-assignment-operator-and-add-copy-constructor.diff

-- 
KDE Plasma Addons module packaging