[arch-commits] Commit in amule/trunk (PKGBUILD aMule-2.2.6-wxcasframe.patch)

[Giovanni Scafora]

    Date: Sunday, October 10, 2010 @ 15:43:05
  Author: giovanni
Revision: 94773

upgpkg: amule 10305-1
upstream release

Modified:
  amule/trunk/PKGBUILD
Deleted:
  amule/trunk/aMule-2.2.6-wxcasframe.patch

------------------------------+
 PKGBUILD                     |   27 +++++++++++++++------------
 aMule-2.2.6-wxcasframe.patch |   16 ----------------
 2 files changed, 15 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-10 18:57:33 UTC (rev 94772)
+++ PKGBUILD	2010-10-10 19:43:05 UTC (rev 94773)
@@ -1,24 +1,23 @@
 # $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=2.2.6
-pkgrel=4
+pkgver=10305
+pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
 license=('GPL')
-depends=('wxgtk>=2.8.10.1' 'gd>=2.0.35' 'geoip' 'libupnp')
+depends=('wxgtk' 'gd' 'geoip' 'libupnp')
 makedepends=('crypto++')
-source=(http://downloads.sourceforge.net/project/${pkgname}/aMule/${pkgver}/aMule-${pkgver}.tar.bz2
-        aMule-2.2.6-wxcasframe.patch)
-md5sums=('530d9b48187e36f78fc21bb19e94326d'
-         'ad3ddec634c0dcdde1d67de927a4d1ed')
+source=(http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2)
+md5sums=('86bf1474af7acb097843e4521d2774de')
 
 build() {
-  cd "${srcdir}/aMule-${pkgver}"
-  patch -Np0 -i "${srcdir}/aMule-2.2.6-wxcasframe.patch" || return 1
+  cd "${srcdir}/aMule-SVN-r${pkgver}"
 
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
@@ -32,10 +31,14 @@
               --enable-webserver \
               --disable-debug \
               --enable-optimize \
-	      --enable-ccache \
-	      --enable-geoip \
-	      --enable-upnp
+              --enable-ccache \
+              --enable-geoip \
+              --enable-upnp
 
   make || return 1
+}
+
+package() {
+  cd "${srcdir}/aMule-SVN-r${pkgver}"
   make DESTDIR=${pkgdir}/ install || return 1
 }

Deleted: aMule-2.2.6-wxcasframe.patch
===================================================================
--- aMule-2.2.6-wxcasframe.patch	2010-10-10 18:57:33 UTC (rev 94772)
+++ aMule-2.2.6-wxcasframe.patch	2010-10-10 19:43:05 UTC (rev 94773)
@@ -1,16 +0,0 @@
---- src/utils/wxCas/src/wxcasframe.cpp	2010-10-02 13:01:40.000000000 +0200
-+++ src/utils/wxCas/src/wxcasframe.cpp	2010-10-02 13:01:56.000000000 +0200
-@@ -285,11 +285,11 @@
- #ifdef __WXMSW__
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
- #else
- 
- 	memdc.
--	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
-+	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
- #endif
- 
- 	memdc.