Author: vcheng
Date: 2015-06-02 04:49:33 +0000 (Tue, 02 Jun 2015)
New Revision: 15434

Modified:
   packages/trunk/supertuxkart/debian/changelog
   
packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
Log:
update patch to fix armel FTBFS


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog        2015-05-30 11:37:28 UTC 
(rev 15433)
+++ packages/trunk/supertuxkart/debian/changelog        2015-06-02 04:49:33 UTC 
(rev 15434)
@@ -1,3 +1,10 @@
+supertuxkart (0.9-3) unstable; urgency=medium
+
+  * Update fix_angelscript_build_on_non-x86_arches.patch to fix FTBFS on
+    armel. Thanks again to James Cowgill for the patch!
+
+ -- Vincent Cheng <[email protected]>  Mon, 01 Jun 2015 21:39:01 -0700
+
 supertuxkart (0.9-2) unstable; urgency=medium
 
   * Add fix_angelscript_build_on_non-x86_arches.patch to fix FTBFS on a few

Modified: 
packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
===================================================================
--- 
packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
    2015-05-30 11:37:28 UTC (rev 15433)
+++ 
packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch
    2015-06-02 04:49:33 UTC (rev 15434)
@@ -2,7 +2,7 @@
 Forwarded: https://github.com/supertuxkart/stk-code/pull/2195
 Author: James Cowgill <[email protected]>
 Bug: https://github.com/supertuxkart/stk-code/issues/2194
-Last-Update: 2015-05-16
+Last-Update: 2015-06-01
 
 --- a/lib/angelscript/projects/cmake/CMakeLists.txt
 +++ b/lib/angelscript/projects/cmake/CMakeLists.txt
@@ -42,3 +42,12 @@
                        #define AS_X64_GCC
                        #define HAS_128_BIT_PRIMITIVES
                        #define SPLIT_OBJS_BY_MEMBER_TYPES
+@@ -794,7 +794,7 @@
+                       // STDCALL is not available on 64bit Linux
+                       #undef STDCALL
+                       #define STDCALL
+-              #elif defined(__ARMEL__) || defined(__arm__)
++              #elif (defined(__ARMEL__) || defined(__arm__)) && 
!(defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__))
+                       #define AS_ARM
+ 
+                       #undef STDCALL


_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

Reply via email to