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

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 48 insertions, 4 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/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"