summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Hüsers2015-11-18 11:01:15 +0100
committerManuel Hüsers2015-11-18 11:01:15 +0100
commitd8defbb0017544029574a670fddd8905019c69a9 (patch)
tree6e0ae1b72ab68edaab89b6415c6a5448d71366e6
parent3fc42d3f1378a59765bb2c08a06c6e87e7d8640d (diff)
downloadaur-d8defbb0017544029574a670fddd8905019c69a9.tar.gz
Support latest miniupnpc version
-rw-r--r--.SRCINFO4
-rw-r--r--0001-Support-miniupnpc-version-1.9.20150730.patch29
-rw-r--r--PKGBUILD14
3 files changed, 43 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8c798cb096f..436d8c7cd04 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = drawpile
pkgdesc = Collaborative drawing program specially made for use with pen tablets
pkgver = 1.0.2
- pkgrel = 1
+ pkgrel = 2
url = http://drawpile.net/
install = drawpile.install
arch = x86_64
@@ -21,7 +21,9 @@ pkgbase = drawpile
optdepends = libmicrohttpd: web-admin feature (server dependency)
optdepends = libsystemd: systemd and logging support (server dependency)
source = http://drawpile.net/files/src/drawpile-1.0.2.tar.gz
+ source = 0001-Support-miniupnpc-version-1.9.20150730.patch
sha256sums = 012a470316ccca51a28700948cd3f866c9b7fcc8fa9bfa21f27f28e9dc53f019
+ sha256sums = 8bfda21cf734a36cafeeac1132337dbfddfb464f104a0c67acf9d5f4fc432727
pkgname = drawpile
diff --git a/0001-Support-miniupnpc-version-1.9.20150730.patch b/0001-Support-miniupnpc-version-1.9.20150730.patch
new file mode 100644
index 00000000000..07da695a2ea
--- /dev/null
+++ b/0001-Support-miniupnpc-version-1.9.20150730.patch
@@ -0,0 +1,29 @@
+From cdd4942e035a9dcddc1918ccb418affb056d6128 Mon Sep 17 00:00:00 2001
+From: Calle Laakkonen <laakkonenc@gmail.com>
+Date: Wed, 30 Sep 2015 21:14:56 +0300
+Subject: [PATCH] Support miniupnpc version 1.9.20150730
+
+Issue #273
+---
+ src/client/net/upnp.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/client/net/upnp.cpp b/src/client/net/upnp.cpp
+index f31c972..543432a 100644
+--- a/src/client/net/upnp.cpp
++++ b/src/client/net/upnp.cpp
+@@ -92,7 +92,11 @@ bool UPnPClient::doDiscover()
+ return true;
+
+ int error;
++#if MINIUPNPC_API_VERSION < 14
+ d->devices = upnpDiscover(2000, nullptr, nullptr, 0, 0, &error);
++#else
++ d->devices = upnpDiscover(2000, nullptr, nullptr, 0, 0, 2, &error);
++#endif
+ if(!d->devices) {
+ qWarning("UPnP: Error (%d) discovering devices!", error);
+ return false;
+--
+2.6.2
+
diff --git a/PKGBUILD b/PKGBUILD
index f135db72710..e0c1059eb1c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=drawpile
pkgver=1.0.2
-pkgrel=1
+pkgrel=2
pkgdesc='Collaborative drawing program specially made for use with pen tablets'
arch=('x86_64' 'i686')
url='http://drawpile.net/'
@@ -18,12 +18,20 @@ optdepends=('kdnssd: automatic service discovery (such as printers)'
'libsystemd: systemd and logging support (server dependency)')
makedepends=('qt5-tools' 'qt5-svg' 'ninja' 'cmake')
install="${pkgname}.install"
-source=("http://drawpile.net/files/src/${pkgname}-${pkgver}.tar.gz")
-sha256sums=('012a470316ccca51a28700948cd3f866c9b7fcc8fa9bfa21f27f28e9dc53f019')
+source=("http://drawpile.net/files/src/${pkgname}-${pkgver}.tar.gz"
+ '0001-Support-miniupnpc-version-1.9.20150730.patch')
+sha256sums=('012a470316ccca51a28700948cd3f866c9b7fcc8fa9bfa21f27f28e9dc53f019'
+ '8bfda21cf734a36cafeeac1132337dbfddfb464f104a0c67acf9d5f4fc432727')
## SET TO 'SERVER' OR 'CLIENT' FOR BUILDING SERVER OR CLIENT ONLY ##
BUILD='BOTH'
+prepare() {
+ cd "${pkgname}-${pkgver}"
+
+ patch -p1 -i '../0001-Support-miniupnpc-version-1.9.20150730.patch'
+}
+
build() {
cd "${pkgname}-${pkgver}"