r15947 - in packages/trunk/supertuxkart/debian: . patches

[Vincent Cheng]

Author: vcheng
Date: 2016-12-04 03:13:27 +0000 (Sun, 04 Dec 2016)
New Revision: 15947

Added:
   packages/trunk/supertuxkart/debian/patches/fix_angelscript_ftbfs.patch
Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/patches/series
Log:
supertuxkart: fix angelscript-related ftbfs


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2016-12-04 03:06:47 UTC (rev 15946)
+++ packages/trunk/supertuxkart/debian/changelog	2016-12-04 03:13:27 UTC (rev 15947)
@@ -1,5 +1,7 @@
 supertuxkart (0.9.2+dfsg-2) UNRELEASED; urgency=medium
 
+  * Fix FTBFS on arm64, mips/mips64/mipsel, ppc64el, s390x. (Closes: #830748)
+    - Add debian/patches/fix_angelscript_ftbfs.patch.
   * Remove non-free Ubuntu Font Family fonts, replaced with Cantarell.
     (Closes: #830751)
     - Add new dependency on fonts-cantarell.

Added: packages/trunk/supertuxkart/debian/patches/fix_angelscript_ftbfs.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/fix_angelscript_ftbfs.patch	                        (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/fix_angelscript_ftbfs.patch	2016-12-04 03:13:27 UTC (rev 15947)
@@ -0,0 +1,27 @@
+Description: Fix FTBFS on arm64, mips/mips64/mipsel, ppc64el, s390x
+Origin: upstream, https://github.com/supertuxkart/stk-code/commit/5e05f1178ce6bc5f3a653b55ab3dc6d016196341
+Bug: https://github.com/supertuxkart/stk-code/issues/2569
+Bug-Debian: https://bugs.debian.org/830748
+Last-Update: 2016-12-03
+
+--- a/lib/angelscript/projects/cmake/CMakeLists.txt
++++ b/lib/angelscript/projects/cmake/CMakeLists.txt
+@@ -68,6 +68,7 @@ set(ANGELSCRIPT_SOURCE
+     ../../source/as_bytecode.cpp
+     ../../source/as_callfunc.cpp
+     ../../source/as_callfunc_x86.cpp
++    ../../source/as_callfunc_mips.cpp
+     ../../source/as_callfunc_x64_gcc.cpp
+     ../../source/as_callfunc_x64_msvc.cpp
+     ../../source/as_callfunc_x64_mingw.cpp
+--- a/lib/angelscript/source/as_config.h
++++ b/lib/angelscript/source/as_config.h
+@@ -844,7 +844,7 @@
+ 			#define THISCALL_PASS_OBJECT_POINTER_ON_THE_STACK
+ 			#define AS_X86
+ 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+-		#elif defined(__LP64__) && !defined(__arm64__)
++		#elif defined(__x86_64__)
+ 			#define AS_X64_GCC
+ 			#undef AS_NO_THISCALL_FUNCTOR_METHOD
+ 			#define HAS_128_BIT_PRIMITIVES

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2016-12-04 03:06:47 UTC (rev 15946)
+++ packages/trunk/supertuxkart/debian/patches/series	2016-12-04 03:13:27 UTC (rev 15947)
@@ -3,6 +3,7 @@
 remove_irrlicht_embedded_libs.patch
 replace-fonts-ubuntu-with-cantarell.patch
 update_boom_boom_boom_license.patch
+fix_angelscript_ftbfs.patch
 # Irrlicht patches taken directly from irrlicht source package in Debian
 irrlicht/arch-support.diff
 irrlicht/use-system-libs.diff