[arch-commits] Commit in amule/trunk (PKGBUILD gcc4.7.patch)

[Giovanni Scafora]

    Date: Tuesday, April 10, 2012 @ 18:27:48
  Author: giovanni
Revision: 155989

upgpkg: amule 10771-1

upstream release

Added:
  amule/trunk/gcc4.7.patch
Modified:
  amule/trunk/PKGBUILD

--------------+
 PKGBUILD     |   13 +++++++++----
 gcc4.7.patch |   19 +++++++++++++++++++
 2 files changed, 28 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-10 20:46:54 UTC (rev 155988)
+++ PKGBUILD	2012-04-10 22:27:48 UTC (rev 155989)
@@ -5,19 +5,24 @@
 # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
 
 pkgname=amule
-pkgver=10765
+pkgver=10771
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
 license=('GPL')
-depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
-source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2")
-md5sums=('62d408a9e524452ebf51e807122320b0')
+depends=('wxgtk' 'gd' 'geoip' 'libupnp' 'crypto++')
+source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
+        'gcc4.7.patch')
+md5sums=('0439a71048c7dbdf912d19979dc0faad'
+         '0498a6795f4ac3a3e8bbcf51a5026820')
 
 build() {
   cd "${srcdir}/aMule-SVN-r${pkgver}"
 
+  # Fix gcc-4.7 build
+  patch -Np1 -i "${srcdir}/gcc4.7.patch"
+
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --enable-cas \

Added: gcc4.7.patch
===================================================================
--- gcc4.7.patch	                        (rev 0)
+++ gcc4.7.patch	2012-04-10 22:27:48 UTC (rev 155989)
@@ -0,0 +1,19 @@
+--- a/src/ObservableQueue.h	2011-11-20 19:08:59.000000000 +0100
++++ b/src/ObservableQueue.h	2012-04-11 00:06:28.000000000 +0200
+@@ -331,14 +331,14 @@
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverAdded( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STARTING ), o );
++	this->NotifyObservers( EventType( EventType::STARTING ), o );
+ }
+ 
+ 
+ template <typename ValueType>
+ void CObservableQueue<ValueType>::ObserverRemoved( ObserverType* o )
+ {
+-	NotifyObservers( EventType( EventType::STOPPING ), o );
++	this->NotifyObservers( EventType( EventType::STOPPING ), o );
+ }
+ 
+