From nobody Fri Jul 19 16:05:48 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WQZK86mmRz5RtH4; Fri, 19 Jul 2024 16:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WQZK867kwz52Bj; Fri, 19 Jul 2024 16:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721405148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ftuCEHtAVsnaV5vPPmq3mvv4bZBRIqJIcvLE49kb7kg=; b=vtl3/QxhO2wkkjsN0IY4rkB1TZYK7QFImZWvHGHtgm2NYvElnbgCuFh+lJUEcqUQzFnGht gycfvfTwKwn6aD4Z1UKBAypjr6Cjvka89bXmvjwnPta9k/9hAQK17NM2mAXRtJKkMGIeZk mq7eabHo+rhEvXMnQR4sqyKQf4ss3RAl/otyDluugacMpTDDNb+k4EtfNL7zugp20mIaMP imh+3Lc+UM/c4txONPdMJoPtPLPNfh5X8BneV0zX+8FdN0Iit1W4Bs/p0K/xZPI/A9rdHY CX79Q8t5iAVG9YtqitzGQIaaAAyWlicUUTweUw6We/oF9ghNiWcFdCdyDCK6lw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721405148; a=rsa-sha256; cv=none; b=UknPCK9+8LABLYY46aB2tcFoeUZRiB3cAgiiLqt5SH7pA2GUBonVDEupDI3VjI+wzY4pZk lkab00qcFFLthWVBpWAeVx/YLMsHVCwGTu7FO+B5Vw1YBk1mc+dEs7NXZ6I4RQJ17lvLg+ fZYbXCHf+/Gm0TpPRx4rBvpwfjbH29TBB+J5a0KN25gj5DIcp4Kr1dsmDsbe7sccgk2nfO XUhQVAKc5011qNfEHlXUBLMYO4eA3C8W9oL0QSep+hvTXvIMOPrJsyYUnLBdXcY3eY+aFI WVWpykcMQfW7jUHW658el14Q/YX6EseBsRx6qtfcynIJ+sNj+a2y2qRXYv+r8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721405148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ftuCEHtAVsnaV5vPPmq3mvv4bZBRIqJIcvLE49kb7kg=; b=l2xKpGBOofIMj4QrG4axvx/jxUF+RLbyyEqT54CnF5RHJGcU1xCVK1ru74J6vmD0ousrhb RTEjm8Qt6QJEmtmbZi1Vvq4GJLvxylCSd9CAzq4bB+qI33Q8hAfZHK40zTqVyPZ91qXCDt h3wl68uYCeLpx8xv+D+l57v4eFYWSqFJSvQgaO1cLzj26onPkI9iT1MEvYfSb5BI5tIW9u 1tQ0NsthMxKdh6vxKrXcL/Tb1TwIX0b4rp/LoBi6ARZuIjdBw3f7si7/SlNs5h7UR1hVvY DwHuSuU64+20fDZhGcAWHNWifYaFmb29a8u0frmWP+sL6nbdsabtV1Fa57X0rA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WQZK85kztzf71; Fri, 19 Jul 2024 16:05:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46JG5mah025502; Fri, 19 Jul 2024 16:05:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46JG5m3f025499; Fri, 19 Jul 2024 16:05:48 GMT (envelope-from git) Date: Fri, 19 Jul 2024 16:05:48 GMT Message-Id: <202407191605.46JG5m3f025499@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dirk Meyer Subject: git: d3319c96b939 - main - net-p2p/retroshare: fix build with miniupnpc 2.2.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dinoex X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d3319c96b939b0c7e0c7548a34d24a3c5030e274 Auto-Submitted: auto-generated The branch main has been updated by dinoex: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3319c96b939b0c7e0c7548a34d24a3c5030e274 commit d3319c96b939b0c7e0c7548a34d24a3c5030e274 Author: Dirk Meyer AuthorDate: 2024-07-19 16:05:38 +0000 Commit: Dirk Meyer CommitDate: 2024-07-19 16:05:38 +0000 net-p2p/retroshare: fix build with miniupnpc 2.2.8 PR: 280298 --- .../files/patch-src_network_C4Network2UPnPLinux.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/games/openclonk/files/patch-src_network_C4Network2UPnPLinux.cpp b/games/openclonk/files/patch-src_network_C4Network2UPnPLinux.cpp new file mode 100644 index 000000000000..b15163ebf8c4 --- /dev/null +++ b/games/openclonk/files/patch-src_network_C4Network2UPnPLinux.cpp @@ -0,0 +1,14 @@ +--- src/network/C4Network2UPnPLinux.cpp.orig 2018-03-16 17:25:33 UTC ++++ src/network/C4Network2UPnPLinux.cpp +@@ -77,7 +77,11 @@ void C4Network2UPnPP::Init() + if ((devlist = upnpDiscover(2000, nullptr, nullptr, UPNP_LOCAL_PORT_ANY, 0, 2, &error))) + #endif + { ++#if MINIUPNPC_API_VERSION >= 18 ++ if ((status = UPNP_GetValidIGD(devlist, &upnp_urls, &igd_data, lanaddr, sizeof(lanaddr), NULL, 0))) ++#else + if ((status = UPNP_GetValidIGD(devlist, &upnp_urls, &igd_data, lanaddr, sizeof(lanaddr)))) ++#endif + { + ThreadLogS("UPnP: Found IGD %s (status %d)", upnp_urls.controlURL, status); + initialized = true;