gentoo auto-resync : 17:06:2024 - 00:09:46

3 files changed, 41 insertions, 1 deletions

diff --git a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index 7c7373e81a78..e910f14e5bd2 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -103,6 +103,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-libxml2-2.12.patch
 	# https://code.wildfiregames.com/D5267
 	"${FILESDIR}"/${P}-boost-1.85.patch
+	"${FILESDIR}"/${P}-miniupnpc.patch
 )
 
 pkg_setup() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index 8bf401727124..b68b22b6fd16 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -3,9 +3,10 @@ AUX 0ad-0.0.25b_alpha-fix-setuptools.patch 8270 BLAKE2B 65ec2d7be8602427a39b3b42
 AUX 0ad-0.0.26_alpha-add-missing-cstdint-include.patch 873 BLAKE2B cc4b621f3f6b1811e3e84262e7ec92a387d3b22a0f40f8405829d494f33700ecf9609cdb73eca90f649b5a270c24682a25d8ba4c9f5fc3468c87d8cb844f2f0c SHA512 576bf24bdc2b1fafb2d6917a40f978c864b5613631ce4630db96976205409799dac4bbf7c978958d1a073c90f2c955da2713202f41e8e1c21135f9683e48ecad
 AUX 0ad-0.0.26_alpha-boost-1.85.patch 1229 BLAKE2B 8aaf7b53806672e7812e7b796d07310995031fc6a36a6861e9133595990d5441ac2e69d0b845f89d7fdc0995c7e1a710d5ecaf861bebb6819892370497508f27 SHA512 e100942db7c69a8833665f7d085edef62224ebcf2aaf4d328290c0e971b62d8a69a037d3fabe6110b9aa906fe4e0a6197e17a8b667e3286888a3fa55ab82a7fa
 AUX 0ad-0.0.26_alpha-libxml2-2.12.patch 9046 BLAKE2B a4c914526ca2fa29a37aa72f390053ff95bd57e7a3a7d7653b30ac62e8ec8a7998082bd3bd2102654467242e32559c3cc517d813f60685b444ce0ffbf42b92eb SHA512 419af3d589c1465659e5077784d758db4d3b7fa36ac1e7a3e29e6620cc30b784282c299080d1fb8ef8936edc6a7d02d991ae4b911038da2c06705ae9e9945d3a
+AUX 0ad-0.0.26_alpha-miniupnpc.patch 1503 BLAKE2B 52cde93d352f6834529ae9c025a9f7b623939dcffdf714ba4b6c28bd2026934bcff620ae762fced978616421f9f56b614a8f755ff9e24b4a883fcaeaec69ac5e SHA512 d6cc631b8f6f0d96a23af628a6e83012a2e8b46645d6a5ff05d8c4b1f0687c5ea2ea73c50457f6d076c8b37ae47d64a269f9de51502cc7dbe5683148f561ecde
 DIST 0ad-0.0.26-alpha-unix-build.tar.xz 75599800 BLAKE2B ddd589840b0dacee2377ff4e5624f69646b92da4217015d788c6abec097578e44aee6641b6a6945d15f50d8e50673a1d44587c2faf02278d981a0ed30c950214 SHA512 aaf647d5d8454c244015d2a198beeaaebc571a5bc96446f3acff8dbd05f9843029c500bf4162651a5e1fcdb42bd5fb5b4f5c512c78372479fbd8565dd093f272
 DIST 0ad-0.0.26-alpha-unix-build.tar.xz.minisig 333 BLAKE2B 9f3146abda592fe6ab9433f6ee30060bcd4c5b594e00cb3fccc0aebb74652f3bc2ddd7b19a296da7ca13126ea9cc0337750f859e24f46adfcb84272bd2cce452 SHA512 eda542c1c363c7c0e6b235e6d8dfbd96d1c1e7cfca408b7215cf247b96c9f42b8bc206bbb4dd48dc41ee373db17d4a76cba940e454840dc41638dd572c580850
 DIST 0ad-0.0.26-alpha-unix-data.tar.xz 1351511480 BLAKE2B 2f483593b79a6ae87d7582625e89c890cfcf4ad7116348b184dae6c47a814d95a7b9f3018cb79e8f024a61c647abd39d6faf5ad3d3fcbb0c7a0583d0479d9b18 SHA512 8fe29fce68737d5b7001c8c2a7198766583b22556129cd2d927823da9b2c58f224fb1207f35bd03abea9380cf24d00ab6257b0dba86ce3ad1f357d7006f051d6
 DIST 0ad-0.0.26-alpha-unix-data.tar.xz.minisig 332 BLAKE2B fb4ec1bcabad79052a5e391557623ad61234d4948ec919d9a79011037855b6c7c94445d8f1667f1725bf80d15d66d1aa32c4e2b259831fbe088fe79e800515b3 SHA512 6dd55dda4e6cd52642b331aa571bc4ccfe30a33ad12a5d3ccf51c708d05dd74bf3234ca722c2a6501ba797bc1f8fa7c7aeb4d836dc4792bfd0c6bbccdc2c1237
