Fix building with gcc-4.7 (bug #412363, thanks to Alphat-PC, Philipp Richter et al.)

(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)

3 files changed, 92 insertions, 3 deletions

diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index 25a9b5577c4f..429ac1bbadfe 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/libproxy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.78 2012/05/05 02:54:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.79 2012/05/26 08:57:11 tetromino Exp $
+
+  26 May 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  libproxy-0.4.7.ebuild, +files/libproxy-0.4.7-gcc-4.7.patch:
+  Fix building with gcc-4.7 (bug #412363, thanks to Alphat-PC, Philipp Richter
+  et al.)
 
   05 May 2012; Jeff Horelick <jdhore@gentoo.org> libproxy-0.4.6-r3.ebuild,
   libproxy-0.4.7.ebuild:
diff --git a/net-libs/libproxy/files/libproxy-0.4.7-gcc-4.7.patch b/net-libs/libproxy/files/libproxy-0.4.7-gcc-4.7.patch
new file mode 100644
index 000000000000..5a7bba61d22f
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.7-gcc-4.7.patch
@@ -0,0 +1,80 @@
+From 8dbcf9b358f50f7a7c1f1368d167999c31b1e86b Mon Sep 17 00:00:00 2001
+From: "dominique.leuenberger@gmail.com"
+ <dominique.leuenberger@gmail.com@c587cffe-e639-0410-9787-d7902ae8ed56>
+Date: Fri, 9 Mar 2012 17:47:15 +0000
+Subject: [PATCH] Fix build with gcc 4.7. Fixes issue 173
+
+git-svn-id: http://libproxy.googlecode.com/svn/trunk@833 c587cffe-e639-0410-9787-d7902ae8ed56
+---
+ libproxy/modules/config_sysconfig.cpp |    3 +++
+ libproxy/modules/pacrunner_mozjs.cpp  |    1 +
+ libproxy/modules/pacrunner_natus.cpp  |    1 +
+ libproxy/modules/pacrunner_webkit.cpp |    1 +
+ libproxy/url.cpp                      |    1 +
+ 5 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/libproxy/modules/config_sysconfig.cpp b/libproxy/modules/config_sysconfig.cpp
+index 616585a..6e97ae8 100644
+--- a/libproxy/modules/config_sysconfig.cpp
++++ b/libproxy/modules/config_sysconfig.cpp
+@@ -21,6 +21,9 @@
+ #include <cstdlib>
+ #include <map>
+ #include <fstream>
++#include <unistd.h>
++#include <sys/types.h>
++
+ 
+ #include "../extension_config.hpp"
+ using namespace libproxy;
+diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
+index 3283e91..abb4b9d 100644
+--- a/libproxy/modules/pacrunner_mozjs.cpp
++++ b/libproxy/modules/pacrunner_mozjs.cpp
+@@ -18,6 +18,7 @@
+  ******************************************************************************/
+ 
+ #include <cstring> // ?
++#include <unistd.h> // gethostname
+ 
+ #include "../extension_pacrunner.hpp"
+ using namespace libproxy;
+diff --git a/libproxy/modules/pacrunner_natus.cpp b/libproxy/modules/pacrunner_natus.cpp
+index f7bd4fc..ce79943 100644
+--- a/libproxy/modules/pacrunner_natus.cpp
++++ b/libproxy/modules/pacrunner_natus.cpp
+@@ -18,6 +18,7 @@
+  ******************************************************************************/
+ 
+ #include "../extension_pacrunner.hpp"
++#include <unistd.h> // gethostname
+ using namespace libproxy;
+ 
+ #define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE
+diff --git a/libproxy/modules/pacrunner_webkit.cpp b/libproxy/modules/pacrunner_webkit.cpp
+index b9abf34..c51b869 100644
+--- a/libproxy/modules/pacrunner_webkit.cpp
++++ b/libproxy/modules/pacrunner_webkit.cpp
+@@ -18,6 +18,7 @@
+  ******************************************************************************/
+ 
+ #include "../extension_pacrunner.hpp"
++#include <unistd.h> // gethostname
+ using namespace libproxy;
+ 
+ #ifdef __APPLE__
+diff --git a/libproxy/url.cpp b/libproxy/url.cpp
+index df75022..cd781df 100644
+--- a/libproxy/url.cpp
++++ b/libproxy/url.cpp
+@@ -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>
+-- 
+1.7.8.6
+
diff --git a/net-libs/libproxy/libproxy-0.4.7.ebuild b/net-libs/libproxy/libproxy-0.4.7.ebuild
index 37a8f3186038..d7a6d88a1c63 100644
--- a/net-libs/libproxy/libproxy-0.4.7.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.7.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.7.ebuild,v 1.10 2012/05/05 02:54:29 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.7.ebuild,v 1.11 2012/05/26 08:57:11 tetromino Exp $
 
 EAPI=4
 PYTHON_DEPEND="python? 2:2.6"
 
-inherit cmake-utils mono python
+inherit cmake-utils eutils mono python
 
 DESCRIPTION="Library for automatic proxy configuration management"
 HOMEPAGE="http://code.google.com/p/libproxy/"
@@ -41,6 +41,10 @@ pkg_setup() {
 	fi
 }
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc-4.7.patch"
+}
+
 src_configure() {
 	# WITH_VALA just copies the .vapi file over and needs no deps,
 	# hence always enable it unconditionally