From ab7a55e53fc209fd3cf355db3dc0d9b5a6685298 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 12 Apr 2012 00:01:12 +0000
Subject: Thu Apr 12 00:01:12 UTC 2012

---
 extra/amule/PKGBUILD     | 15 ++++++++++-----
 extra/amule/gcc4.7.patch | 19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)
 create mode 100644 extra/amule/gcc4.7.patch

(limited to 'extra/amule')

diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index a3b1e81c6..b56951402 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,23 +1,28 @@
-# $Id: PKGBUILD 151264 2012-02-25 10:26:10Z giovanni $
+# $Id: PKGBUILD 155990 2012-04-10 22:28:11Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
 # 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 \
diff --git a/extra/amule/gcc4.7.patch b/extra/amule/gcc4.7.patch
new file mode 100644
index 000000000..2bfcbe057
--- /dev/null
+++ b/extra/amule/gcc4.7.patch
@@ -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 );
+ }
+ 
+ 
-- 
cgit v1.2.3-54-g00ecf