[tuxcmd] Fix GCC 4.7 compatibility

[Tomas Bzatek]

commit 12f83f0854a7b8d3c208171317dc8b8c9deac8dc
Author: Tomas Bzatek <tbzatek at redhat.com>
Date:   Fri Feb 3 15:40:21 2012 +0100

    Fix GCC 4.7 compatibility

 tuxcmd-module-ziparchive-gcc-4.7-2.patch |   35 ++++++++++++++++++++++++++++++
 tuxcmd.spec                              |    2 +
 2 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/tuxcmd-module-ziparchive-gcc-4.7-2.patch b/tuxcmd-module-ziparchive-gcc-4.7-2.patch
new file mode 100644
index 0000000..1763d76
--- /dev/null
+++ b/tuxcmd-module-ziparchive-gcc-4.7-2.patch
@@ -0,0 +1,35 @@
+From f4d8292cf67ab481a27ea88f04e2edd6dc16119e Mon Sep 17 00:00:00 2001
+From: Tomas Bzatek <tbzatek at redhat.com>
+Date: Fri, 3 Feb 2012 15:37:06 +0100
+Subject: [PATCH] ZipArchive: More complete fix for gcc-4.7
+
+Reverting the #ifdef changes I did last time and adding an include
+should do the trick. More testing on older platforms is needed though.
+---
+ zip/ZipArchive/stdafx.h |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/zip/ZipArchive/stdafx.h b/zip/ZipArchive/stdafx.h
+index db54a41..ddb2fd4 100644
+--- a/zip/ZipArchive/stdafx.h
++++ b/zip/ZipArchive/stdafx.h
+@@ -23,6 +23,7 @@
+ 
+ #include "_features.h"
+ #include "_platform.h"
++#include <unistd.h>
+ 
+ #if _MSC_VER > 1000
+ 	#pragma once
+@@ -67,7 +68,7 @@
+ 	#define ZIP_SIZE_TYPE DWORD
+ 	#define ZIP_ZLIB_TYPE int
+ 
+-#if !defined(_INTPTR_T_DEFINED)
++#if !defined(_INTPTR_T_DEFINED) && !defined(__GNUC__)
+ 	#if defined (__BORLANDC__)
+ 		#include <stdint.h>
+ 	#elif _MSC_VER <= 1200 || !defined _MSC_VER
+-- 
+1.7.8.4
+
diff --git a/tuxcmd.spec b/tuxcmd.spec
index 4d1da94..39dcb63 100644
--- a/tuxcmd.spec
+++ b/tuxcmd.spec
@@ -28,6 +28,7 @@ Patch6: tuxcmd-module-gvfs_include-glib.patch
 
 # GCC 4.7 compatibility
 Patch7: tuxcmd-module-ziparchive-gcc-4.7.patch
+Patch8: tuxcmd-module-ziparchive-gcc-4.7-2.patch
 
 %description
 Tux Commander is open-source file manager with 2 panels side by side written
@@ -71,6 +72,7 @@ pushd ../%{name}-modules-%{version}
 %patch5 -p1 -b .libarchive3
 %patch6 -p1 -b .glib-include
 %patch7 -p1 -b .gcc-4.7
+%patch8 -p1 -b .gcc-4.7-2
 popd
 
 %build