commit: 92028dec3c192e6d8693d0d2b73b3ef3e7dfe522 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Oct 4 15:50:38 2015 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Oct 4 15:50:38 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92028dec
net-p2p/transmission: Use upstream patch for miniupnpc 14 Package-Manager: portage-2.2.22_p5 net-p2p/transmission/files/2.84-miniupnp14.patch | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/net-p2p/transmission/files/2.84-miniupnp14.patch b/net-p2p/transmission/files/2.84-miniupnp14.patch index 7e531cc..cdf64e1 100644 --- a/net-p2p/transmission/files/2.84-miniupnp14.patch +++ b/net-p2p/transmission/files/2.84-miniupnp14.patch @@ -1,23 +1,18 @@ -libtransmission: Build fix for miniupnp API version 14 +https://bugs.gentoo.org/562020 -Patch by Sander Sweers <sander.swe...@gmail.com> - -Bug: https://bugs.gentoo.org/562020 Index: libtransmission/upnp.c =================================================================== --- libtransmission/upnp.c (revision 14564) -+++ libtransmission/upnp.c (working copy) -@@ -86,8 +86,12 @@ - struct UPNPDev * ret; - bool have_err; ++++ libtransmission/upnp.c (revision 14565) +@@ -88,7 +88,11 @@ --#if (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */ -+#if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */ + #if (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */ int err = UPNPDISCOVER_SUCCESS; ++ #if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */ + ret = upnpDiscover (msec, NULL, NULL, 0, 0, 2, &err); -+ have_err = err != UPNPDISCOVER_SUCCESS; -+#elif (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */ -+ int err = UPNPDISCOVER_SUCCESS; ++ #else ret = upnpDiscover (msec, NULL, NULL, 0, 0, &err); ++ #endif have_err = err != UPNPDISCOVER_SUCCESS; #else + ret = upnpDiscover (msec, NULL, NULL, 0);
