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

[ovek at users.alioth.debian.org]

Author: ovek
Date: Tue Jul 17 01:06:33 2012
New Revision: 216

URL: http://svn.debian.org/wsvn/pkg-fgfs/?sc=1&rev=216
Log:
Seems the NMU patch doesn't work as-is anymore,
since upstream broke HAVE_UNISTD_H.

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=216&op=diff
==============================================================================
--- flightgear/trunk/debian/patches/terrasync.patch (original)
+++ flightgear/trunk/debian/patches/terrasync.patch Tue Jul 17 01:06:33 2012
@@ -2,19 +2,19 @@
  Fix build failure with GCC 4.7.
 Origin: vendor
 Bug-Debian: http://bugs.debian.org/667167
-Author: Matej Vela <vela at debian.org>
+Author: Matej Vela <vela at debian.org>, Ove Kaaven <ovek at arcticnet.no>
 Forwarded: no
 Last-Update: 2012-07-16
 
---- flightgear-2.4.0~/utils/TerraSync/terrasync.cxx
-+++ flightgear-2.4.0/utils/TerraSync/terrasync.cxx
+--- flightgear.orig/utils/TerraSync/terrasync.cxx
++++ flightgear/utils/TerraSync/terrasync.cxx
 @@ -29,9 +29,12 @@
  #include <windows.h>
  #endif
  
-+#if HAVE_UNISTD_H
++//#if HAVE_UNISTD_H
 +#include <unistd.h>             // write(), getpid(), sleep()
-+#endif
++//#endif
 +
  #ifdef __MINGW32__
  #include <time.h>