[pkg-fgfs-crew] r215 - /flightgear/trunk/debian/patches/terrasync.patch

[ovek at users.alioth.debian.org]

Author: ovek
Date: Mon Jul 16 22:02:41 2012
New Revision: 215

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=215
Log:
Seems terrasync was already fixed in a NMU to fgfs 2.4.0,
may as well carry forward the patch from it instead.

Modified:
    flightgear/trunk/debian/patches/terrasync.patch

Modified: flightgear/trunk/debian/patches/terrasync.patch
URL: http://svn.debian.org/wsvn/pkg-fgfs/flightgear/trunk/debian/patches/terrasync.patch?rev=215&op=diff
==============================================================================
--- flightgear/trunk/debian/patches/terrasync.patch (original)
+++ flightgear/trunk/debian/patches/terrasync.patch Mon Jul 16 22:02:41 2012
@@ -1,17 +1,24 @@
 Description: Fix build failure in terrasync.cxx
- They apparently have only been testing builds on Windows, not Linux.
+ Fix build failure with GCC 4.7.
 Origin: vendor
-Author: Ove Kaaven <ovek at arcticnet.no>
+Bug-Debian: http://bugs.debian.org/667167
+Author: Matej Vela <vela at debian.org>
 Forwarded: no
 Last-Update: 2012-07-16
 
---- flightgear-2.6.0.orig/utils/TerraSync/terrasync.cxx
-+++ flightgear-2.6.0/utils/TerraSync/terrasync.cxx
-@@ -42,6 +42,7 @@
+--- flightgear-2.4.0~/utils/TerraSync/terrasync.cxx
++++ flightgear-2.4.0/utils/TerraSync/terrasync.cxx
+@@ -29,9 +29,12 @@
+ #include <windows.h>
+ #endif
  
- #include <stdlib.h>             // atoi() atof() abs() system()
- #include <signal.h>             // signal()
-+#include <unistd.h>
- 
- #include <simgear/compiler.h>
- 
++#if HAVE_UNISTD_H
++#include <unistd.h>             // write(), getpid(), sleep()
++#endif
++
+ #ifdef __MINGW32__
+ #include <time.h>
+-#include <unistd.h>
+ #elif defined(_MSC_VER)
+ #   include <io.h>
+ #   ifndef HAVE_SVN_CLIENT_H