diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | 0001-allow-to-build-with-autoconf-2.70-and-later.patch | 28 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
4 files changed, 48 insertions, 12 deletions
@@ -1,6 +1,6 @@ pkgbase = amule-dlp-git pkgdesc = An eMule-like client for ed2k p2p network with DLP patch - pkgver = 2.3.2.r10460.0097ba5b1 + pkgver = 2.3.3.r10608.7b3a07ab5 pkgrel = 1 url = https://github.com/persmule/amule-dlp install = amule.install @@ -9,7 +9,7 @@ pkgbase = amule-dlp-git license = GPL makedepends = git makedepends = boost - depends = wxgtk + depends = wxwidgets-gtk3 depends = gd depends = geoip depends = libupnp @@ -22,12 +22,13 @@ pkgbase = amule-dlp-git conflicts = amule conflicts = amule-dlp conflicts = amule-dlp-hg - source = git+https://github.com/persmule/amule-dlp.git#commit=0097ba5b1daac27e46c664b067366df402901280 + source = git+https://github.com/persmule/amule-dlp.git source = amuled.systemd source = amuleweb.systemd + source = 0001-allow-to-build-with-autoconf-2.70-and-later.patch sha256sums = SKIP sha256sums = 6dbdd1ad1c3c3d8637b8f4cbd5416f39c8e4277a2f8498577b08bf6cda8dbca9 sha256sums = f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2 + sha256sums = 78b0021d878a8985d87c5f00caa7a1165b9bdf92880a2e3a197db429a7eb6dd8 pkgname = amule-dlp-git - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..f33fcf244178 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +amule-dlp/ +src/ +pkg/ diff --git a/0001-allow-to-build-with-autoconf-2.70-and-later.patch b/0001-allow-to-build-with-autoconf-2.70-and-later.patch new file mode 100644 index 000000000000..a3c20e9a68a6 --- /dev/null +++ b/0001-allow-to-build-with-autoconf-2.70-and-later.patch @@ -0,0 +1,28 @@ +From 0d3e85ea46b52685c5b198fbade3a82f38071ca4 Mon Sep 17 00:00:00 2001 +From: Pablo Barciela <scow@riseup.net> +Date: Sun, 19 Sep 2021 13:55:07 +0200 +Subject: [PATCH] allow to build with autoconf 2.70 and later + +Closes https://github.com/amule-project/amule/issues/232 +--- + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 93a918c03..9c57668c6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,10 +30,6 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) + + AC_PREREQ(2.62) + +-# autoconf 2.70 introduced some incompatibilities that will make the build fail +-# As a "workaround" reject 2.70 and above for now. +-m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.70]), [-1],, [m4_fatal([autoconf ]m4_defn([AC_AUTOCONF_VERSION])[ is known to not work with aMule. Please use 2.69 instead.])]) +- + AC_CONFIG_SRCDIR([src/amule.cpp]) + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_MACRO_DIR([m4]) +-- +2.34.1 + @@ -1,4 +1,4 @@ -# Maintainer: TJM <tommy.mairo@gmail.com> +# Maintainer: TJM <recreation@tjm.moe> # Contributor: Yijian Chen <dastudiodirector@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> @@ -6,33 +6,37 @@ # Contributor: Dario 'Dax' Vilardi <dax [at] deelab [dot] org> # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com> pkgname=amule-dlp-git -pkgver=2.3.2.r10460.0097ba5b1 +pkgver=2.3.3.r10608.7b3a07ab5 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' 'gd' 'geoip' 'libupnp' 'crypto++>=6.0.0' 'libsm' 'boost-libs') +depends=('wxwidgets-gtk3' 'gd' 'geoip' 'libupnp' 'crypto++>=6.0.0' 'libsm' 'boost-libs') conflicts=('amule' 'amule-dlp' 'amule-dlp-hg') makedepends=('git' 'boost') optdepends=('antileech') install=amule.install provides=('amule' 'amule-dlp') -source=("git+https://github.com/persmule/amule-dlp.git#commit=0097ba5b1daac27e46c664b067366df402901280" +source=("git+https://github.com/persmule/amule-dlp.git" 'amuled.systemd' - 'amuleweb.systemd') + 'amuleweb.systemd' + '0001-allow-to-build-with-autoconf-2.70-and-later.patch') sha256sums=('SKIP' '6dbdd1ad1c3c3d8637b8f4cbd5416f39c8e4277a2f8498577b08bf6cda8dbca9' - 'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2') + 'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2' + '78b0021d878a8985d87c5f00caa7a1165b9bdf92880a2e3a197db429a7eb6dd8') pkgver() { cd "${srcdir}/amule-dlp" - printf "2.3.2.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + printf "%s.r%s.%s" "$(grep -Po '(?<=set \(PACKAGE_VERSION ").+(?="\))' ./CMakeLists.txt)" \ + "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" } prepare(){ cd "${srcdir}/amule-dlp" cp src/aMule.xpm amule.xpm + patch -p1 < ../0001-allow-to-build-with-autoconf-2.70-and-later.patch } build() { @@ -59,7 +63,7 @@ build() { --enable-mmap \ --enable-ccache \ --with-boost \ - --with-wxversion=3.0 + --with-wxversion=3.2 make } |