Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/transmission/files/
Date: Sun, 04 Oct 2015 15:52:02
Message-Id: 1443973838.92028dec3c192e6d8693d0d2b73b3ef3e7dfe522.floppym@gentoo
1 commit: 92028dec3c192e6d8693d0d2b73b3ef3e7dfe522
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 4 15:50:38 2015 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 4 15:50:38 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92028dec
7
8 net-p2p/transmission: Use upstream patch for miniupnpc 14
9
10 Package-Manager: portage-2.2.22_p5
11
12 net-p2p/transmission/files/2.84-miniupnp14.patch | 21 ++++++++-------------
13 1 file changed, 8 insertions(+), 13 deletions(-)
14
15 diff --git a/net-p2p/transmission/files/2.84-miniupnp14.patch b/net-p2p/transmission/files/2.84-miniupnp14.patch
16 index 7e531cc..cdf64e1 100644
17 --- a/net-p2p/transmission/files/2.84-miniupnp14.patch
18 +++ b/net-p2p/transmission/files/2.84-miniupnp14.patch
19 @@ -1,23 +1,18 @@
20 -libtransmission: Build fix for miniupnp API version 14
21 +https://bugs.gentoo.org/562020
22
23 -Patch by Sander Sweers <Sander.Sweers@×××××.com>
24 -
25 -Bug: https://bugs.gentoo.org/562020
26 Index: libtransmission/upnp.c
27 ===================================================================
28 --- libtransmission/upnp.c (revision 14564)
29 -+++ libtransmission/upnp.c (working copy)
30 -@@ -86,8 +86,12 @@
31 - struct UPNPDev * ret;
32 - bool have_err;
33 ++++ libtransmission/upnp.c (revision 14565)
34 +@@ -88,7 +88,11 @@
35
36 --#if (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */
37 -+#if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */
38 + #if (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */
39 int err = UPNPDISCOVER_SUCCESS;
40 ++ #if (MINIUPNPC_API_VERSION >= 14) /* adds ttl */
41 + ret = upnpDiscover (msec, NULL, NULL, 0, 0, 2, &err);
42 -+ have_err = err != UPNPDISCOVER_SUCCESS;
43 -+#elif (MINIUPNPC_API_VERSION >= 8) /* adds ipv6 and error args */
44 -+ int err = UPNPDISCOVER_SUCCESS;
45 ++ #else
46 ret = upnpDiscover (msec, NULL, NULL, 0, 0, &err);
47 ++ #endif
48 have_err = err != UPNPDISCOVER_SUCCESS;
49 #else
50 + ret = upnpDiscover (msec, NULL, NULL, 0);