Add upstream fix for plasma crash, bug 376791

Package-Manager: portage-2.1.10.10/cvs/Linux x86_64

diff --git a/kde-base/kdeplasma-addons/ChangeLog b/kde-base/kdeplasma-addons/ChangeLog
index 80577e293221c404942210380124a10f65944d8b..a1993d20e00cbce884abf307486bc5af76cf3599 100644 (file)
--- 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/Manifest b/kde-base/kdeplasma-addons/Manifest
index b13378adc276b842eeb2bdf7f6b83d147971024e..0dc0530c1214ddb49f476de6a795a47e3029ec36 100644 (file)
--- a/kde-base/kdeplasma-addons/Manifest
+++ b/kde-base/kdeplasma-addons/Manifest
@@ -3,6 +3,7 @@ Hash: SHA512
 
 AUX kdeplasma-addons-4.4.3-cmake.patch 2142 RMD160 42e9dab676b617686ef159752b4643491e0dfdd7 SHA1 2e1e74e01e64f277636b099af2b292af091ec33b SHA256 a19a933f282f1be4ab67949c1de9a4ead8e05d2ff78dafbdd600682f3c8e59b9
 AUX kdeplasma-addons-4.6.2-optional-akonadi.patch 1982 RMD160 3f6c7e4356369d1b59bd8c57d91afc4b655ce18c SHA1 01505b07c9fc41628cfcb881364367cab6b3d17a SHA256 c62b36eccb02517561d5ae88e50fbe3029c37b65b1075c1f94ab7d6bb0fd51c9
+AUX kdeplasma-addons-4.7.0-grid.patch 2222 RMD160 425ff4feb3a52d21ba995b87b7cf66e2b950a8e1 SHA1 18163a4349017376d42151899b36687e97db7fd9 SHA256 45ab4c980c63161df6d13391c5293c0e83ea87e21a139fb97eb4821c9243f572
 DIST kdeplasma-addons-4.6.3.tar.bz2 1935272 RMD160 85c546d4aad35e3785980203d2f8ff0d154cafb6 SHA1 7a43dcfebc0316e681b04d0958d89272620a11b7 SHA256 6f8c11191aecb7cd8477c3c406515dc13991c4f6f73b892c0e25e89b12e58bcf
 DIST kdeplasma-addons-4.6.4.tar.bz2 1936245 RMD160 2a97c191a1d55cc1a3c443fed2bb6abff00707eb SHA1 8d107bf8cc6b6b9d66e9178b5f18bdc1751a957f SHA256 a47ce0cf0044224147da69afdbb0c5394a249a27edc60811de953a2d3f392829
 DIST kdeplasma-addons-4.6.5.tar.bz2 1936845 RMD160 376beeb3e2bc9835a61f1089e7f2956c8d2912cf SHA1 3bce5e41160ec318dbea9128c3e9104a4428deb8 SHA256 0852f3444706c518fc242d174a614ff7d54b1826c3e5f884b10fbc7fb0755925
@@ -10,23 +11,24 @@ DIST kdeplasma-addons-4.7.0.tar.bz2 1965798 RMD160 ef84ddabc59475aa9350517fb1075
 EBUILD kdeplasma-addons-4.6.3.ebuild 2013 RMD160 4bd6ccaad55ba7ee179f369637504472d8717a34 SHA1 7d0a3a15633b3fbc5e396b7fadecdc97f645b3b3 SHA256 717e593e1cb20a2701964ae9df26d8c4de572368a73c632a30d48f96b94a661a
 EBUILD kdeplasma-addons-4.6.4.ebuild 2023 RMD160 d08698e5347c5745e562f4e4243bcdb71c6429cb SHA1 e234aa68ad1e51da442ea14919890b491f2da464 SHA256 062be43daad34dddc48a62e82a70594fdcf55e9d4be2577f8d4f327d350b2c5f
 EBUILD kdeplasma-addons-4.6.5.ebuild 2021 RMD160 5cddc48309a9893318867e7086d2abb074ddf660 SHA1 269673e1624f34bc7dbd32ad80ab1b047aed8880 SHA256 e2677f3d11adba0f1b5f05f407f4739b08c578abefc05db8bb0b27162b4d8119
+EBUILD kdeplasma-addons-4.7.0-r1.ebuild 2076 RMD160 f2e84a0cb0d95d60ed920a98f3baf0f358f88df8 SHA1 8c83a586c0b333f4e4998d87fca5e3b7fcc4de05 SHA256 76d7c39a7e1af7607cf0b50c65e111b8b32fe1421e11b8e7f3d066da7ced7a10
 EBUILD kdeplasma-addons-4.7.0.ebuild 2020 RMD160 27fa7e5d21381eee704b68aababdcdbc54bf4996 SHA1 3e58fbe7081fc1d819446e435b92eaa1b1139c8d SHA256 a630af8b5cbbdb3923712af6c0a0c1495202c1856ff847fcf3cf317712b5aeff
