[arch-commits] Commit in amule/repos (6 files)
Giovanni Scafora
giovanni at archlinux.org
Tue Apr 10 22:28:11 UTC 2012
Date: Tuesday, April 10, 2012 @ 18:28:11
Author: giovanni
Revision: 155990
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
amule/repos/extra-i686/PKGBUILD
(from rev 155989, amule/trunk/PKGBUILD)
amule/repos/extra-i686/gcc4.7.patch
(from rev 155989, amule/trunk/gcc4.7.patch)
amule/repos/extra-x86_64/PKGBUILD
(from rev 155989, amule/trunk/PKGBUILD)
amule/repos/extra-x86_64/gcc4.7.patch
(from rev 155989, amule/trunk/gcc4.7.patch)
Deleted:
amule/repos/extra-i686/PKGBUILD
amule/repos/extra-x86_64/PKGBUILD
---------------------------+
extra-i686/PKGBUILD | 93 +++++++++++++++++++++++---------------------
extra-i686/gcc4.7.patch | 19 ++++++++
extra-x86_64/PKGBUILD | 93 +++++++++++++++++++++++---------------------
extra-x86_64/gcc4.7.patch | 19 ++++++++
4 files changed, 136 insertions(+), 88 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-04-10 22:27:48 UTC (rev 155989)
+++ extra-i686/PKGBUILD 2012-04-10 22:28:11 UTC (rev 155990)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Henrik Ronellenfitsch <searinox at web.de>
-# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
-# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
-
-pkgname=amule
-pkgver=10765
-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')
-
-build() {
- cd "${srcdir}/aMule-SVN-r${pkgver}"
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --enable-cas \
- --enable-wxcas \
- --enable-amule-daemon \
- --enable-amulecmd \
- --enable-amule-gui \
- --enable-alc \
- --enable-alcc \
- --enable-webserver \
- --disable-debug \
- --enable-optimize \
- --enable-ccache \
- --enable-geoip \
- --enable-upnp
-
- make
-}
-
-package() {
- cd "${srcdir}/aMule-SVN-r${pkgver}"
-
- make DESTDIR=${pkgdir}/ install
-}
Copied: amule/repos/extra-i686/PKGBUILD (from rev 155989, amule/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-04-10 22:28:11 UTC (rev 155990)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Henrik Ronellenfitsch <searinox at web.de>
+# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
+# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
+
+pkgname=amule
+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++')
+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 \
+ --enable-wxcas \
+ --enable-amule-daemon \
+ --enable-amulecmd \
+ --enable-amule-gui \
+ --enable-alc \
+ --enable-alcc \
+ --enable-webserver \
+ --disable-debug \
+ --enable-optimize \
+ --enable-ccache \
+ --enable-geoip \
+ --enable-upnp
+
+ make
+}
+
+package() {
+ cd "${srcdir}/aMule-SVN-r${pkgver}"
+
+ make DESTDIR=${pkgdir}/ install
+}
Copied: amule/repos/extra-i686/gcc4.7.patch (from rev 155989, amule/trunk/gcc4.7.patch)
===================================================================
--- extra-i686/gcc4.7.patch (rev 0)
+++ extra-i686/gcc4.7.patch 2012-04-10 22:28:11 UTC (rev 155990)
@@ -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 );
+ }
+
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-04-10 22:27:48 UTC (rev 155989)
+++ extra-x86_64/PKGBUILD 2012-04-10 22:28:11 UTC (rev 155990)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-# Contributor: Henrik Ronellenfitsch <searinox at web.de>
-# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
-# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
-
-pkgname=amule
-pkgver=10765
-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')
-
-build() {
- cd "${srcdir}/aMule-SVN-r${pkgver}"
-
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --enable-cas \
- --enable-wxcas \
- --enable-amule-daemon \
- --enable-amulecmd \
- --enable-amule-gui \
- --enable-alc \
- --enable-alcc \
- --enable-webserver \
- --disable-debug \
- --enable-optimize \
- --enable-ccache \
- --enable-geoip \
- --enable-upnp
-
- make
-}
-
-package() {
- cd "${srcdir}/aMule-SVN-r${pkgver}"
-
- make DESTDIR=${pkgdir}/ install
-}
Copied: amule/repos/extra-x86_64/PKGBUILD (from rev 155989, amule/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-04-10 22:28:11 UTC (rev 155990)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+# Contributor: Henrik Ronellenfitsch <searinox at web.de>
+# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
+# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
+
+pkgname=amule
+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++')
+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 \
+ --enable-wxcas \
+ --enable-amule-daemon \
+ --enable-amulecmd \
+ --enable-amule-gui \
+ --enable-alc \
+ --enable-alcc \
+ --enable-webserver \
+ --disable-debug \
+ --enable-optimize \
+ --enable-ccache \
+ --enable-geoip \
+ --enable-upnp
+
+ make
+}
+
+package() {
+ cd "${srcdir}/aMule-SVN-r${pkgver}"
+
+ make DESTDIR=${pkgdir}/ install
+}
Copied: amule/repos/extra-x86_64/gcc4.7.patch (from rev 155989, amule/trunk/gcc4.7.patch)
===================================================================
--- extra-x86_64/gcc4.7.patch (rev 0)
+++ extra-x86_64/gcc4.7.patch 2012-04-10 22:28:11 UTC (rev 155990)
@@ -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 );
+ }
+
+
More information about the arch-commits
mailing list