summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-08-16 20:46:24 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-08-16 20:46:24 +0000
commit5fa4be2305eaf009c9319bccd1bdafe19ddf32e9 (patch)
treeaa60b93d1684d367cccb4ef3964bff8b9d4b77ec /net-libs/libproxy
parentTransfer prefix keywords, bump to EAPI=3, use slot dep for x11-libs/gtk+ (diff)
downloadgentoo-2-5fa4be2305eaf009c9319bccd1bdafe19ddf32e9.tar.gz
gentoo-2-5fa4be2305eaf009c9319bccd1bdafe19ddf32e9.tar.bz2
gentoo-2-5fa4be2305eaf009c9319bccd1bdafe19ddf32e9.zip
Fix building with recent glibc wrt #332857 by f3d.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libproxy')
-rw-r--r--net-libs/libproxy/ChangeLog6
-rw-r--r--net-libs/libproxy/files/libproxy-0.4.2-glibc212.patch12
-rw-r--r--net-libs/libproxy/libproxy-0.4.2.ebuild5
3 files changed, 20 insertions, 3 deletions
diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog
index fc04e456bc93..70e292787709 100644
--- a/net-libs/libproxy/ChangeLog
+++ b/net-libs/libproxy/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libproxy
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.37 2010/07/15 16:19:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.38 2010/08/16 20:46:24 ssuominen Exp $
+
+ 16 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> libproxy-0.4.2.ebuild,
+ +files/libproxy-0.4.2-glibc212.patch:
+ Fix building with recent glibc wrt #332857 by f3d.
15 Jul 2010; Jeroen Roovers <jer@gentoo.org> libproxy-0.4.2.ebuild:
Marked ~hppa (bug #320429).
diff --git a/net-libs/libproxy/files/libproxy-0.4.2-glibc212.patch b/net-libs/libproxy/files/libproxy-0.4.2-glibc212.patch
new file mode 100644
index 000000000000..f5a01f074d7c
--- /dev/null
+++ b/net-libs/libproxy/files/libproxy-0.4.2-glibc212.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/332857
+
+--- libproxy/modules/config_gnome.cpp
++++ libproxy/modules/config_gnome.cpp
+@@ -19,6 +19,7 @@
+
+ #include <cstdio> // For fileno(), fread(), pclose(), popen(), sscanf()
+ #include <sys/select.h> // For select()
++#include <sys/stat.h> // for stat()
+ #include <fcntl.h> // For fcntl()
+ #include <errno.h> // For errno stuff
+ #include <unistd.h> // For pipe(), close(), vfork(), dup(), execl(), _exit()
diff --git a/net-libs/libproxy/libproxy-0.4.2.ebuild b/net-libs/libproxy/libproxy-0.4.2.ebuild
index 75f36a82f808..d5cf3da75696 100644
--- a/net-libs/libproxy/libproxy-0.4.2.ebuild
+++ b/net-libs/libproxy/libproxy-0.4.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild,v 1.5 2010/07/15 16:19:15 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/libproxy-0.4.2.ebuild,v 1.6 2010/08/16 20:46:24 ssuominen Exp $
EAPI="2"
CMAKE_MIN_VERSION="2.8"
@@ -45,7 +45,8 @@ src_prepare() {
sed "s/-g -Wall -Werror / /" CMakeLists.txt -i
fi
# Stop using xulrunner 1.8 when both are installed
- epatch "${FILESDIR}"/libproxy-0.4.2-mozjs-search-order.patch
+ epatch "${FILESDIR}"/libproxy-0.4.2-mozjs-search-order.patch \
+ "${FILESDIR}"/${P}-glibc212.patch
}
src_configure() {