Fix building with gcc 4.5, bug 322595. Thanks Markos Chandras for the patch.

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

4 files changed, 65 insertions, 6 deletions

diff --git a/kde-misc/yawp/ChangeLog b/kde-misc/yawp/ChangeLog
index 5f6cb3f1c4f3..6e3734714219 100644
--- a/kde-misc/yawp/ChangeLog
+++ b/kde-misc/yawp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-misc/yawp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/ChangeLog,v 1.2 2009/12/06 21:21:55 scarabeus Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/ChangeLog,v 1.3 2010/06/03 15:17:39 spatz Exp $
+
+  03 Jun 2010; Dror Levin <spatz@gentoo.org> yawp-0.3.2.ebuild,
+  +files/yawp-0.3.2-gcc45.patch:
+  Fix building with gcc 4.5, bug 322595. Thanks Markos Chandras for the
+  patch.
 
 *yawp-0.3.2 (06 Dec 2009)
 
diff --git a/kde-misc/yawp/Manifest b/kde-misc/yawp/Manifest
index 40a3253e057e..3c6e48fbd66e 100644
--- a/kde-misc/yawp/Manifest
+++ b/kde-misc/yawp/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX yawp-0.3.2-gcc45.patch 1078 RMD160 15ea7d40caa4a05bbd3bafab2769e3cdf0854ace SHA1 8aa4f23b9b536fde38a2bfc95332fab1962ce98f SHA256 cbfb2931506087c44cc686f577140b788863d5c9efd27ff757d4abb1aacb8e20
 DIST yawp-0.3.2.tar.bz2 982100 RMD160 03f46a230ed732c9b3522c9467141bf188772161 SHA1 cd9c556f87dc7ec544c6dab8ece95afd7d3865cd SHA256 d311f3871258118de7d5032de895d5e11c9d42e1f18fc256bfac1fdbbb5b8daa
-EBUILD yawp-0.3.2.ebuild 584 RMD160 a38ea194bc38727808010d81b44e50ad0f6fc630 SHA1 6f5c89eaf9d3b8b6d93afdfdec7b048f811ddf62 SHA256 b7707e52cf191151c60533572aef7fac32b9bcabc032703c4b46cfb5fe417fdd
-MISC ChangeLog 513 RMD160 ce87b72494bacd90d4d9b2aed52507346f0fecae SHA1 87aab5a0d5e3dceec012ffa5a5b3bd2a85e34181 SHA256 acd761e9b99e5358ee8bd30e5c9a1ba41a7c833d1694515bfdc068a37216ae5d
+EBUILD yawp-0.3.2.ebuild 625 RMD160 abe71c2dfd06679fa00040575aaa3a1181083a91 SHA1 5a0adfb45c5af164869e91682a26cc20309ea674 SHA256 5b3863b5b35566861031d0943974a66ea44f5815e753c6fa184219f49dd26353
+MISC ChangeLog 688 RMD160 c08479b3defdf0ca3f72f4e456d44a75ca5eaa81 SHA1 5b603a288d0aa6bd7f02d89d7d27f44a8c86c018 SHA256 2ee86418a56287e84d2bb5de585fd5634721bb96ed8d78d7b084c9c815263b6d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQEbBAEBCgAGBQJMB8ecAAoJEAWF714uGAc6Yy4H+O4w3JmZMRpM5DLs4sgKw+xz
+Y8aTktCy0a4MQdJAURSVIVw0en/j5y/q+tRHUEN1egRJsFj1cFQCIhRqOuj1ClPI
+hU5DtvVzkCrVv1teDbjgUXNptEe6djqSbKnd8dyWyeimhp5nzDwWFJ/htUttWhVX
+NZgy7XLiELKb3E4cS6I6O5DsWvi12Sm5eLckHFpEVUSBUYvuqjeKArexJ+tsg4kq
+QU/Bg19LJWGQQYnXPZrGIkvYwAztDHSCOFp8oneHx8Yk0B2g5x1YrklaHqisDpZe
+tLL8rqmOcjlQPTXHx++fRv9o+9SPywdlGxEV/hc1/dclpujcrBYsND8KGbSuxw==
+=oRle
+-----END PGP SIGNATURE-----
diff --git a/kde-misc/yawp/files/yawp-0.3.2-gcc45.patch b/kde-misc/yawp/files/yawp-0.3.2-gcc45.patch
new file mode 100644
index 000000000000..a45ad7b42967
--- /dev/null
+++ b/kde-misc/yawp/files/yawp-0.3.2-gcc45.patch
@@ -0,0 +1,35 @@
+Index: yawp-0.3.2/applet/countrymap.cpp
+===================================================================
+--- yawp-0.3.2.orig/applet/countrymap.cpp
++++ yawp-0.3.2/applet/countrymap.cpp
+@@ -47,7 +47,7 @@ QPointer<UsStatesMap>   UsStatesMap::m_p
+ const QString CountryMap::sFlagTemplate("l10n/%1/flag.png");
+ 
+ 
+-CountryMap::CountryMap *
++CountryMap *
+ CountryMap::instance()
+ {
+ 	QMutexLocker locker( &singeltonMutex );
+@@ -210,7 +210,7 @@ CountryMap::private_getPixmapForCountryC
+ 
+ /******************************************************************************/
+ 
+-UsStatesMap::UsStatesMap *
++UsStatesMap *
+ UsStatesMap::instance()
+ {
+ 	QMutexLocker locker( &singeltonMutex );
+Index: yawp-0.3.2/applet/ionlistmodel.cpp
+===================================================================
+--- yawp-0.3.2.orig/applet/ionlistmodel.cpp
++++ yawp-0.3.2/applet/ionlistmodel.cpp
+@@ -45,7 +45,7 @@ IonListModel::init( QObject * parent, co
+ 	return bReturnVal;
+ }
+ 
+-IonListModel::IonListModel *
++IonListModel *
+ IonListModel::instance()
+ {
+ 	QMutexLocker locker( &m_singeltonMutex );
diff --git a/kde-misc/yawp/yawp-0.3.2.ebuild b/kde-misc/yawp/yawp-0.3.2.ebuild
index b9ba10333f74..81a292d71236 100644
--- a/kde-misc/yawp/yawp-0.3.2.ebuild
+++ b/kde-misc/yawp/yawp-0.3.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/yawp-0.3.2.ebuild,v 1.1 2009/12/06 21:21:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/yawp/yawp-0.3.2.ebuild,v 1.2 2010/06/03 15:17:39 spatz Exp $
 
 EAPI=2
 KDE_LINGUAS="af cs de es fr he it pl ru sk sl"
@@ -17,4 +17,8 @@ IUSE="debug"
 
 RDEPEND=">=kde-base/plasma-workspace-${KDE_MINIMAL}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc45.patch"
+)
+
 DOCS="README TODO"