-MISC ChangeLog 14556 RMD160 3628bb0b1b967dc46ae2c10677d6caf4d5f71e23 SHA1 aa10a93943660a4ab73b50e04f0bf896b6de79db SHA256 3a3d7d94edbd2a01a4a755fa14edd3db069810ebe5cffeea021b54b6ed70c894
+MISC ChangeLog 14785 RMD160 7f5284aab52f36d9b65746d9cd9d65070d7945ee SHA1 be522042102a628c02fa0e93848f3666463626c8 SHA256 bc3e92b34b5eec380f4cea16c22ee8b9519da141c391f2017f1255294a07e607
 MISC metadata.xml 590 RMD160 348b8b1bc247366b339794cc2aec564b2226e067 SHA1 677e55796be545f56fc4b7351268fb7aff49aaa9 SHA256 f1b43f2d7869ec912de095ae4cac3d50bcd7cd8295d73f65e57e0ff7d8ca9ea6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOQWt5AAoJEPqDWhW0r/LCjdYP/12Wv0iEYu5kvxGxxe0lOK01
-m3INcvucFj1B2BNzZSYZO35e20WfNzgIUkXtbBe9FJlxc7yAi3rvuyz9LLl3EowH
-H0O4Hwwm/IBE8ZAmNMWRs9NX5A3uJPoqTBQ9bP0mIWWqMBMeP6kxiBg7LRPuQB/W
-81oUa2Fx/GHhaWjs/V80ZiJb8Zh7vIBaVYq5R/ES0Kog359ufkEMwQCx1vbybnqf
-J5VlT/M1/Wb1pWwmokR5CsilJ57uxkEtFuahODqmGiqxvJlL/ixYQAulIo2vIXd+
-J3eBOOtRGqgOwPtEbuXuBxMw4epZvsqDkFrhMsFKNJYqttjolQwr983YUCX3tMZL
-WFFXWJE5v0QOAIvRgNI6EAT93FwyMCSIKCANB1xGR4TtSBl1mmnKyKfUIdOLMKVw
-vdlw+T9TqYOk1+4fUKsKvU0SzMSqc8pl23zViEkNPIAtA+AcStyHXcPgXtA4xLmy
-xfoNnYUgCXazZzbtofMoWr6dX6wtyOvxJiO2f2PVqR/FpC32rvEAWS4Mw/Ndh8pQ
-pVMLj86RWBGExEYpmDxKb15ATl6/iaRi9ekmMIusxqmV30jgH8DcQKflv8x1By4C
-IvT5DGm24b4kx61bvt7bCaoopSZqBor52D6+aqvWWpHUfiY5+xV/eI9Wla0R9mTR
-lTJglCxVbrmRVf0JR+vx
-=HTyF
+iQIcBAEBCgAGBQJOQaamAAoJENwGBM22xffeCagP/RMeWoXppbEMrXmS+/fcMsOP
+K5LywwVYxp+a3+Y1qkzVRK8Cz13X6EXg0+QK7OxRdoyNsPo4BRhycKIUugsHe2z0
++kSVD2y/V/e5cvT+QmErpR0NOn54h6f7h+UGkwMoD0oGoBVR9PvkcNp8E6WRWMed
+kI0TbB7dwl3OcfnJHKXPfc/ymNSEmMK8zIv8jbZkSg7TP/Sv/M9HZhFw8SWaHQFk
+g6Qs38HLgxHWFVAZMIofh4wMtpyD9s/WmUzJjCIhcfdG4aNOg6wrU9AboXbJkotB
+LGpeglaS3/Sevgh+4zCMzUVCHu6c9ka4R7InLTXv6THzfgXgoqdTvuJpVi2bY5Nu
+D8gfENBI0tTS7AheEnjDwg0SKrbNlUM85PQVnpoewRVNwJp0Ae8qsR07MLqWfC5I
+6QIlq4Hh1MfLF5Oo1gbJ5+lnJDyTDT0fjKiSJsvEfZx1QeCevAoEOaWRzjOXB3fW
+jLPd+omIc1XrfkLDbjhdCYo0zSxhUzo+inIJYo5Pt9vebWCPoIZiTqvV+e/e48XH
+LJwsGRs8XGyJqzXpe9a5JMaoDV70I5K/WxtEzRLFmd9x/UuBmHFi8aOIDtZCp/K/
+xVVywfz5eUWKO/Rn6+Dovd6oXJPvbqH+Bp+ebKRPf48Q3KPdD2MWuF3yIdzsB8g+
+AjzC8GXyVsBkuE6zmZns
+=FvV8
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..587295a
--- /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 (file)
index 0000000..83c9364
--- /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
+}