gentoo auto-resync : 01:04:2024 - 14:13:28

4 files changed, 279 insertions, 2 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 750458800c15..14311b6b04fe 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2023 Gentoo Authors
+# Copyright 2014-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -99,6 +99,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch
 	# https://code.wildfiregames.com/D4997
 	"${FILESDIR}"/${P}-add-missing-cstdint-include.patch
+	# https://code.wildfiregames.com/D5219
+	"${FILESDIR}"/${P}-libxml2-2.12.patch
 )
 
 pkg_setup() {
diff --git a/games-strategy/0ad/Manifest b/games-strategy/0ad/Manifest
index c057eed045ed..9fd409d38286 100644
--- a/games-strategy/0ad/Manifest
+++ b/games-strategy/0ad/Manifest
@@ -1,9 +1,10 @@
 AUX 0ad-0.0.24b_alpha-respect-tc.patch 1095 BLAKE2B c7f2747ae832de76da3711687ce8e6d52039e23cbe31ca1114d27e93ec2b3ef150f4b241a0d869ec393c9f73e702f35ce5610f9b383bbe43e958989bbcfa0c17 SHA512 00c439a086da6553b09230cf57e76c9abcf8c13093a4d439ccb5724d6dee5474c46f924c5a0c5b43cdc8572445347dcf2a77eba3fcff17b16d492ca4bef90594
 AUX 0ad-0.0.25b_alpha-fix-setuptools.patch 8270 BLAKE2B 65ec2d7be8602427a39b3b426dea0b4aa5741385d8416ae4db94f0f94d73b3c7ae2b3a851fbb5afe4e8d07d9d65739b5323d3f40e239fcb0d3d39e479419c3cf SHA512 b08424de3685c87901b3caeb39c415f0814f5a5a0a5df6890cf1fe829a822f4d52711c4219b230414c9144ecd1a6ff2b68973f91be415cff350df6f5b5f91fc9
 AUX 0ad-0.0.26_alpha-add-missing-cstdint-include.patch 873 BLAKE2B cc4b621f3f6b1811e3e84262e7ec92a387d3b22a0f40f8405829d494f33700ecf9609cdb73eca90f649b5a270c24682a25d8ba4c9f5fc3468c87d8cb844f2f0c SHA512 576bf24bdc2b1fafb2d6917a40f978c864b5613631ce4630db96976205409799dac4bbf7c978958d1a073c90f2c955da2713202f41e8e1c21135f9683e48ecad
+AUX 0ad-0.0.26_alpha-libxml2-2.12.patch 9046 BLAKE2B a4c914526ca2fa29a37aa72f390053ff95bd57e7a3a7d7653b30ac62e8ec8a7998082bd3bd2102654467242e32559c3cc517d813f60685b444ce0ffbf42b92eb SHA512 419af3d589c1465659e5077784d758db4d3b7fa36ac1e7a3e29e6620cc30b784282c299080d1fb8ef8936edc6a7d02d991ae4b911038da2c06705ae9e9945d3a
 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 8171 BLAKE2B 14460ef7c218a6d6a6b20a626a3f2a01614cfc3f9f8c7021b0aa680da73aeb376566a0813153a046a8bb5490ebda04186d1ce552b48c0509f240012bdc014101 SHA512 d51c9af50b6e371d0edc065bf6170092806e76017b52f56f0c0c1a9e5a15a071b9a766eca2270633ba80bb4089b5300e24505115828a8fcf90b139187164579e
+EBUILD 0ad-0.0.26_alpha-r1.ebuild 8250 BLAKE2B 1dbd85478cfacf11325211fd79321cfca305999834c35604f5011fbe8a0922c99c45e9eee1b9df02c4dbc92f00e717ca8f780bae746875ced0dd8f7579a55b6e SHA512 de4d14c9c708bb0931a16cbc63b509af8e09350e40b285e41e526acfaa52875a6467aad43a5c11a56731de67f67a659e7543d6eb785c8c21c8e754852113f075
 MISC metadata.xml 667 BLAKE2B 3460d1e769fd9bab7f44c1387b9ccb6acb8b6030e5e307311aca479a0857a3719c22352e3b496dff2569536675e449f98aeccc62999283d2ebd3b3feefe444ee SHA512 65134f211aa3509589f9d333c0b2ceb7cb2dcfe394d3eb84323f5cafb43d8ec6d65738a38552d3c955eab5e7fcb5b71da575df5a1e21e0cbd49dcc4b89fc0f39
diff --git a/games-strategy/0ad/files/0ad-0.0.26_alpha-libxml2-2.12.patch b/games-strategy/0ad/files/0ad-0.0.26_alpha-libxml2-2.12.patch
new file mode 100644
index 000000000000..08ee1a11fdb2
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.26_alpha-libxml2-2.12.patch
@@ -0,0 +1,274 @@
+https://bugs.gentoo.org/924387
+https://code.wildfiregames.com/D5219
+
+Index: ps/trunk/libraries/source/fcollada/src/FCollada/FUtils/FUXmlDocument.cpp
+===================================================================
+--- ps/libraries/source/fcollada/src/FCollada/FUtils/FUXmlDocument.cpp
++++ ps/libraries/source/fcollada/src/FCollada/FUtils/FUXmlDocument.cpp
+@@ -2,7 +2,7 @@
+ 	Copyright (C) 2005-2007 Feeling Software Inc.
+ 	Portions of the code are:
+ 	Copyright (C) 2005-2007 Sony Computer Entertainment America
+-	
++
+ 	MIT License: http://www.opensource.org/licenses/mit-license.php
+ */
+ 
+@@ -13,10 +13,12 @@
+ #include "FUFile.h"
+ #include "FCDocument/FCDocument.h"
+ 
++#include <libxml/parser.h>
++
+ #define MAX_FILE_SIZE 10240000
+ //
+ // FUXmlDocument
+-// 
++//
+ 
+ FUXmlDocument::FUXmlDocument(FUFileManager* manager, const fchar* _filename, bool _isParsing)
+ :	isParsing(_isParsing), filename(_filename)
+Index: ps/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp
+===================================================================
+--- ps/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp
++++ ps/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp
+@@ -2,7 +2,7 @@
+ 	Copyright (C) 2005-2007 Feeling Software Inc.

+ 	Portions of the code are:

+ 	Copyright (C) 2005-2007 Sony Computer Entertainment America

+-	

++

+ 	MIT License: http://www.opensource.org/licenses/mit-license.php

+ */

+ 

+@@ -77,6 +77,7 @@
+ #include "FCDocument/FCDVersion.h"

+ #include "FUtils/FUXmlDocument.h"

+ 

++#include <libxml/xmlIO.h>

+ 

+ //

+ // Constants

+@@ -442,7 +443,7 @@
+ 	}

