2.3.2.r49.dc0f6c6f7-1

2 files changed, 16 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3935a48005a..ced3d7ea0903 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,28 @@
 pkgbase = amule-git
 	pkgdesc = Client for the eD2k and Kad networks
-	pkgver = 2.3.2.r35.047a55c93
+	pkgver = 2.3.2.r49.dc0f6c6f7
 	pkgrel = 1
 	url = http://amule.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = autoconf
+	makedepends = automake
 	makedepends = boost
 	makedepends = git
+	makedepends = pkg-config
 	depends = boost-libs
 	depends = crypto++
-	depends = gd
 	depends = geoip
 	depends = libupnp
-	depends = wxgtk
+	depends = wxgtk2
 	conflicts = amule
 	source = git+https://github.com/amule-project/amule.git
-	source = https://anonscm.debian.org/cgit/pkg-amule/amule.git/plain/debian/patches/configure_ignore_gdlib-config_garbage.diff
 	source = https://anonscm.debian.org/cgit/pkg-amule/amule.git/plain/debian/patches/use_xdg-open_as_preview_default.diff
 	source = https://anonscm.debian.org/cgit/pkg-amule/amule.git/plain/debian/patches/version_check.diff
-	source = https://raw.githubusercontent.com/pld-linux/aMule/master/aMule-cas-datadir.patch
 	sha256sums = SKIP
-	sha256sums = 594a667bac53d3c881523c8c1a49d622a0752d84e0601aef062a586493ba998e
 	sha256sums = 902f8f719c1c02335880621717f23c683da8edbb31add75d3e1267b190e03b9c
 	sha256sums = 7bf39a64a723ab3e55ccfef93df2ec9cdd8108e56aa0733a4412755931cb3244
-	sha256sums = 897ac890b5f1b8cb4b53fded313cb2779bed5d39041a320885dd9dbe30878879
 
 pkgname = amule-git
 
diff --git a/PKGBUILD b/PKGBUILD
index ee988760fd38..c1f9d6d30a12 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,81 +1,54 @@
 pkgname=amule-git
-pkgver=2.3.2.r35.047a55c93
+pkgver=2.3.2.r49.dc0f6c6f7
 pkgrel=1
-pkgdesc='Client for the eD2k and Kad networks'
+pkgdesc="Client for the eD2k and Kad networks"
 arch=(i686 x86_64)
 url=http://amule.org/
 license=(GPL)
-depends=(boost-libs crypto++ gd geoip libupnp wxgtk)
-makedepends=(boost git)
+depends=(boost-libs crypto++ geoip libupnp wxgtk2)
+makedepends=(autoconf automake boost git pkg-config)
 conflicts=(amule)
 source=(
 git+https://github.com/amule-project/amule.git
-https://anonscm.debian.org/cgit/pkg-amule/amule.git/plain/debian/patches/configure_ignore_gdlib-config_garbage.diff
 https://anonscm.debian.org/cgit/pkg-amule/amule.git/plain/debian/patches/use_xdg-open_as_preview_default.diff
 https://anonscm.debian.org/cgit/pkg-amule/amule.git/plain/debian/patches/version_check.diff
-https://raw.githubusercontent.com/pld-linux/aMule/master/aMule-cas-datadir.patch
 )
 sha256sums=(SKIP
-            594a667bac53d3c881523c8c1a49d622a0752d84e0601aef062a586493ba998e
             902f8f719c1c02335880621717f23c683da8edbb31add75d3e1267b190e03b9c
-            7bf39a64a723ab3e55ccfef93df2ec9cdd8108e56aa0733a4412755931cb3244
-            897ac890b5f1b8cb4b53fded313cb2779bed5d39041a320885dd9dbe30878879)
+            7bf39a64a723ab3e55ccfef93df2ec9cdd8108e56aa0733a4412755931cb3244)
 
 pkgver() {
   cd amule/
-
   git describe | sed 's/-/.r/; s/-g/./'
 }
 
 prepare() {
   cd amule/
-
-  patch -Np1 < $srcdir/aMule-cas-datadir.patch
-  sed -i 's\/usr/share/fonts/corefonts/times.ttf\/usr/share/fonts/TTF/DejaVuSerif.ttf\
-    s\/share/cas/\/share/amule/cas/\' src/utils/cas/configfile.c
-
-  sed -i s/configure.in/configure.ac/ $srcdir/configure_ignore_gdlib-config_garbage.diff
-  patch -Np1 < $srcdir/configure_ignore_gdlib-config_garbage.diff
-
-  patch -Np1 < $srcdir/use_xdg-open_as_preview_default.diff
-  patch -Np1 < $srcdir/version_check.diff
+  patch -Np1 <$srcdir/use_xdg-open_as_preview_default.diff
+  patch -Np1 <$srcdir/version_check.diff
 }
 
 build() {
   cd amule/
-
   ./autogen.sh
-
-  local confopts=(
+  local confargs=(
     --disable-debug
     --disable-rpath
-    --enable-alc
     --enable-alcc
-    --enable-amulecmd
-    --enable-amule-gui
-    --enable-cas
-    --enable-ccache
     --enable-geoip
     --enable-mmap
     --enable-optimize
-    --enable-wxcas
     --prefix=/usr
     --with-boost
   )
-
-  ./configure ${confopts[@]}
-
+  ./configure ${confargs[@]}
   make
 }
 
 check() {
-  cd amule/
-
-  make check
+  make -C amule/ check
 }
 
 package() {
-  cd amule/
-
-  make DESTDIR=$pkgdir install
+  make -C amule/ DESTDIR=$pkgdir install
 }