[pkg-fgfs-crew] [simgear] 01/01: Add patch gcc-macro-correction.diff for compatibility with boost1.53.

[Markus Wanner]

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

markus_wanner-guest pushed a commit to branch master
in repository simgear.

commit 0e5e295fefc80cd334ae83040c1a5ec6e64e9a7d
Author: Markus Wanner <markus at bluegap.ch>
Date:   Tue Aug 27 16:42:15 2013 +0200

    Add patch gcc-macro-correction.diff for compatibility with boost1.53.
---
 debian/changelog                         |    1 +
 debian/patches/gcc-macro-correction.diff |   26 ++++++++++++++++++++++++++
 debian/patches/series                    |    1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ea1a023..a389036 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ simgear (2.10.0-1) unstable; urgency=low
   * rules: rewrite to use dh7, simplify a lot, drop the static libraries
     from the -dev package.
   * Add myself as an uploader.
+  * Add patch gcc-macro-correction.diff for compatibility with boost1.53.
 
  -- Markus Wanner <markus at bluegap.ch>  Mon, 19 Aug 2013 16:15:27 +0200
 
diff --git a/debian/patches/gcc-macro-correction.diff b/debian/patches/gcc-macro-correction.diff
new file mode 100644
index 0000000..d530cd0
--- /dev/null
+++ b/debian/patches/gcc-macro-correction.diff
@@ -0,0 +1,26 @@
+Subject: Back-port compatibility with OpenSceneGraph 3.2
+From: Markus Wanner <markus at bluegap.ch>
+Last-Update: 2013-08-22
+
+--- a/simgear/compiler.h
++++ b/simgear/compiler.h
+@@ -46,7 +46,7 @@
+ #    warning GCC compilers prior to 3.4 are suspect  
+ #  endif
+ 
+-#  define GCC_VERSION (__GNUC__ * 10000 \
++#  define SG_GCC_VERSION (__GNUC__ * 10000 \
+                      + __GNUC_MINOR__ * 100 \
+                      + __GNUC_PATCHLEVEL__)
+ #  define SG_COMPILER_STR "GNU C++ version " SG_STRINGIZE(__GNUC__) "." SG_STRINGIZE(__GNUC_MINOR__)
+--- a/simgear/nasal/cppbind/Ghost.hxx
++++ b/simgear/nasal/cppbind/Ghost.hxx
+@@ -281,7 +281,7 @@
+           // Both ways of retrieving the address of a static member function
+           // should be legal but not all compilers know this.
+           // g++-4.4.7+ has been tested to work with both versions
+-#if defined(GCC_VERSION) && GCC_VERSION < 40407
++#if defined(SG_GCC_VERSION) && SG_GCC_VERSION < 40407
+           // The old version of g++ used on Jenkins (16.11.2012) only compiles
+           // this version.
+           &getTypeFor<BaseGhost>
diff --git a/debian/patches/series b/debian/patches/series
index d43eb71..e0abda2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+gcc-macro-correction.diff
 osg-compat.diff

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