diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2024-06-10 21:04:04 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2024-06-10 21:04:04 -0400 |
| commit | 77a19a999ea1f73ac0e4b0ec1973d4392994ab68 (patch) | |
| tree | 6030190cc303c6716d395f6172df3dec11fe9dd1 /net-p2p/transmission | |
| parent | dev-lang/go: add 1.22.4 (diff) | |
| download | gentoo-77a19a999ea1f73ac0e4b0ec1973d4392994ab68.tar.gz gentoo-77a19a999ea1f73ac0e4b0ec1973d4392994ab68.tar.bz2 gentoo-77a19a999ea1f73ac0e4b0ec1973d4392994ab68.zip | |
net-p2p/transmission: fix build with net-libs/miniupnpc-2.2.8
Closes: https://bugs.gentoo.org/934016
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'net-p2p/transmission')
| -rw-r--r-- | net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch | 24 | ||||
| -rw-r--r-- | net-p2p/transmission/transmission-4.0.6-r2.ebuild (renamed from net-p2p/transmission/transmission-4.0.6-r1.ebuild) | 6 |
2 files changed, 29 insertions, 1 deletions
diff --git a/net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch b/net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch new file mode 100644 index 000000000000..e1f9c2e36b8d --- /dev/null +++ b/net-p2p/transmission/files/transmission-4.0.6-miniupnpc-2.2.8.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/934016 +https://github.com/transmission/transmission/pull/6907 + +From 3523b928c8c968d0b7bca2c6c3a84a939e908f8c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?C=C5=93ur?= <coeur@gmx.fr> +Date: Mon, 10 Jun 2024 22:16:06 +0800 +Subject: [PATCH] bump miniupnpc to 2.2.8 + +diff --git a/libtransmission/port-forwarding-upnp.cc b/libtransmission/port-forwarding-upnp.cc +index 6d7bbc7f7c2..d805bc18218 100644 +--- a/libtransmission/port-forwarding-upnp.cc ++++ b/libtransmission/port-forwarding-upnp.cc +@@ -261,7 +261,11 @@ tr_port_forwarding_state tr_upnpPulse( + + FreeUPNPUrls(&handle->urls); + auto lanaddr = std::array<char, TR_ADDRSTRLEN>{}; ++#if (MINIUPNPC_API_VERSION >= 18) ++ if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1, NULL, 0) == ++#else + if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) == ++#endif + UPNP_IGD_VALID_CONNECTED) + { + tr_logAddInfo(fmt::format(_("Found Internet Gateway Device '{url}'"), fmt::arg("url", handle->urls.controlURL))); diff --git a/net-p2p/transmission/transmission-4.0.6-r1.ebuild b/net-p2p/transmission/transmission-4.0.6-r2.ebuild index de67e505ed49..b30c5a0934af 100644 --- a/net-p2p/transmission/transmission-4.0.6-r1.ebuild +++ b/net-p2p/transmission/transmission-4.0.6-r2.ebuild @@ -46,7 +46,7 @@ COMMON_DEPEND=" mbedtls? ( net-libs/mbedtls:0= ) net-libs/libnatpmp >=net-libs/libpsl-0.21.1 - <net-libs/miniupnpc-2.2.8:= + net-libs/miniupnpc:= >=net-misc/curl-7.28.0[ssl] sys-libs/zlib:= nls? ( virtual/libintl ) @@ -76,6 +76,10 @@ RDEPEND="${COMMON_DEPEND} ${ACCT_DEPEND} " +PATCHES=( + "${FILESDIR}/transmission-4.0.6-miniupnpc-2.2.8.patch" +) + src_configure() { local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR=share/doc/${PF} |