Attachment 252080 Details for Bug 280298 – v1 (apply via `git am`)

[patch] v1 (apply via `git am`)

0001-net-p2p-transmission-components-Fix-build-with-miniu.patch (text/plain), 3.47 KB, created by Anton Saietskii on 2024-07-15 14:29:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Anton Saietskii

Created: 2024-07-15 14:29:09 UTC

Size: 3.47 KB

patch

obsolete

>From 1f3ca187527afd552b4b7ac24ab42f742c674e96 Mon Sep 17 00:00:00 2001
>From: Anton Saietskii <vsasjason@gmail.com>
>Date: Mon, 15 Jul 2024 17:21:10 +0259
>Subject: [PATCH] net-p2p/transmission-components: Fix build with
> miniupnpc-2.2.8
>
>/usr/ports/net-p2p/transmission-components/work-cli/transmission-4.0.6/libtransmission/port-forwarding-upnp.cc:278:13:
>error: no matching function for call to 'UPNP_GetValidIGD'
>  278 |         if (UPNP_GetValidIGD(devlist, &handle->urls,
>&handle->data, std::data(lanaddr), std::size(lanaddr) - 1) ==
>      |             ^~~~~~~~~~~~~~~~
>/usr/local/include/miniupnpc/miniupnpc.h:122:1: note: candidate function
>not viable: requires 7 arguments, but 5 were provided
>  122 | UPNP_GetValidIGD(struct UPNPDev * devlist,
>      | ^                ~~~~~~~~~~~~~~~~~~~~~~~~~
>  123 |                  struct UPNPUrls * urls,
>      |                  ~~~~~~~~~~~~~~~~~~~~~~~
>  124 |                  struct IGDdatas * data,
>      |                  ~~~~~~~~~~~~~~~~~~~~~~~
>  125 |                  char * lanaddr, int lanaddrlen,
>      |                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>  126 |                  char * wanaddr, int wanaddrlen);
>      |                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>1 error generated.
>ninja: build stopped: subcommand failed.
>*** Error code 1
>---
> net-p2p/transmission-components/Makefile      |  2 +-
> ...ch-libtransmission_port-forwarding-upnp.cc | 20 +++++++++++++++++++
> 2 files changed, 21 insertions(+), 1 deletion(-)
> create mode 100644 net-p2p/transmission-components/files/patch-libtransmission_port-forwarding-upnp.cc
>
>diff --git a/net-p2p/transmission-components/Makefile b/net-p2p/transmission-components/Makefile
>index 7e44e65156c7..22c03b0a63fc 100644
>--- a/net-p2p/transmission-components/Makefile
>+++ b/net-p2p/transmission-components/Makefile
>@@ -1,6 +1,6 @@
> PORTNAME=	transmission
> DISTVERSION=	4.0.6
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	net-p2p
> MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${DISTVERSION}/
> 
>diff --git a/net-p2p/transmission-components/files/patch-libtransmission_port-forwarding-upnp.cc b/net-p2p/transmission-components/files/patch-libtransmission_port-forwarding-upnp.cc
>new file mode 100644
>index 000000000000..0a3d6a5d7634
>--- /dev/null
>+++ b/net-p2p/transmission-components/files/patch-libtransmission_port-forwarding-upnp.cc
>@@ -0,0 +1,20 @@
>+diff --git a/libtransmission/port-forwarding-upnp.cc b/libtransmission/port-forwarding-upnp.cc
>+index 6d7bbc7f7c2..a4146e0df13 100644
>+--- libtransmission/port-forwarding-upnp.cc
>++++ libtransmission/port-forwarding-upnp.cc
>+@@ -261,8 +261,13 @@ tr_port_forwarding_state tr_upnpPulse(
>+ 
>+         FreeUPNPUrls(&handle->urls);
>+         auto lanaddr = std::array<char, TR_ADDRSTRLEN>{};
>+-        if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1) ==
>+-            UPNP_IGD_VALID_CONNECTED)
>++        if (
>++#if (MINIUPNPC_API_VERSION >= 18)
>++            UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, std::data(lanaddr), std::size(lanaddr) - 1, nullptr, 0)
>++#else
>++            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)));
>+             tr_logAddInfo(fmt::format(_("Local Address is '{address}'"), fmt::arg("address", lanaddr.data())));
>-- 
>2.45.2
>

Actions: View | Diff

Attachments on bug 280298: 252077 | 252080 | 252081 | 252082 | 252089 | 252090