Removed miniupnpc patch as it iss merged upstream now

3 files changed, 2 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 05eed2306a53..e4ae0480387a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = curecoin-qt-git
 	pkgdesc = GUI client (wallet) for CureCoin cryptocurrency
-	pkgver = v2.0.0.2.r2.gcb69996
+	pkgver = v2.0.0.2.r5.gf9d54f9
 	pkgrel = 1
 	url = https://curecoin.net/
 	arch = x86_64
@@ -17,10 +17,8 @@ pkgbase = curecoin-qt-git
 	provides = curecoin-qt
 	conflicts = curecoin-qt
 	source = git+https://github.com/cygnusxi/CurecoinSource.git#branch=master
-	source = 0001-miniupnpc.patch
 	source = curecoin.desktop
 	sha256sums = SKIP
-	sha256sums = ef598aee46b5ad12b43db8942c08ef2cbece002efa731394066ebff654bea5e1
 	sha256sums = 47e4c7305240dd16361d922bf6bc3a86ee53d7e0bc43bdf12c341ea0b7968387
 
 pkgname = curecoin-qt-git
diff --git a/0001-miniupnpc.patch b/0001-miniupnpc.patch
deleted file mode 100644
index 8b4095a24e0f..000000000000
--- a/0001-miniupnpc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 Mon Sep 17 00:00:00 2001
-From: Pavel Vasin <pavel@vasin.nl>
-Date: Sun, 23 Aug 2015 23:53:49 +0300
-Subject: [PATCH] add support for miniupnpc api version 14
-
-The value of new arg ttl is set to 2 as it's recommended default.
----
- src/net.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/net.cpp b/src/net.cpp
-index fb5726a2b9e..4c6331f8d57 100644
---- a/src/net.cpp
-+++ b/src/net.cpp
-@@ -1120,10 +1120,14 @@ void ThreadMapPort()
- #ifndef UPNPDISCOVER_SUCCESS
-     /* miniupnpc 1.5 */
-     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
--#else
-+#elif MINIUPNPC_API_VERSION < 14
-     /* miniupnpc 1.6 */
-     int error = 0;
-     devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
-+#else
-+    /* miniupnpc 1.9.20150730 */
-+    int error = 0;
-+    devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
- #endif
- 
-     struct UPNPUrls urls;
-
diff --git a/PKGBUILD b/PKGBUILD
index 490d84ab6abd..008f315b547d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Michael Thalmeier <michael@thalmeier.at>
 
 pkgname=curecoin-qt-git
-pkgver=v2.0.0.2.r2.gcb69996
+pkgver=v2.0.0.2.r5.gf9d54f9
 pkgrel=1
 pkgdesc="GUI client (wallet) for CureCoin cryptocurrency"
 arch=('x86_64' 'i686')
@@ -13,11 +13,9 @@ conflicts=('curecoin-qt')
 depends=('qt5-base' 'qt5-tools' 'miniupnpc' 'boost1.69-libs' 'openssl-1.0')
 makedepends=('boost1.69' 'db' 'git')
 source=("git+https://github.com/cygnusxi/CurecoinSource.git#branch=master"
-        "0001-miniupnpc.patch"
         "curecoin.desktop")
 
 sha256sums=('SKIP'
-            'ef598aee46b5ad12b43db8942c08ef2cbece002efa731394066ebff654bea5e1'
             '47e4c7305240dd16361d922bf6bc3a86ee53d7e0bc43bdf12c341ea0b7968387')
 
 pkgver() {
@@ -32,9 +30,6 @@ prepare() {
   # Switch to OpenSSL 1.0
   echo "INCLUDEPATH += /usr/include/openssl-1.0" >> "curecoin-qt.pro"
   echo "LIBS += -L/usr/lib/openssl-1.0 -lcrypto -lz" >> "curecoin-qt.pro"
-
-  # Fix compilation error with miniupnpc v 1.9
-  patch -p1 <"${srcdir}/0001-miniupnpc.patch"
 }
 
 build() {