summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommy Jerry Mairo2016-09-05 10:25:07 -0700
committerTommy Jerry Mairo2016-09-05 10:25:07 -0700
commit4974005dc1995415b380fa2a8f3871cdf0d3694a (patch)
tree0cf3cc211a1e5c4438333a36e78f0da0189a982a
parent6608cd79622ec95c48e6eb18e61bd9371a0fab56 (diff)
downloadaur-4974005dc1995415b380fa2a8f3871cdf0d3694a.tar.gz
Merge a fix patch.
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD59
2 files changed, 36 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2b1a2e9d64d..a21286c9f87 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = amule-dlp-git
pkgdesc = An eMule-like client for ed2k p2p network with DLP patch
- pkgver = 2.3.1.r102.4928412
+ pkgver = 2.3.1.r381.4c904e5
pkgrel = 1
url = https://github.com/persmule/amule-dlp
install = amule.install
@@ -21,7 +21,8 @@ pkgbase = amule-dlp-git
conflicts = amule
conflicts = amule-dlp
conflicts = amule-dlp-hg
- source = amule-dlp-git::git://github.com/persmule/amule-dlp.git
+ conflicts = amule-dlp-git
+ source = git+https://github.com/persmule/amule-dlp.git#commit=4c904e5e94ed9909dbf18423c82605d6f9abc5ec
source = amuled.systemd
source = amuleweb.systemd
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 61c85cfd6dc..d23485992a5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,23 @@
-# Maintainer: fuhd
+# Maintainer: TJM <tommy.mairo@gmail.com>
# Contributor: Giovanni Scafora <giovanni@archlinux.org>
# Contributor: Henrik Ronellenfitsch <searinox@web.de>
# Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
# Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org>
# Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
pkgname=amule-dlp-git
-pkgver=2.3.1.r107.fdf4e47
+pkgver=2.3.1.r381.4c904e5
pkgrel=1
pkgdesc="An eMule-like client for ed2k p2p network with DLP patch"
arch=('i686' 'x86_64')
url="https://github.com/persmule/amule-dlp"
license=('GPL')
depends=('wxgtk' 'wxgtk2.8' 'gd' 'geoip' 'libupnp' 'crypto++' 'libsm')
-conflicts=('amule' 'amule-dlp' 'amule-dlp-hg')
+conflicts=('amule' 'amule-dlp' 'amule-dlp-hg' 'amule-dlp-git')
makedepends=(git)
optdepends=('antileech')
install=amule.install
provides=('amule' 'amule-dlp')
-source=("$pkgname::git://github.com/persmule/amule-dlp.git"
+source=("git+https://github.com/persmule/amule-dlp.git#commit=4c904e5e94ed9909dbf18423c82605d6f9abc5ec"
'amuled.systemd'
'amuleweb.systemd')
sha256sums=('SKIP'
@@ -25,41 +25,48 @@ sha256sums=('SKIP'
'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2')
pkgver() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/amule-dlp"
printf "2.3.1.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
+prepare(){
+ cd "${srcdir}/amule-dlp"
+ cp src/aMule.xpm amule.xpm
+}
+
build() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/amule-dlp"
./autogen.sh
- ./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 \
- --with-wxversion=2.8
+ ./configure \
+ --prefix=/usr \
+ --mandir=/usr/share/man \
+ --disable-debug \
+ --enable-amule-daemon \
+ --enable-amulecmd \
+ --enable-amule-gui \
+ --enable-webserver \
+ --enable-cas \
+ --enable-wxcas \
+ --enable-alc \
+ --enable-alcc \
+ --enable-geoip \
+ --enable-upnp \
+ --with-denoise-level=3 \
+ --enable-nls \
+ --enable-optimize \
+ --enable-mmap \
+ --enable-ccache \
+ --with-wxversion=2.8
- make
+ make -j`cat /proc/cpuinfo |grep "processor"|wc -l`
}
package() {
- cd "${srcdir}/${pkgname}"
+ cd "${srcdir}/amule-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"
- mv "${pkgdir}/usr/share/amule-dlp" "${pkgdir}/usr/share/amule"
- ln -s amule "${pkgdir}/usr/share/amule-dlp"
}