Bug#956967: Patch from upstream for FTBFS with gcc-10

[Itms]

Hello,

I am a developer of 0ad. As noticed by Reiner, this is fixed upstream. 
As far as I can see, only a part of the upstream fix is necessary for 
patching the latest 0ad release. I am attaching a patch which should fix 
the issue for the Debian package.

We would like to offer any help we can in preventing the removal of 0ad 
from the repository. The latest release is a bit old and unfortunately 
our upcoming release will not be ready in time for the stabilization of 
Debian bullseye. However, the project is still very active and we would 
like to prevent a break in the availability of 0ad in your repos.

Thanks a lot for the maintaining work, do not hesitate to contact me if 
needed.

Best regards,
Nicolas


-------------- next part --------------
From: Nicolas Auvray <na.itms76 at gmail.com>
Date: Thu, 13 Aug 2020 18:28:12 +0200
Subject: Fix #956967 on 0.0.23b

---
 .../FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp | 12 ------------
 .../src/FColladaPlugins/FArchiveXML/FArchiveXML.h    | 11 ++++++++++-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp b/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
index e999c4e..4272a16 100644
--- a/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
+++ b/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
@@ -330,15 +330,3 @@ void FArchiveXML::WritePhysicsRigidBodyParameters(FCDPhysicsRigidBodyParameters*
 	}
 }
 
-template <class TYPE, int QUAL>
-xmlNode* FArchiveXML::AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value)
-{
-	xmlNode* paramNode = AddChild(parentNode, name);
-	AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
-	if (value.IsAnimated())
-	{
-		const FCDAnimated* animated = value.GetAnimated();
-		FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
-	}
-	return paramNode;
-}
diff --git a/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h b/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
index a20abcb..4f18cc0 100644
--- a/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
+++ b/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
@@ -553,7 +553,16 @@ public:
 
 	static void WritePhysicsRigidBodyParameters(FCDPhysicsRigidBodyParameters* physicsRigidBodyParameters, xmlNode* techniqueNode);
 	template <class TYPE, int QUAL>
-	static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value);
+	static xmlNode* AddPhysicsParameter(xmlNode* parentNode, const char* name, FCDParameterAnimatableT<TYPE,QUAL>& value) {
+		xmlNode* paramNode = AddChild(parentNode, name);
+		AddContent(paramNode, FUStringConversion::ToString((TYPE&) value));
+		if (value.IsAnimated())
+		{
+			const FCDAnimated* animated = value.GetAnimated();
+			FArchiveXML::WriteAnimatedValue(animated, paramNode, name);
+		}
+		return paramNode;
+	}
 
 
 	//
--