Gentoo Archives: gentoo-commits

From: "Dror Levin (spatz)" <spatz@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-misc/yawp/files: yawp-0.3.2-gcc45.patch
Date: Thu, 03 Jun 2010 15:17:44
Message-Id: 20100603151739.BE8992CF45@corvid.gentoo.org
1 spatz 10/06/03 15:17:39
2
3 Added: yawp-0.3.2-gcc45.patch
4 Log:
5 Fix building with gcc 4.5, bug 322595. Thanks Markos Chandras for the patch.
6 (Portage version: 2.2_rc67/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 kde-misc/yawp/files/yawp-0.3.2-gcc45.patch
10
11 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/yawp/files/yawp-0.3.2-gcc45.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/yawp/files/yawp-0.3.2-gcc45.patch?rev=1.1&content-type=text/plain
13
14 Index: yawp-0.3.2-gcc45.patch
15 ===================================================================
16 Index: yawp-0.3.2/applet/countrymap.cpp
17 ===================================================================
18 --- yawp-0.3.2.orig/applet/countrymap.cpp
19 +++ yawp-0.3.2/applet/countrymap.cpp
20 @@ -47,7 +47,7 @@ QPointer<UsStatesMap> UsStatesMap::m_p
21 const QString CountryMap::sFlagTemplate("l10n/%1/flag.png");
22
23
24 -CountryMap::CountryMap *
25 +CountryMap *
26 CountryMap::instance()
27 {
28 QMutexLocker locker( &singeltonMutex );
29 @@ -210,7 +210,7 @@ CountryMap::private_getPixmapForCountryC
30
31 /******************************************************************************/
32
33 -UsStatesMap::UsStatesMap *
34 +UsStatesMap *
35 UsStatesMap::instance()
36 {
37 QMutexLocker locker( &singeltonMutex );
38 Index: yawp-0.3.2/applet/ionlistmodel.cpp
39 ===================================================================
40 --- yawp-0.3.2.orig/applet/ionlistmodel.cpp
41 +++ yawp-0.3.2/applet/ionlistmodel.cpp
42 @@ -45,7 +45,7 @@ IonListModel::init( QObject * parent, co
43 return bReturnVal;
44 }
45
46 -IonListModel::IonListModel *
47 +IonListModel *
48 IonListModel::instance()
49 {
50 QMutexLocker locker( &m_singeltonMutex );