use extra/wxgtk2 instead of wxgtk2.8

3 files changed, 28 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d1e46aa92523..06c3bf2b2a08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,15 @@
+# Generated by mksrcinfo v8
+# Tue Feb 12 14:24:08 UTC 2019
 pkgbase = amule-dlp
 	pkgdesc = An eMule-like client for ed2k p2p network
 	pkgver = 2.3.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.amule.org
 	install = amule.install
 	arch = i686
 	arch = x86_64
 	license = GPL
-	depends = wxgtk
-	depends = wxgtk2.8
+	depends = wxgtk2
 	depends = gd
 	depends = geoip
 	depends = libupnp
@@ -17,14 +18,16 @@ pkgbase = amule-dlp
 	optdepends = antileech
 	provides = amule
 	conflicts = amule
+	conflicts = amule-dlp-git
+	conflicts = amule-git
 	source = https://github.com/persmule/amule-dlp/archive/2.3.2-dlp.tar.gz
 	source = amuled.systemd
 	source = amuleweb.systemd
 	source = crypto++.patch
-	md5sums = a53d8a746e2632007b9d864f4ac13c20
-	md5sums = 59772c41860e238f1c822feb8ca8d47f
-	md5sums = 05975c5d94bfc41fddb894d98b1115d5
-	md5sums = e231999919fc01123db59bf002ffef3b
+	sha512sums = 7998a7dc3a59bfc9d7d8e5575dec7207fa73bb6c8dca9c2608a59d67cb2ffcb9f24e1dc0b2acb806f78c1ed2ed6f335aaa0936d8bc5e1616c7d3121fe312f785
+	sha512sums = 13dbaee96658ca34e76bfdcf1e65895a24b57bc64bb846ae50d3d64a2e65047d90c13c0b14a50947d0ff9ccf30c4764380da05383650995d3798981068b87ebd
+	sha512sums = fbb58e2d0229e72e2192eae724e812a158443dc8d465ce14f94c184bcb575079e5e568c24bfbd132d9a6edf8651e7d7c45ca2ce46209bd04e27948503f6bbcdc
+	sha512sums = d6a9178b4063044679e47f40fea192d167334efbac152f0964c5d2c313ae12dbc8876a81721233113f4933792d5a28b7aeb133d434636e7000f3e6edafa9933c
 
 pkgname = amule-dlp
 
diff --git a/.gitignore b/.gitignore
index fbaa57a832d1..f41a5871e5a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 *.tar.gz
 src
 *~
+Makefle
 pkg
diff --git a/PKGBUILD b/PKGBUILD
index deb0960d0d80..8846b530d00a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,4 @@
-# $Id: PKGBUILD 240850 2015-06-15 06:19:33Z giovanni $
-# Maintainer: Lin Ruoshui <lin.ruohshoei@gmail.com>
+# Maintainer: Lin Ruoshui <lin[dot]ruohshoei[at]gmail[dot]com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
@@ -8,44 +7,37 @@
 
 pkgname=amule-dlp
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
 url="http://www.amule.org"
 license=('GPL')
-depends=('wxgtk' 'wxgtk2.8' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
+depends=('wxgtk2'  'gd' 'geoip' 'libupnp' 'crypto++' 'libsm') #'wxgtk2.8'
 optdepends=('antileech')
 provides=(amule)
-conflicts=(amule)
+conflicts=(amule amule-dlp-git amule-git)
 install=amule.install
 source=("https://github.com/persmule/amule-dlp/archive/${pkgver}-dlp.tar.gz"
-	#"https://nchc.dl.sourceforge.net/project/amule/aMule/2.3.2/aMule-${pkgver}.tar.bz2"
         'amuled.systemd'
         'amuleweb.systemd'
 	'crypto++.patch'
         )
-md5sums=('a53d8a746e2632007b9d864f4ac13c20'
-         '59772c41860e238f1c822feb8ca8d47f'
-         '05975c5d94bfc41fddb894d98b1115d5'
-         'e231999919fc01123db59bf002ffef3b')
-
-#manually dlp patch 
-#prepare() {
-#    cd "${srcdir}/${pkgname}-${pkgver}-dlp"
-#    patch -p1 < ../amule-dlp.patch
-#    
-#}
+sha512sums=('7998a7dc3a59bfc9d7d8e5575dec7207fa73bb6c8dca9c2608a59d67cb2ffcb9f24e1dc0b2acb806f78c1ed2ed6f335aaa0936d8bc5e1616c7d3121fe312f785'
+            '13dbaee96658ca34e76bfdcf1e65895a24b57bc64bb846ae50d3d64a2e65047d90c13c0b14a50947d0ff9ccf30c4764380da05383650995d3798981068b87ebd'
+            'fbb58e2d0229e72e2192eae724e812a158443dc8d465ce14f94c184bcb575079e5e568c24bfbd132d9a6edf8651e7d7c45ca2ce46209bd04e27948503f6bbcdc'
+            'd6a9178b4063044679e47f40fea192d167334efbac152f0964c5d2c313ae12dbc8876a81721233113f4933792d5a28b7aeb133d434636e7000f3e6edafa9933c')
 
+#add dlp patch
 #add crypto++.patch from Tommy Jerry Mairo
 prepare(){
-  cd "${srcdir}/${pkgname}-${pkgver}-dlp"
+  cd "${pkgname}-${pkgver}-dlp"
   patch -p1 -i ../crypto++.patch 
   cp src/aMule.xpm amule.xpm
 }         
          
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-dlp"
-./autogen.sh
+  cd "${pkgname}-${pkgver}-dlp"
+  ./autogen.sh
   ./configure --prefix=/usr \
               --mandir=/usr/share/man \
               --enable-cas \
@@ -61,17 +53,14 @@ build() {
               --enable-ccache \
               --enable-geoip \
               --enable-upnp \
-              --enable-dlp \
-              --with-wxversion=2.8
-
+              --enable-dlp #\
+              #--with-wxversion=2.8
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-dlp"
-
+  install -D -m644 "amuled.systemd" "${pkgdir}/usr/lib/systemd/system/amuled.service"
+  install -D -m644 "amuleweb.systemd" "${pkgdir}/usr/lib/systemd/system/amuleweb.service"
+  cd "${pkgname}-${pkgver}-dlp"
   make DESTDIR=${pkgdir} install
-
-  install -D -m644 "${srcdir}/amuled.systemd" "${pkgdir}/usr/lib/systemd/system/amuled.service"
-  install -D -m644 "${srcdir}/amuleweb.systemd" "${pkgdir}/usr/lib/systemd/system/amuleweb.service"
 }