-EBUILD 0ad-0.0.26_alpha-r1.ebuild 8327 BLAKE2B b2f132adbb5ca8ac0a33b9378feb08a3e9cdad78f0a56e687275107881d417a6f4e4bc27a9bc64d2528bbb857f7c31099b12c03354e4f2cce59d857fb0002647 SHA512 903029c8b488aae7b63b2daf542c5b2947bfc474e49221df8c38fe988664f29e763101deb0e9d12caf14e12c266782fc69f2d37bb8e0722270a43fc5f8564346
+EBUILD 0ad-0.0.26_alpha-r1.ebuild 8363 BLAKE2B c687b47bdf2ab5d1400cd72d7d419417d93a4e6b2c9fe0968334e576a9632552203b742baaeea37d5f928e2584917eeb7aee9f9108ddf82d61b1013b2439f1d9 SHA512 e9fe4b421e62be6cfc060dbbad19453f14948ab342196f85d927d0c55c21e639991bbf6e55704c8c615f6a20671f3295120a8326dece8e34c96aff0b59fed541
 MISC metadata.xml 667 BLAKE2B 3460d1e769fd9bab7f44c1387b9ccb6acb8b6030e5e307311aca479a0857a3719c22352e3b496dff2569536675e449f98aeccc62999283d2ebd3b3feefe444ee SHA512 65134f211aa3509589f9d333c0b2ceb7cb2dcfe394d3eb84323f5cafb43d8ec6d65738a38552d3c955eab5e7fcb5b71da575df5a1e21e0cbd49dcc4b89fc0f39
diff --git a/games-strategy/0ad/files/0ad-0.0.26_alpha-miniupnpc.patch b/games-strategy/0ad/files/0ad-0.0.26_alpha-miniupnpc.patch
new file mode 100644
index 000000000000..f17cee4e36f2
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.26_alpha-miniupnpc.patch
@@ -0,0 +1,38 @@
+Adapt to changes from API 18
+
+https://github.com/miniupnp/miniupnp/commit/c0a50ce33e3b99ce8a96fd43049bb5b53ffac62f
+https://bugs.gentoo.org/934315
+
+--- a/source/network/NetServer.cpp	2022-09-23 21:17:14.000000000 +0200
++++ a/source/network/NetServer.cpp	2024-06-14 21:43:26.572418719 +0200
+@@ -302,7 +302,11 @@
+ 	else if ((devlist = upnpDiscover(10000, 0, 0, 0, 0, 0)) != NULL)
+ #endif
+ 	{
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18
++		ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress), NULL, 0);
++#else
+ 		ret = UPNP_GetValidIGD(devlist, &urls, &data, internalIPAddress, sizeof(internalIPAddress));
++#endif
+ 		allocatedUrls = ret != 0; // urls is allocated on non-zero return values
+ 	}
+ 	else
+@@ -321,9 +325,18 @@
+ 		LOGMESSAGE("Net server: found valid IGD = %s", urls.controlURL);
+ 		break;
+ 	case 2:
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18
++		LOGMESSAGE("Net server: found a valid IGD with a reserved address = %s, will try to continue anyway", urls.controlURL);
++		break;
++	case 3:
++		LOGMESSAGE("Net server: found a valid, not connected IGD = %s, will try to continue anyway", urls.controlURL);
++		break;
++	case 4:
++#else
+ 		LOGMESSAGE("Net server: found a valid, not connected IGD = %s, will try to continue anyway", urls.controlURL);
+ 		break;
+ 	case 3:
++#endif
+ 		LOGMESSAGE("Net server: found a UPnP device unrecognized as IGD = %s, will try to continue anyway", urls.controlURL);
+ 		break;
+ 	default: