[hedgewars] 01/01: Add two patches for arm*

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch experimental
in repository hedgewars.

commit a212b493ad60e90ed3b2c7325c6639f890d25649
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue Dec 30 17:05:42 2014 +0100

    Add two patches for arm*
---
 debian/changelog                                   |  7 +++++
 debian/patches/0001-Fix-arm-build-failures.patch   | 33 ++++++++++++++++++++++
 ...urn-value-instead-of-looking-for-the-stde.patch | 33 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 4 files changed, 75 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9107a39..70a762c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hedgewars (0.9.21-3) unstable; urgency=medium
+
+  * Fix bad ghc find module cmake script.
+  * Fix arm* build failures.
+
+ -- Gianfranco Costamagna <costamagnagianfranco at yahoo.it>  Mon, 29 Dec 2014 09:58:48 +0100
+
 hedgewars (0.9.21-2) experimental; urgency=medium
 
   * Enable experimental BUILD_ENGINE_C.
diff --git a/debian/patches/0001-Fix-arm-build-failures.patch b/debian/patches/0001-Fix-arm-build-failures.patch
new file mode 100644
index 0000000..272641a
--- /dev/null
+++ b/debian/patches/0001-Fix-arm-build-failures.patch
@@ -0,0 +1,33 @@
+From 52a97b25e6ea09449d75ae6b3838490161315259 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Date: Tue, 30 Dec 2014 15:56:09 +0100
+Subject: [PATCH] Fix arm* build failures
+
+---
+ hedgewars/uRender.pas | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/hedgewars/uRender.pas b/hedgewars/uRender.pas
+index cefea5f..a7f0fb9 100644
+--- a/hedgewars/uRender.pas
++++ b/hedgewars/uRender.pas
+@@ -535,11 +535,14 @@ begin
+ end;
+ 
+ procedure openglRotatef(RotX, RotY, RotZ: GLfloat; dir: LongInt); inline;
++{ workaround for pascal bug http://bugs.freepascal.org/view.php?id=27222 }
++var tmpdir: LongInt;
+ begin
++tmpdir:=dir;
+ {$IFDEF GL2}
+-    hglRotatef(RotX, RotY, RotZ, dir);
++    hglRotatef(RotX, RotY, RotZ, tmpdir);
+ {$ELSE}
+-    glRotatef(RotX, RotY, RotZ, dir);
++    glRotatef(RotX, RotY, RotZ, tmpdir);
+ {$ENDIF}
+ end;
+ 
+-- 
+1.9.1
+
diff --git a/debian/patches/0001-Use-ghc-return-value-instead-of-looking-for-the-stde.patch b/debian/patches/0001-Use-ghc-return-value-instead-of-looking-for-the-stde.patch
new file mode 100644
index 0000000..2d47a5a
--- /dev/null
+++ b/debian/patches/0001-Use-ghc-return-value-instead-of-looking-for-the-stde.patch
@@ -0,0 +1,33 @@
+From ced39df2419d49f3ef1307acc0123268d95f46f3 Mon Sep 17 00:00:00 2001
+From: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
+Date: Mon, 29 Dec 2014 12:27:51 +0100
+Subject: [PATCH] Use ghc return value instead of looking for the stderr, do
+ not throw error when an haskell module throws a build failure, e.g. because
+ of false positives like this one (debian/arm*) "You are using a new version
+ of LLVM that hasn't been tested yet! We will try though..."
+
+---
+ cmake_modules/CheckHaskellModuleExists.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake_modules/CheckHaskellModuleExists.cmake b/cmake_modules/CheckHaskellModuleExists.cmake
+index 872b1a0..26b6812 100644
+--- a/cmake_modules/CheckHaskellModuleExists.cmake
++++ b/cmake_modules/CheckHaskellModuleExists.cmake
+@@ -30,11 +30,11 @@ macro(CHECK_HASKELL_MODULE_EXISTS MODULE FUNCTION PARAMCOUNT LIBRARY)
+                     "-DPARAMETERS=${PARAMETERS}"
+                     -cpp
+                     -c "${CMAKE_MODULE_PATH}/checkModule.hs"
++                    RESULT_VARIABLE COMMAND_RESULT
+                     ERROR_VARIABLE BUILD_ERROR
+                     OUTPUT_STRIP_TRAILING_WHITESPACE
+                     )
+-
+-    if("${BUILD_ERROR}" STREQUAL "")
++    if(${COMMAND_RESULT} EQUAL 0)
+       message(STATUS "Looking for ${FUNCTION} in ${MODULE} - found")
+       set(${VARIABLE} 1 CACHE INTERNAL "Have module ${MODULE}")
+       file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
+-- 
+1.9.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 10c6876..89fbbe6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0001-Fix-segfault-when-BUILD_ENGINE_C-ON-and-FONTS_DIR-is.patch
 disable-fstack-protector.patch
+0001-Use-ghc-return-value-instead-of-looking-for-the-stde.patch
+0001-Fix-arm-build-failures.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git