summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2017-09-18 01:22:15 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2017-09-18 19:53:41 +0200
commit86da4fbf7f337c0101ab15ad9f95f175f458e898 (patch)
tree8c9d84056e5c6ee31f1c44b29f59dae60f14792f /net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc1.patch
parentnet-p2p/eiskaltdcpp: EAPI 6, qt4 -> qt5, fdo-mime -> xdg-utils (diff)
downloadgentoo-86da4fbf7f337c0101ab15ad9f95f175f458e898.tar.gz
gentoo-86da4fbf7f337c0101ab15ad9f95f175f458e898.tar.bz2
gentoo-86da4fbf7f337c0101ab15ad9f95f175f458e898.zip
net-p2p/eiskaltdcpp: 2.2.10 version bump
Backport upstream fixes for net-libs/miniupnpc-2. Thanks-to: Francisco Blas (klondike) Izquierdo Riera <klondike@gentoo.org> Gentoo-Bug: 578308, 615276
Diffstat (limited to 'net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc1.patch')
-rw-r--r--net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc1.patch31
1 files changed, 31 insertions, 0 deletions
diff --git a/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc1.patch b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc1.patch
new file mode 100644
index 000000000000..7cca21840c7f
--- /dev/null
+++ b/net-p2p/eiskaltdcpp/files/eiskaltdcpp-2.2.10-miniupnpc1.patch
@@ -0,0 +1,31 @@
+From 33bf1489e75d1b1cc834d6eb9629598cd77d6c58 Mon Sep 17 00:00:00 2001
+From: Pavel Vatagin <pavelvat@gmail.com>
+Date: Sun, 17 Jan 2016 03:00:36 +0300
+Subject: [PATCH] extra: fix static build for windows with -DLOCAL_MINIUPNP=OFF
+
+---
+ extra/upnpc.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/extra/upnpc.cpp b/extra/upnpc.cpp
+index 63f6d34..40a011a 100644
+--- a/extra/upnpc.cpp
++++ b/extra/upnpc.cpp
+@@ -42,7 +42,7 @@ using namespace dcpp;
+ bool UPnPc::init()
+ {
+ UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), 0, 0
+-#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16))
++#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16))
+ , 0, 0);
+ #else
+ );
+@@ -64,7 +64,7 @@ bool UPnPc::add(const unsigned short port, const UPnP::Protocol protocol, const
+
+ return UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port_.c_str(), port_.c_str(),
+ Util::getLocalIp(AF_INET).c_str(), description.c_str(), protocols[protocol], NULL
+-#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16))
++#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16))
+ , 0) == UPNPCOMMAND_SUCCESS;
+ #else
+ ) == UPNPCOMMAND_SUCCESS;