diff options
| author |   Romain Perier <mrpouet@gentoo.org> | 2009-06-25 20:53:37 +0000 |
|---|---|---|
| committer | Romain Perier <mrpouet@gentoo.org> | 2009-06-25 20:53:37 +0000 |
| commit | 9dde89c2f09763c557f033da49aca497a2ea2287 (patch) | |
| tree | bb35a09826066c8c395b67ef3a66f0ee0863f340 /net-libs/libproxy | |
| parent | arts is deprecated (diff) | |
| download | gentoo-2-9dde89c2f09763c557f033da49aca497a2ea2287.tar.gz gentoo-2-9dde89c2f09763c557f033da49aca497a2ea2287.tar.bz2 gentoo-2-9dde89c2f09763c557f033da49aca497a2ea2287.zip | |
Fix bug #275318
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'net-libs/libproxy')
| -rw-r--r-- | net-libs/libproxy/ChangeLog | 6 | ||||
| -rw-r--r-- | net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch | 25 |
2 files changed, 21 insertions, 10 deletions
diff --git a/net-libs/libproxy/ChangeLog b/net-libs/libproxy/ChangeLog index 0d8f25b1ff16..3e9cfc2c833d 100644 --- a/net-libs/libproxy/ChangeLog +++ b/net-libs/libproxy/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-libs/libproxy # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.14 2009/06/24 15:43:08 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/libproxy/ChangeLog,v 1.15 2009/06/25 20:53:37 mrpouet Exp $ + + 25 Jun 2009; Romain Perier <mrpouet@gentoo.org> + files/libproxy-0.2.3-fix-mozjs-cflags.patch: + Fix bug #275318 24 Jun 2009; <nirbheek@gentoo.org> libproxy-0.2.3-r1.ebuild: Re-add alpha stable, it was added as a mistake initially, but we're going diff --git a/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch b/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch index 33c0b5b4585c..df1c3b704a05 100644 --- a/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch +++ b/net-libs/libproxy/files/libproxy-0.2.3-fix-mozjs-cflags.patch @@ -1,14 +1,21 @@ ---- configure.ac-old 2008-06-05 15:56:16.000000000 -0500 -+++ configure.ac 2009-06-22 23:00:28.582633887 -0500 -@@ -17,8 +17,10 @@ + configure.ac | 7 ++++--- + 1 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index bfea453..16b114a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -17,9 +17,10 @@ PKG_CHECK_MODULES(x11, x11, have_x11=yes, have_x11=no) + PKG_CHECK_MODULES(xmu, xmu, have_xmu=yes, have_xmu=no) PKG_CHECK_MODULES(gconf, gconf-2.0, have_gconf=yes, have_gconf=no) PKG_CHECK_MODULES(webkit, webkit-1.0, have_webkit=yes, have_webkit=no) - PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, -+ [PKG_CHECK_MODULES(mozjs, libxul-unstable, have_mozjs=yes, -+ [PKG_CHECK_MODULES(mozjs, seamonkey-js , have_mozjs=yes, - [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes, +-PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, +- [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes, - [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])]) -+ [PKG_CHECK_MODULES(mozjs, mozilla-js, have_mozjs=yes, have_mozjs=no)])])])]) ++PKG_CHECK_MODULES(mozjs, xulrunner-js, have_mozjs=yes, ++ [PKG_CHECK_MODULES(mozjs, libxul-unstable mozilla-js, have_mozjs=yes, ++ [PKG_CHECK_MODULES(mozjs, seamonkey-js, have_mozjs=yes, ++ [PKG_CHECK_MODULES(mozjs, firefox-js, have_mozjs=yes, have_mozjs=no)])])]) PKG_CHECK_MODULES(NetworkManager, NetworkManager, have_networkmanager=yes, have_networkmanager=no) - + PKG_CHECK_MODULES(dbus, dbus-1, have_dbus=yes, have_dbus=no) |