[arch-commits] Commit in 0ad/trunk (0ad-fcollada.patch PKGBUILD)

[Sven-Hendrik Haase]

    Date: Sunday, May 17, 2020 @ 23:40:00
  Author: svenstaro
Revision: 629144

upgpkg: 0ad a23.1-10: Rebuild against wxgtk3

Added:
  0ad/trunk/0ad-fcollada.patch
Modified:
  0ad/trunk/PKGBUILD

--------------------+
 0ad-fcollada.patch |   41 +++++++++++++++++++++++++++++++++++++++++
 PKGBUILD           |   14 ++++++++++----
 2 files changed, 51 insertions(+), 4 deletions(-)

Added: 0ad-fcollada.patch
===================================================================
--- 0ad-fcollada.patch	                        (rev 0)
+++ 0ad-fcollada.patch	2020-05-17 23:40:00 UTC (rev 629144)
@@ -0,0 +1,41 @@
+diff -up 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h.orig 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h
+--- 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h.orig	2020-03-30 16:28:20.011982827 -0300
++++ 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.h	2020-03-31 11:43:27.669098382 -0300
+@@ -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;
++	}
+ 
+ 
+ 	//
+diff -up 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp
+--- 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp.orig	2008-09-07 19:13:25.000000000 -0300
++++ 0ad-0.0.23b-alpha/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FAXPhysicsExport.cpp	2020-03-31 11:43:24.577115067 -0300
+@@ -329,16 +329,3 @@ void FArchiveXML::WritePhysicsRigidBodyP
+ 		FArchiveXML::LetWriteObject(physicsRigidBodyParameters->GetPhysicsShape(i), techniqueNode);
+ 	}
+ }
+-
+-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;
+-}

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-17 23:39:49 UTC (rev 629143)
+++ PKGBUILD	2020-05-17 23:40:00 UTC (rev 629144)
@@ -4,21 +4,23 @@
 pkgname=0ad
 pkgver=a23.1
 _pkgver=0.0.23b-alpha
-pkgrel=9
+pkgrel=10
 pkgdesc="Cross-platform, 3D and historically-based real-time strategy game"
 arch=('x86_64')
 url="http://play0ad.com/"
 license=('GPL2' 'CCPL')
 depends=('binutils' 'boost-libs' 'curl' 'enet' 'libogg' 'libpng' 'libvorbis'
-         'libxml2' 'openal' 'sdl2' 'wxgtk' 'zlib' 'libgl' '0ad-data' 'glu'
+         'libxml2' 'openal' 'sdl2' 'wxgtk3' 'zlib' 'libgl' '0ad-data' 'glu'
          'gloox' 'miniupnpc' 'libminiupnpc.so' 'icu' 'nspr' 'libsodium')
 makedepends=('boost' 'cmake' 'mesa' 'zip' 'python2' 'libsm')
 source=("https://releases.wildfiregames.com/$pkgname-$_pkgver-unix-build.tar.xz"
         zen2-workaround.patch
-        missing-includes.patch)
+        missing-includes.patch
+        0ad-fcollada.patch)
 sha512sums=('82934313c46c4fd89e3841d5bbf901904abbd2108e9749529d7282bd24ac53b9e6878681c06e6019f4d8ec0e425c28300b0aafc9610a66a331777ffb58ed6135'
             '1aaab2a71b363b0acbb6beb724bbb4c4b3a8fc607c7958f65e9653e29dedfc502f84262955d1b5ba5dc54b2c97a3882809967e74dfd3de54ae09ee6b08816a90'
-            '4cd709847f50de291a7eb5f2049e06f6725799a793d845ac40b1ffdd8f3674d426736dc7ea226dc9f261e8edc3c68972edc704f4aa42b05ed37f6866b5680ddd')
+            '4cd709847f50de291a7eb5f2049e06f6725799a793d845ac40b1ffdd8f3674d426736dc7ea226dc9f261e8edc3c68972edc704f4aa42b05ed37f6866b5680ddd'
+            '06b0641698c89bb0331f5af0254f0e224877580e196fc030bbe37140926c93d5392512f129dfd5922fcc588a28cad1832e94f36a523027678880b5b0522cff34')
 
 prepare() {
   cd "$srcdir/$pkgname-$_pkgver/"
@@ -26,6 +28,9 @@
 
   patch -Np0 -i "$srcdir"/zen2-workaround.patch
   patch -Np1 -i "$srcdir"/missing-includes.patch
+
+  # https://trac.wildfiregames.com/ticket/5709
+  patch -Np1 -i "$srcdir"/0ad-fcollada.patch
 }
 
 build() {
@@ -37,6 +42,7 @@
   CXXFLAGS+=' -DU_USING_ICU_NAMESPACE=1'
 
   export SDL2_CONFIG="pkg-config sdl2"
+  export WX_CONFIG="wx-config-gtk3"
   ./update-workspaces.sh \
       --without-pch \
       --bindir=/usr/bin \