[barry: 1/2] fix for gcc4.7

[Nathanael Noblet]

commit 6736903f3cea07521e81a7ea6aeed010ee0a87aa
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Thu Jan 5 12:20:20 2012 -0700

    fix for gcc4.7

 barry.spec    |    8 +++++++-
 gcc-4.7.patch |   21 +++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/barry.spec b/barry.spec
index 0c1dc8a..a7ed50e 100644
--- a/barry.spec
+++ b/barry.spec
@@ -1,6 +1,6 @@
 Name:           barry
 Version:        0.17.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        BlackBerry Desktop for Linux
 
 Group:          Applications/Productivity
@@ -18,6 +18,8 @@ Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{
 
 # pulled from unreleased v0.17.2
 Patch0:			barry-0.17.2-destructor-exception.patch
+Patch1:			gcc-4.7.patch
+
 BuildRequires:  libusb-devel boost-devel desktop-file-utils gtkmm24-devel libxml++-devel
 BuildRequires:  libglademm24-devel libglade2-devel libtar-devel libtool
 BuildRequires:  fuse-devel gettext-devel doxygen autoconf zlib-devel
@@ -71,6 +73,7 @@ This package contains the opensync plugin to synchronize your BlackBerry.
 %{__rm} -rf ./doc/www/*.sh
 find ./doc/www/doxygen/html -type f -size 0 -name \*.map -exec rm '{}' \;
 %patch0 -p1 
+%patch1 -p0
 
 %build
 # main tree
@@ -186,6 +189,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Thu Jan 5 2012 Nathanael Noblet <nathanael at gnat.ca> - 0.17.1-6
+- Fixes for gcc 4.7
+
 * Sun Nov 20 2011 Nathanael Noblet <nathanael at gnat.ca> - 0.17.1-5
 - Release bump for F16 boost soname change
 
diff --git a/gcc-4.7.patch b/gcc-4.7.patch
new file mode 100644
index 0000000..7f9852c
--- /dev/null
+++ b/gcc-4.7.patch
@@ -0,0 +1,21 @@
+--- src/packet.h.org	2012-01-05 11:49:43.000000000 -0700
++++ src/packet.h	2012-01-05 11:50:02.873589023 -0700
+@@ -26,6 +26,7 @@
+ 
+ #include <string>
+ #include <stdint.h>
++#include <unistd.h>
+ #include "protocol.h"
+ #include "data.h"
+ 
+--- src/j_jdwp.cc.org	2012-01-05 12:08:54.772293943 -0700
++++ src/j_jdwp.cc	2012-01-05 12:09:10.524984146 -0700
+@@ -24,7 +24,7 @@
+ #include <sstream>
+ #include <iomanip>
+ #include <errno.h>
+-
++#include <unistd.h>
+ 
+ namespace Barry { namespace JDWP {
+