summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTommy Jerry Mairo2020-10-23 05:55:39 -0700
committerTommy Jerry Mairo2020-10-23 05:55:39 -0700
commitc57582a230212ed35f0f2cd22066570e7218a06a (patch)
treed1261790a5d95bda55da359facf79b7fa103c20b
parent54c0fd675a0bd0a180c11c44f162674ee99c69a9 (diff)
downloadaur-amule-dlp-git.tar.gz
BugFix: compile error in UPnPBase.cpp
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--UPnPBase.patch24
3 files changed, 33 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ed26e5e201f..cbc2503c47d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = amule-dlp-git
pkgdesc = An eMule-like client for ed2k p2p network with DLP patch
pkgver = 2.3.2.r10525.07932e9a3
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/persmule/amule-dlp
install = amule.install
arch = i686
@@ -25,9 +25,11 @@ pkgbase = amule-dlp-git
source = git+https://github.com/persmule/amule-dlp.git#commit=07932e9a37f88f3daa1322628f2db818178c258b
source = amuled.systemd
source = amuleweb.systemd
+ source = UPnPBase.patch
sha256sums = SKIP
sha256sums = 6dbdd1ad1c3c3d8637b8f4cbd5416f39c8e4277a2f8498577b08bf6cda8dbca9
sha256sums = f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2
+ sha256sums = efc6a7c93f04cbeafc4aa4b3db28e22992a8a435f41708a97c5d190c9466b306
pkgname = amule-dlp-git
diff --git a/PKGBUILD b/PKGBUILD
index ba99326ff0d..730eeae45a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
# Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
pkgname=amule-dlp-git
pkgver=2.3.2.r10525.07932e9a3
-pkgrel=1
+pkgrel=2
pkgdesc="An eMule-like client for ed2k p2p network with DLP patch"
arch=('i686' 'x86_64')
url="https://github.com/persmule/amule-dlp"
@@ -20,10 +20,12 @@ install=amule.install
provides=('amule' 'amule-dlp')
source=("git+https://github.com/persmule/amule-dlp.git#commit=07932e9a37f88f3daa1322628f2db818178c258b"
'amuled.systemd'
- 'amuleweb.systemd')
+ 'amuleweb.systemd'
+ 'UPnPBase.patch')
sha256sums=('SKIP'
'6dbdd1ad1c3c3d8637b8f4cbd5416f39c8e4277a2f8498577b08bf6cda8dbca9'
- 'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2')
+ 'f4f43b1154ddccc9036a4291a58c6715f097b171fec62ea7aead0c9d9fa654f2'
+ 'efc6a7c93f04cbeafc4aa4b3db28e22992a8a435f41708a97c5d190c9466b306')
pkgver() {
cd "${srcdir}/amule-dlp"
@@ -33,6 +35,7 @@ pkgver() {
prepare(){
cd "${srcdir}/amule-dlp"
cp src/aMule.xpm amule.xpm
+ patch -p1 < ../UPnPBase.patch
}
build() {
diff --git a/UPnPBase.patch b/UPnPBase.patch
new file mode 100644
index 00000000000..f01fc3a575d
--- /dev/null
+++ b/UPnPBase.patch
@@ -0,0 +1,24 @@
+--- a/src/UPnPBase.cpp 2020-10-23 05:30:49.252207564 -0700
++++ b/src/UPnPBase.cpp 2020-10-23 05:26:15.927719211 -0700
+@@ -824,13 +824,17 @@
+ // Null string at first
+ std::ostringstream msg;
+
++ // Declare those here to avoid
++ // "jump to label ‘error’ [-fpermissive] crosses initialization
++ // of ‘char* ipAddress’"
++ unsigned short port;
++ char *ipAddress;
++
+ // Start UPnP
+ int ret;
+- char *ipAddress = NULL;
+- unsigned short port = 0;
+- ret = UpnpInit(ipAddress, udpPort);
++ ret = UpnpInit2(0, udpPort);
+ if (ret != UPNP_E_SUCCESS) {
+- msg << "error(UpnpInit): Error code ";
++ msg << "error(UpnpInit2): Error code ";
+ goto error;
+ }
+ port = UpnpGetServerPort();