+ 

+ 	if (status) FUError::Error(FUError::DEBUG_LEVEL, FUError::DEBUG_LOAD_SUCCESSFUL);

+-	return status;	

++	return status;

+ }

+ 

+ bool FArchiveXML::ExportFile(FCDocument* fcdocument, const fchar* filePath)

+@@ -515,13 +516,13 @@
+ 	xmlOutputBufferPtr buf = xmlAllocOutputBuffer(NULL);

+ 	xmlNodeDumpOutput(buf, rootNode->doc, rootNode, 0, 0, NULL);

+ 

+-#ifdef LIBXML2_NEW_BUFFER
+-	outData.resize(xmlOutputBufferGetSize(buf) * sizeof(xmlChar));
+-	memcpy(outData.begin(), xmlOutputBufferGetContent(buf), outData.size());
+-#else
+-	outData.resize(buf->buffer->use * sizeof(xmlChar));
+-	memcpy(outData.begin(), buf->buffer->content, outData.size());
+-#endif
++#ifdef LIBXML2_NEW_BUFFER

++	outData.resize(xmlOutputBufferGetSize(buf) * sizeof(xmlChar));

++	memcpy(outData.begin(), xmlOutputBufferGetContent(buf), outData.size());

++#else

++	outData.resize(buf->buffer->use * sizeof(xmlChar));

++	memcpy(outData.begin(), buf->buffer->content, outData.size());

++#endif

+ 

+ 	xmlOutputBufferClose(buf);

+ 	daeDocument.ReleaseXmlData();

