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

[Vincent Cheng]

Author: vcheng
Date: 2015-12-23 05:37:21 +0000 (Wed, 23 Dec 2015)
New Revision: 15655

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


Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2015-12-22 05:48:12 UTC (rev 15654)
+++ packages/trunk/supertuxkart/debian/changelog	2015-12-23 05:37:21 UTC (rev 15655)
@@ -1,8 +1,9 @@
-supertuxkart (0.9.1-2) UNRELEASED; urgency=medium
+supertuxkart (0.9.1-2) unstable; urgency=medium
 
-  * (no pending changelog entries)
+  * Fix fix_angelscript_build_on_non-x86_arches.patch to fix FTBFS on armhf.
+    (Closes: #808716)
 
- -- Vincent Cheng <vcheng at debian.org>  Mon, 21 Dec 2015 14:50:47 -0800
+ -- Vincent Cheng <vcheng at debian.org>  Tue, 22 Dec 2015 21:29:36 -0800
 
 supertuxkart (0.9.1-1) unstable; urgency=medium
 

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-12-22 05:48:12 UTC (rev 15654)
+++ packages/trunk/supertuxkart/debian/patches/fix_angelscript_build_on_non-x86_arches.patch	2015-12-23 05:37:21 UTC (rev 15655)
@@ -7,7 +7,7 @@
 
 --- a/lib/angelscript/projects/cmake/CMakeLists.txt
 +++ b/lib/angelscript/projects/cmake/CMakeLists.txt
-@@ -102,12 +102,12 @@
+@@ -102,12 +102,13 @@
      endif()
  endif()
  
@@ -15,7 +15,7 @@
 +if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^arm")
      enable_language(ASM)
      if(CMAKE_ASM_COMPILER_WORKS)
--        set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
+         set(ANGELSCRIPT_SOURCE ${ANGELSCRIPT_SOURCE} ../../source/as_callfunc_arm.cpp ../../source/as_callfunc_arm_gcc.S)
 +        set_property(SOURCE ../../source/as_callfunc_arm_gcc.S APPEND PROPERTY COMPILE_FLAGS " -Wa,-mimplicit-it=always")
      else()
 -        message(FATAL ERROR "Android target requires a working assembler")