2.3.2.r35.047a55c93-1

2 files changed, 17 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 26c9a7a07ac2..a3935a48005a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,26 @@
 pkgbase = amule-git
 	pkgdesc = Client for the eD2k and Kad networks
-	pkgver = 2.3.2.r8.20f3a3b
+	pkgver = 2.3.2.r35.047a55c93
 	pkgrel = 1
 	url = http://amule.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
+	makedepends = boost
 	makedepends = git
+	depends = boost-libs
 	depends = crypto++
 	depends = gd
 	depends = geoip
 	depends = libupnp
-	depends = wxgtk2.8
+	depends = wxgtk
 	conflicts = amule
 	source = git+https://github.com/amule-project/amule.git
-	source = http://svgicons.o7a.net/unofficial/amule.png
 	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 = 737873e5f29dabaca6f9ac96b612eda8cba0236b6618e380107ea7d1d7665b78
 	sha256sums = 594a667bac53d3c881523c8c1a49d622a0752d84e0601aef062a586493ba998e
 	sha256sums = 902f8f719c1c02335880621717f23c683da8edbb31add75d3e1267b190e03b9c
 	sha256sums = 7bf39a64a723ab3e55ccfef93df2ec9cdd8108e56aa0733a4412755931cb3244
diff --git a/PKGBUILD b/PKGBUILD
index 2386b9b0f7a6..ee988760fd38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,33 +1,21 @@
 pkgname=amule-git
-pkgver=2.3.2.r8.20f3a3b
+pkgver=2.3.2.r35.047a55c93
 pkgrel=1
 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
-  wxgtk2.8
-)
-makedepends=(
-#  boost
-  git
-)
+depends=(boost-libs crypto++ gd geoip libupnp wxgtk)
+makedepends=(boost git)
 conflicts=(amule)
 source=(
 git+https://github.com/amule-project/amule.git
-http://svgicons.o7a.net/unofficial/amule.png
 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
-            737873e5f29dabaca6f9ac96b612eda8cba0236b6618e380107ea7d1d7665b78
             594a667bac53d3c881523c8c1a49d622a0752d84e0601aef062a586493ba998e
             902f8f719c1c02335880621717f23c683da8edbb31add75d3e1267b190e03b9c
             7bf39a64a723ab3e55ccfef93df2ec9cdd8108e56aa0733a4412755931cb3244
@@ -42,9 +30,6 @@ pkgver() {
 prepare() {
   cd amule/
 
-  cp $srcdir/amule.png ./
-  sed -i s/amule.xpm/amule.png/ Makefile.am
-
   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
@@ -64,19 +49,18 @@ build() {
   local confopts=(
     --disable-debug
     --disable-rpath
+    --enable-alc
     --enable-alcc
-    --enable-amule-daemon
     --enable-amulecmd
+    --enable-amule-gui
     --enable-cas
     --enable-ccache
     --enable-geoip
     --enable-mmap
     --enable-optimize
-    --enable-webserver
-    --enable-xas
+    --enable-wxcas
     --prefix=/usr
-#    --with-boost
-    --with-wx-config=wx-config-2.8
+    --with-boost
   )
 
   ./configure ${confopts[@]}
@@ -84,13 +68,14 @@ build() {
   make
 }
 
-package() {
+check() {
   cd amule/
 
-  make DESTDIR=$pkgdir install
+  make check
+}
 
-  install -m644 *.txt docs/{*.dia,AUTHORS,COPYING,README.*} README* $pkgdir/usr/share/doc/amule/
+package() {
+  cd amule/
 
-  install -d $pkgdir/usr/share/doc/amule/cas/
-  install -m644 src/utils/cas/README $pkgdir/usr/share/doc/amule/cas/
+  make DESTDIR=$pkgdir install
 }