[jhbuild] 3.6: Patch libproxy to build with gcc 4.7 (GNOME bug 678704)

[Craig Keogh <cskeogh src gnome org>]

commit 245d312329856044845616b20dfd9f43eba3cc45
Author: Craig Keogh <cskeogh adam com au>
Date:   Sun Jun 24 22:41:47 2012 +0930

    3.6: Patch libproxy to build with gcc 4.7 (GNOME bug 678704)
    
    See:
    http://code.google.com/p/libproxy/issues/detail?id=173
    http://code.google.com/p/libproxy/source/detail?r=833

 modulesets/gnome-suites-core-deps-base-3.6.modules |    6 +-
 patches/libproxy-0.4.7-gcc47.patch                 |   81 ++++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletions(-)
---
diff --git a/modulesets/gnome-suites-core-deps-base-3.6.modules b/modulesets/gnome-suites-core-deps-base-3.6.modules
index a219398..3d3334a 100644
--- a/modulesets/gnome-suites-core-deps-base-3.6.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.6.modules
@@ -384,7 +384,11 @@
     <branch repo="libproxy.googlecode.com"
             module="libproxy-0.4.7.tar.gz" version="0.4.7"
             hash="sha256:8fe0a58810139ba3c2e186deccf3e68adcd127aa0e972b0862b30b3dde493797"
-            size="91092"/>
+            size="91092">
+      <!-- fix gcc4.7 problems. Remove when new release. Patch rev 833:
+           http://code.google.com/p/libproxy/source/detail?r=833       -->
+      <patch file="libproxy-0.4.7-gcc47.patch"/>
+    </branch>
     <dependencies>
       <dep package="glib"/>
     </dependencies>
diff --git a/patches/libproxy-0.4.7-gcc47.patch b/patches/libproxy-0.4.7-gcc47.patch
new file mode 100644
index 0000000..e623a4e
--- /dev/null
+++ b/patches/libproxy-0.4.7-gcc47.patch
@@ -0,0 +1,81 @@
+# Fix build with gcc 4.7. Fixes  issue 173
+# r833
+# http://code.google.com/p/libproxy/source/detail?r=833
+Index: libproxy/url.cpp
+===================================================================
+--- libproxy/url.cpp	(revision 832)
++++ libproxy/url.cpp	(revision 833)
+@@ -33,6 +33,7 @@
+ #include <cstdlib>    // For atoi()
+ #include <sys/stat.h> // For stat()
+ #include <algorithm> // For transform()
++#include <unistd.h>  // For read() close()
+ 
+ #ifdef WIN32
+ #include <io.h>
+Index: libproxy/modules/pacrunner_webkit.cpp
+===================================================================
+--- libproxy/modules/pacrunner_webkit.cpp	(revision 832)
++++ libproxy/modules/pacrunner_webkit.cpp	(revision 833)
+@@ -18,6 +18,7 @@
+  ******************************************************************************/
+ 
+ #include "../extension_pacrunner.hpp"
++#include <unistd.h> // gethostname
+ using namespace libproxy;
+ 
+ #ifdef __APPLE__
+Index: libproxy/modules/pacrunner_natus.cpp
+===================================================================
+--- libproxy/modules/pacrunner_natus.cpp	(revision 832)
++++ libproxy/modules/pacrunner_natus.cpp	(revision 833)
+@@ -18,6 +18,7 @@
+  ******************************************************************************/
+ 
+ #include "../extension_pacrunner.hpp"
++#include <unistd.h> // gethostname
+ using namespace libproxy;
+ 
+ #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
+Index: libproxy/modules/pacrunner_mozjs.cpp
+===================================================================
+--- libproxy/modules/pacrunner_mozjs.cpp	(revision 832)
++++ libproxy/modules/pacrunner_mozjs.cpp	(revision 833)
+@@ -18,6 +18,7 @@
+  ******************************************************************************/
+ 
+ #include <cstring> // ?
++#include <unistd.h> // gethostname
+ 
+ #include "../extension_pacrunner.hpp"
+ using namespace libproxy;
+Index: libproxy/modules/config_sysconfig.cpp
+===================================================================
+--- libproxy/modules/config_sysconfig.cpp	(revision 832)
++++ libproxy/modules/config_sysconfig.cpp	(revision 833)
+@@ -21,7 +21,10 @@
+ #include <cstdlib>
+ #include <map>
+ #include <fstream>
++#include <unistd.h>
++#include <sys/types.h>
+ 
++
+ #include "../extension_config.hpp"
+ using namespace libproxy;
+ using std::map;
+## Can't patch in NEWS
+#Index: NEWS
+#===================================================================
+#--- NEWS	(revision 832)
+#+++ NEWS	(revision 833)
+#@@ -16,8 +16,8 @@
+#   - #168: .pc file should be installed under OSX as well.
+#   - #170: Also check for "Transfer-Encoding: chunked".
+#   - #171: mozjs pacrunner: Fix parameters of dnsResolve_()
+#+  - #173: Libproxy doesn't build with gcc 4.7
+# 
+#-
+# New in version 0.4.7
+# ==============================
+# * Support/require xulrunner 2.0+