diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-13 11:58:27 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-04-13 11:58:27 -0300 |
| commit | 8e5c27c1b5d01d353df2542166d50f9f456b2597 (patch) | |
| tree | 227eed66652cffc0e872b75e7fe601cb23214cdb /extra/amule | |
| parent | 394988e4c3a3ab21e5d79481ac3f3295045af987 (diff) | |
| parent | 7ff5465d0386f06bea97ef956397c305d6f7e07f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/smalltalk/PKGBUILD
extra/crypto++/PKGBUILD
extra/libpciaccess/PKGBUILD
extra/postfix/PKGBUILD
extra/samba/PKGBUILD
extra/xorg-server/PKGBUILD
libre/gstreamer0.10-bad-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-libpciaccess/PKGBUILD
Diffstat (limited to 'extra/amule')
| -rw-r--r-- | extra/amule/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/amule/gcc4.7.patch | 19 |
2 files changed, 29 insertions, 5 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 1befb50e3..2054fd42b 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' 'mips64el') 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 ); + } + + |