+@@ -591,7 +592,7 @@
+ 		else if (IsEquivalent(child->name, DAE_LIBRARY_PMATERIAL_ELEMENT)) n.order = PHYSICS_MATERIAL;

+ 		else if (IsEquivalent(child->name, DAE_LIBRARY_PMODEL_ELEMENT)) n.order = PHYSICS_MODEL;

+ 		else if (IsEquivalent(child->name, DAE_LIBRARY_PSCENE_ELEMENT)) n.order = PHYSICS_SCENE;

+-		else if (IsEquivalent(child->name, DAE_ASSET_ELEMENT)) 

++		else if (IsEquivalent(child->name, DAE_ASSET_ELEMENT))

+ 		{

+ 			// Read in the asset information

+ 			status &= (FArchiveXML::LoadAsset(theDocument->GetAsset(), child));

+@@ -679,9 +680,9 @@
+ 		case IMAGE: status &= (FArchiveXML::LoadImageLibrary(theDocument->GetImageLibrary(), n.node)); break;

+ 		case LIGHT: status &= (FArchiveXML::LoadLightLibrary(theDocument->GetLightLibrary(), n.node)); break;

+ 		case MATERIAL: status &= (FArchiveXML::LoadMaterialLibrary(theDocument->GetMaterialLibrary(), n.node)); break;

+-		case PHYSICS_MODEL: 

++		case PHYSICS_MODEL:

+ 			{

+-				status &= (FArchiveXML::LoadPhysicsModelLibrary(theDocument->GetPhysicsModelLibrary(), n.node)); 

++				status &= (FArchiveXML::LoadPhysicsModelLibrary(theDocument->GetPhysicsModelLibrary(), n.node));

+ 				size_t physicsModelCount = theDocument->GetPhysicsModelLibrary()->GetEntityCount();

+ 				for (size_t physicsModelCounter = 0; physicsModelCounter < physicsModelCount; physicsModelCounter++)

+ 				{

+@@ -790,7 +791,7 @@
+ 	{

+ 		// [staylor] Why is this done here?  Shouldn't it be in FCDExternalReferenceManager?

+ 		// If it is, change it, either way delete the FUAssert (thanks)

+-		//FUAssert(false == true, ;);  

++		// FUAssert(false == true, ;);

+ 		FArchiveXML::RegisterLoadedDocument(theDocument);

+ 		//FCDExternalReferenceManager::RegisterLoadedDocument(theDocument);

+ 	}

+@@ -891,14 +892,14 @@
+ 			// Export the emitter library

+ 			xmlNode* libraryNode = AddChild(typedTechniqueNode, DAE_LIBRARY_EMITTER_ELEMENT);

+ 

+-			if (!theDocument->GetEmitterLibrary()->GetTransientFlag()) 

++			if (!theDocument->GetEmitterLibrary()->GetTransientFlag())

+ 				FArchiveXML::WriteLibrary(theDocument->GetEmitterLibrary(), libraryNode);

+ 		}

+ 

+ 		// Write out the animations

+ 		if (animationLibraryNode != NULL)

+ 		{

+-			if (!theDocument->GetAnimationLibrary()->GetTransientFlag()) 

++			if (!theDocument->GetAnimationLibrary()->GetTransientFlag())

+ 				FArchiveXML::WriteLibrary(theDocument->GetAnimationLibrary(), animationLibraryNode);

+ 		}

+ 

+@@ -978,7 +979,7 @@
+ 	{

+ 		return FArchiveXML::WriteSwitch(object, &objectType->GetParent(), node);

+ 	}

+-	else 

++	else

+ 	{

+ 		FUBreak;

+ 		return NULL;

+@@ -986,7 +987,7 @@
+ }

+ 

+ bool FArchiveXML::LoadAnimationLibrary(FCDObject* object, xmlNode* node)

+-{ 

++{

+ 	return FArchiveXML::LoadLibrary<FCDAnimation>(object, node);

+ }

+ 

+@@ -996,17 +997,17 @@
+ }

+ 

+ bool FArchiveXML::LoadCameraLibrary(FCDObject* object, xmlNode* node)

+-{ 

++{

+ 	return FArchiveXML::LoadLibrary<FCDCamera>(object, node);

+ }

+ 

+ bool FArchiveXML::LoadControllerLibrary(FCDObject* object, xmlNode* node)

+-{ 

++{

+ 	return FArchiveXML::LoadLibrary<FCDController>(object, node);

+ }

+ 

+ bool FArchiveXML::LoadEffectLibrary(FCDObject* object, xmlNode* node)

+-{ 

++{

+ 	return FArchiveXML::LoadLibrary<FCDEffect>(object, node);

+ }

+ 

+@@ -1016,7 +1017,7 @@
+ }

+ 

+ bool FArchiveXML::LoadForceFieldLibrary(FCDObject* object, xmlNode* node)

+-{ 

++{

+ 	return FArchiveXML::LoadLibrary<FCDForceField>(object, node);

+ }

+ 

+Index: ps/source/collada/CommonConvert.cpp
+===================================================================
+--- ps/source/collada/CommonConvert.cpp
++++ ps/source/collada/CommonConvert.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2018 Wildfire Games.
++/* Copyright (C) 2023 Wildfire Games.
+  * This file is part of 0 A.D.
+  *
+  * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -28,8 +28,9 @@
+ #include "FUtils/FUDaeSyntax.h"
+ #include "FUtils/FUFileManager.h"
+ 
+-#include <cassert>
+ #include <algorithm>
++#include <cassert>
++#include <libxml/xmlerror.h>
+ 
+ void require_(int line, bool value, const char* type, const char* message)
+ {
+Index: ps/source/collada/XMLFix.cpp
+===================================================================
+--- ps/source/collada/XMLFix.cpp
++++ ps/source/collada/XMLFix.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2009 Wildfire Games.
++/* Copyright (C) 2023 Wildfire Games.
+  * This file is part of 0 A.D.
+  *
+  * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -23,6 +23,8 @@
+ 
+ #include "FUtils/FUXmlParser.h"
+ 
++#include <libxml/parser.h>
++
+ /*
+ 
+ Things that are fixed here:
+Index: ps/source/ps/XML/RelaxNG.cpp
+===================================================================
+--- ps/source/ps/XML/RelaxNG.cpp
++++ ps/source/ps/XML/RelaxNG.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2021 Wildfire Games.
++/* Copyright (C) 2023 Wildfire Games.
+  * This file is part of 0 A.D.
+  *
+  * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -25,9 +25,11 @@
+ #include "ps/CStr.h"
+ #include "ps/Filesystem.h"
+ 
++#include <libxml/parser.h>
+ #include <libxml/relaxng.h>
+ #include <map>
+ #include <mutex>
++#include <type_traits>
+ 
+ TIMER_ADD_CLIENT(xml_validation);
+ 
+@@ -46,7 +48,8 @@
+ 	g_SchemaCache.clear();
+ }
+ 
+-static void relaxNGErrorHandler(void* UNUSED(userData), xmlErrorPtr error)
++static void relaxNGErrorHandler(void* UNUSED(userData),
++	std::conditional_t<LIBXML_VERSION >= 21200, const xmlError, xmlError>* error)
+ {
+ 	// Strip a trailing newline
+ 	std::string message = error->message;
+Index: ps/source/ps/XML/Xeromyces.cpp
+===================================================================
+--- ps/source/ps/XML/Xeromyces.cpp
++++ ps/source/ps/XML/Xeromyces.cpp
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2021 Wildfire Games.
++/* Copyright (C) 2023 Wildfire Games.
+  * This file is part of 0 A.D.
+  *
+  * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -33,12 +33,14 @@
+ #include "Xeromyces.h"
+ 
+ #include <libxml/parser.h>
++#include <type_traits>
+ 
+ static std::mutex g_ValidatorCacheLock;
+ static std::map<const std::string, RelaxNGValidator> g_ValidatorCache;
+ static bool g_XeromycesStarted = false;
+ 
+-static void errorHandler(void* UNUSED(userData), xmlErrorPtr error)
++static void errorHandler(void* UNUSED(userData),
++	std::conditional_t<LIBXML_VERSION >= 21200, const xmlError, xmlError>* error)
+ {
+ 	// Strip a trailing newline
+ 	std::string message = error->message;
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index f041af0568cd..90d9c3fb41cb 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz