Hello community,
here is the log from the commit of package plasma-addons for openSUSE:Factory
checked in at Mon Aug 1 16:11:09 CEST 2011.
--------
--- plasma-addons/plasma-addons.changes 2011-07-22 20:21:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/plasma-addons/plasma-addons.changes 2011-07-30 20:10:18.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Jul 30 18:03:55 UTC 2011 - idonmez@novell.com
+
+- Add bko-278222.patch, fix plasma crash with grid desktop. Upstream
+ commit 67b5c56e564f5052238bab38342a85e5f4af570b
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
bko-278222.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-addons.spec ++++++
--- /var/tmp/diff_new_pack.kQdUwg/_old 2011-08-01 16:10:05.000000000 +0200
+++ /var/tmp/diff_new_pack.kQdUwg/_new 2011-08-01 16:10:05.000000000 +0200
@@ -19,7 +19,7 @@
Name: plasma-addons
Version: 4.7.0
-Release: 1
+Release: 2
License: GPLv2+
Summary: Additional Plasma Widgets
Url: http://www.kde.org/
@@ -27,6 +27,7 @@
Source0: kdeplasma-addons-%{version}.tar.bz2
Patch1: krunner-akonadi-dont-cause-start.diff
Patch2: lancelot-suse.diff
+Patch3: bko-278222.patch
BuildRequires: fdupes
BuildRequires: kdebase4-workspace-devel
BuildRequires: kopete
@@ -90,6 +91,7 @@
%setup -q -n kdeplasma-addons-%{version}
%patch1
%patch2
+%patch3 -p1
%build
%cmake_kde4 -d build
++++++ bko-278222.patch ++++++
commit 67b5c56e564f5052238bab38342a85e5f4af570b
Author: Christoph Feck
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(QSetPlasma::FormFactor formFactors);
void setIcon(const QString &icon);
@@ -40,7 +41,7 @@ class GroupInfo
QSetPlasma::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;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org