mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
99616548f7
* Fix build with ICU-75.1 by building with C++17 instead of C++11 (bug #933871) * Fix build with >=net-libs/miniupnpc-2.2.8 (bug #934054), thanks to Bill Prendergast <dek.devel@baisenvar.info> for the patch. Closes: https://bugs.gentoo.org/933871 Closes: https://bugs.gentoo.org/934054 Signed-off-by: Sam James <sam@gentoo.org>
25 lines
756 B
Diff
25 lines
756 B
Diff
https://bugs.gentoo.org/934054
|
|
|
|
From: Bill Prendergast <dek.devel@baisenvar.info>
|
|
|
|
Fix build with newer net-libs/miniupnpc (API 18)
|
|
--- a/Swiften/Network/MiniUPnPInterface.cpp
|
|
+++ b/Swiften/Network/MiniUPnPInterface.cpp
|
|
@@ -45,9 +45,16 @@ MiniUPnPInterface::MiniUPnPInterface() : p(new Private()) {
|
|
}
|
|
|
|
char lanAddress[64];
|
|
+#if MINIUPNPC_API_VERSION > 17
|
|
+ char wanAddress[64];
|
|
+ if (!UPNP_GetValidIGD(p->deviceList, &p->urls, &p->data, lanAddress, sizeof(lanAddress), wanAddress, sizeof(wanAddress))) {
|
|
+ return;
|
|
+ }
|
|
+#else
|
|
if (!UPNP_GetValidIGD(p->deviceList, &p->urls, &p->data, lanAddress, sizeof(lanAddress))) {
|
|
return;
|
|
}
|
|
+#endif
|
|
p->localAddress = std::string(lanAddress);
|
|
p->isValid = true;
|
|
}
|