r14594 - packages/trunk/0ad/debian/patches

[Vincent Cheng]

Author: vincentc-guest
Date: 2013-09-19 07:34:08 +0000 (Thu, 19 Sep 2013)
New Revision: 14594

Modified:
   packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch
Log:
0ad: Add patch to fix armel and armhf FTBFS


Modified: packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch
===================================================================
--- packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch	2013-09-18 19:59:12 UTC (rev 14593)
+++ packages/trunk/0ad/debian/patches/fix-arm-ftbfs.patch	2013-09-19 07:34:08 UTC (rev 14594)
@@ -25,40 +25,6 @@
  				end
  			end
  
---- a/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp
-+++ b/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp
-@@ -8,6 +8,7 @@
- 
- #include "StdAfx.h"
- #include "FUAssert.h"
-+#include "sys/signal.h"
- #ifdef __APPLE__
- #include <CoreServices/CoreServices.h>
- #endif
-@@ -41,14 +42,15 @@
- 		{ 
- 			return true; 
- 		}
--#elif defined (__APPLE__)
--		Debugger();
--		//SysBreak();
--#elif defined (__arm__)
--		__asm__("bkpt 0");
--#else
--		// AFAIK This is available on all X86 platforms
--		__asm__("int $0x03");
-+#elif defined(__APPLE__)
-+		Debugger();
-+		//SysBreak();
-+#elif defined(__arm__)
-+		__asm__("bkpt 0");
-+#elif defined(__i386__)
-+		__asm__("int $0x03");
-+#else
-+		throw(SIGTRAP);
- #endif // WIN32
- 		return false;
- 	}
 --- a/libraries/source/fcollada/src/Makefile
 +++ b/libraries/source/fcollada/src/Makefile
 @@ -1,18 +1,17 @@
@@ -86,3 +52,33 @@
  endif
  CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
  CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL
+--- a/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp
++++ b/libraries/source/fcollada/src/FCollada/FUtils/FUAssert.cpp
+@@ -8,6 +8,7 @@
+ 
+ #include "StdAfx.h"
+ #include "FUAssert.h"
++#include "sys/signal.h"
+ #ifdef __APPLE__
+ #include <CoreServices/CoreServices.h>
+ #endif
+@@ -41,14 +42,15 @@
+ 		{ 
+ 			return true; 
+ 		}
+-#elif defined (__APPLE__)
++#elif defined(__APPLE__)
+ 		Debugger();
+ 		//SysBreak();
+-#elif defined (__arm__)
++#elif defined(__arm__)
+ 		__asm__("bkpt 0");
+-#else
+-		// AFAIK This is available on all X86 platforms
++#elif defined(__i386__)
+ 		__asm__("int $0x03");
++#else
++		throw(SIGTRAP);
+ #endif // WIN32
+ 		return false;
+ 	}