Fix building with gcc 4.5, bug 322593.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 43 insertions, 12 deletions

diff --git a/kde-misc/plasma-applet-daisy/ChangeLog b/kde-misc/plasma-applet-daisy/ChangeLog
index 28ae7300108f..b406c6d83f1b 100644
--- a/kde-misc/plasma-applet-daisy/ChangeLog
+++ b/kde-misc/plasma-applet-daisy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/plasma-applet-daisy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/ChangeLog,v 1.1 2010/03/18 20:39:31 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/ChangeLog,v 1.2 2010/06/03 13:15:05 spatz Exp $
+
+  03 Jun 2010; Dror Levin <spatz@gentoo.org>
+  plasma-applet-daisy-0.0.4.22.ebuild,
+  +files/plasma-applet-daisy-0.0.4.22-gcc45.patch:
+  Fix building with gcc 4.5, bug 322593.
 
 *plasma-applet-daisy-0.0.4.22 (18 Mar 2010)
 
diff --git a/kde-misc/plasma-applet-daisy/Manifest b/kde-misc/plasma-applet-daisy/Manifest
index 75d30bdd9ace..4bff25875987 100644
--- a/kde-misc/plasma-applet-daisy/Manifest
+++ b/kde-misc/plasma-applet-daisy/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX plasma-applet-daisy-0.0.4.22-gcc45.patch 1171 RMD160 09e1df8b6095d7970b76d4022f0a75e06fceae67 SHA1 b00e25c4e1428e32a441d8daca9ed25cc6b1b7f8 SHA256 121ac872885c5f8967bbe9cfd92852596dfd882360caf9d05c5f5bb6faf0b4e4
 DIST plasma-applet-daisy-0.0.4.22.tar.gz 303127 RMD160 59d02589d8fbebe03473a6bfc6bfb74ec2eb1953 SHA1 c0c5e8e66331869756f841a59046962b03ad0271 SHA256 0ddfb8487fb9c7125beefeeba0ba7b77c5d83c3b35b413828491ebe68ca37618
-EBUILD plasma-applet-daisy-0.0.4.22.ebuild 551 RMD160 3c3f9b0f4bb765b7e3345ddefe0f7518a0e5e5a7 SHA1 daaa5fa90c18bff60bf790de061b0ac78d24d458 SHA256 5187470ab4572b80b6795f4f35d89d160bf32a9c0ad6eb0c2ff6eb29db72e681
-MISC ChangeLog 436 RMD160 0ff7a5ec0c5ea8c7c636021656eb3a49c6ac728a SHA1 1be99ce0d551cc89dd4e599414fc632f737a113f SHA256 c6a57df05780e09da2ff13c71e125d5ce034ad273c0c6d2ee4bae7c37612bd13
+EBUILD plasma-applet-daisy-0.0.4.22.ebuild 596 RMD160 10a89f5b539dea5d2dc6aabf36d55016201e0928 SHA1 cc3d7365356e4d228f77c4111da6fb6982389ba4 SHA256 62283d28a9752e90df9c04ade48cf51c274ac74066afebaaddff1dfed67b42ae
+MISC ChangeLog 613 RMD160 77bb998de63c7462dfcfdbd20793fa7370bd907c SHA1 36d2dd9ff779ecb9f1ab08670d15664a0a55c70e SHA256 8d42f42afcea5c3eda84b3cae89ade95370795cfdfd055f20181355e6fe549a3
 MISC metadata.xml 158 RMD160 7344d8189b297bc3aaa35226811d79c8dacb9f6f SHA1 4f1871fb2f1f05defed13aa3d8fd3d0e65788b5e SHA256 b1f2af69cc9a002750dfc0abd0f1dc63431290bebbabd4a17169dd3d4dbe89a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iQEcBAEBCgAGBQJLoo+JAAoJEAWF714uGAc65x8H/21fKv3woMMPj+iS75oH98Nn
