summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2009-09-28 00:17:59 +0000
committerMart Raudsepp <leio@gentoo.org>2009-09-28 00:17:59 +0000
commit4956c52db88f0f6c422bf93297e048d87350036e (patch)
tree07ba32cce78ec4455aa3827a0383c240583af181 /net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild
parentNew package, ebuild written by me (diff)
downloadhistorical-4956c52db88f0f6c422bf93297e048d87350036e.tar.gz
historical-4956c52db88f0f6c422bf93297e048d87350036e.tar.bz2
historical-4956c52db88f0f6c422bf93297e048d87350036e.zip
Reduce the gnome-keyring requirement to be able to stabilize the security fixes in this version earlier. Tweak some other dependencies to be more correct, also fixing bug 277463
Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64
Diffstat (limited to 'net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild')
-rw-r--r--net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild16
1 files changed, 12 insertions, 4 deletions
diff --git a/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild
index 73569694fcef..f62378b7d8d0 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild,v 1.3 2009/09/12 22:42:02 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.1.10.ebuild,v 1.4 2009/09/28 00:17:59 leio Exp $
EAPI="2"
-inherit autotools
+inherit autotools eutils
MY_P="webkit-${PV}"
DESCRIPTION="Open source web browser engine"
@@ -26,15 +26,16 @@ RDEPEND="
x11-libs/cairo
>=x11-libs/gtk+-2.10
+ >=gnome-base/gail-1.8
>=dev-libs/icu-3.8.1-r1
>=net-libs/libsoup-2.25.90
>=dev-db/sqlite-3
>=app-text/enchant-0.22
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.26.0 )
+ gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.3-r2 )
gstreamer? (
media-libs/gstreamer:0.10
- media-libs/gst-plugins-base:0.10 )
+ >=media-libs/gst-plugins-base-0.10.11:0.10 )
pango? ( x11-libs/pango )
!pango? (
media-libs/freetype:2
@@ -55,6 +56,13 @@ src_prepare() {
rm -v autotools/lt* autotools/libtool.m4 || die "removing libtool macros failed"
# Don't force -O2
sed -i 's/-O2//g' "${S}"/configure.ac || die "sed failed"
+
+ # Reduce the gnome-keyring requirement from 2.26 to 2.22.3:
+ # Upstream requires so new version only because earlier versions didn't install headers
+ # that can be included from C++ code. We now have fixes to the headers in our
+ # gnome-keyring-2.22.3-r2, so we can work with just that if we reduce req in configure.
+ epatch "${FILESDIR}/${P}-reduce-gnome-keyring-req.patch"
+
# Prevent maintainer mode from being triggered during make
AT_M4DIR=autotools eautoreconf
}