-AslykFhPnfENlgaM4CDsMD5nNRavClWu1w3wAx5p2EN3F2antaFUe4gchRk/MqeF
-f8dr7hXNKMidVyUs8R0aFcNuvQPKUC5mTcfRBTxNQs92qfuuJwCnjhbvDVValfQc
-iiQSEOoE8fiv6NNCxDU+8NLbpGcUyWhsPmLTmLV3RZ4nEU8CxZ4/PR477OuADOvG
-AWULq3CLAylU6ejiJMD5LqVMFFq80DAhZl9kQ32WNpTD8n/fMNcm+iu5zCCgRwsW
-MKB34Psqi017pSK7kRmusnaVyMkB8z5z2QpDH9KBycz5Jhu2VpqsseoIY68Ntsk=
-=6hQ8
+iQEcBAEBCgAGBQJMB6rhAAoJEAWF714uGAc61ScH/3Oo9SAK9Zafr0hvZNIzWMDj
+HQmL3qexo79iR6BSmkMoYay9e9CAlbZNnRvWQK1y/b4i1cnCG6hmhWtMKu9wK+/2
+EsyZwvEAfUL6sUyf+ejUk7NLx3PTOCzY8AaKGjKn2ooJpy7TPovUteQHGTZ4SZWn
+bKghao8jx8SW5VlD90x0K4LAvudbI6lm+V5zA+EJPMel0DQaULQMZLTbA6j6sDx/
+MCy5/oK8LXxkyT5/AgLLN5WFZ9wt9Hb2WJ3sX4d9AgJos6g8gnpe+ebsRp2qrzTc
+K7xPcf+zJ+W0G9+LLr/50T4+EpveIgbw7XpCLxF5eUu+Gm9CXsqaKJ1xmWHqH7k=
+=83sl
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/plasma-applet-daisy/files/plasma-applet-daisy-0.0.4.22-gcc45.patch b/kde-misc/plasma-applet-daisy/files/plasma-applet-daisy-0.0.4.22-gcc45.patch
new file mode 100644
index 000000000000..f00893ad58b8
--- /dev/null
+++ b/kde-misc/plasma-applet-daisy/files/plasma-applet-daisy-0.0.4.22-gcc45.patch
@@ -0,0 +1,21 @@
+diff -ur plasma-applet-daisy-0.0.4.22-orig/applet/src/daisy.cpp plasma-applet-daisy-0.0.4.22/applet/src/daisy.cpp
+--- plasma-applet-daisy-0.0.4.22-orig/applet/src/daisy.cpp	2009-12-21 03:18:08.000000000 +0200
++++ plasma-applet-daisy-0.0.4.22/applet/src/daisy.cpp	2010-06-03 16:09:19.163818236 +0300
+@@ -870,7 +870,7 @@
+ 	  if (m_task)
+ 	  {
+ 	    TaskManager::BasicMenu *taskMenu;TaskManager::TaskItem *taskitem;
+-	    taskitem = new TaskManager::TaskItem::TaskItem(this, m_task);
++	    taskitem = new TaskManager::TaskItem(this, m_task);
+ 	    taskMenu = new TaskManager::BasicMenu( qobject_cast<QWidget*>(this), taskitem, m_groupManager );
+ 	    taskMenu->popup( event->screenPos() );
+ 	  }
+@@ -896,7 +896,7 @@
+ 	  {
+ 	    QList<QAction*> actionList;actionList << m_act_newinstance << m_act_editlauncher;
+ 	    TaskManager::BasicMenu *taskMenu;TaskManager::TaskItem *taskitem;
+-	    taskitem = new TaskManager::TaskItem::TaskItem(this, m_task);
++	    taskitem = new TaskManager::TaskItem(this, m_task);
+ 	    taskMenu = new TaskManager::BasicMenu( qobject_cast<QWidget*>(this), taskitem, m_groupManager, actionList );
+ 	    taskMenu->popup( event->screenPos() );
+ 	  }
diff --git a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.22.ebuild b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.22.ebuild
index 491ae9545d53..58b98584ed94 100644
--- a/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.22.ebuild
+++ b/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.22.ebuild,v 1.1 2010/03/18 20:39:31 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-applet-daisy/plasma-applet-daisy-0.0.4.22.ebuild,v 1.2 2010/06/03 13:15:05 spatz Exp $
 
 EAPI="2"
 
@@ -17,3 +17,7 @@ IUSE="debug"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}-gcc45.patch"
+)