diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2013-04-30 16:55:38 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2013-04-30 16:55:38 +0000 |
| commit | 806f978b0cd5a4559563b239ab516d8e9d547d5f (patch) | |
| tree | 3dc11190d75ff5827091e57685d797ed23ed546e /net-libs | |
| parent | gnome-extra/zeitgeist: Add bashcompletion (diff) | |
| download | gentoo-2-806f978b0cd5a4559563b239ab516d8e9d547d5f.tar.gz gentoo-2-806f978b0cd5a4559563b239ab516d8e9d547d5f.tar.bz2 gentoo-2-806f978b0cd5a4559563b239ab516d8e9d547d5f.zip | |
net-libs/webkit-gtk: Add compatibility for sys-devel/automake-1.13.1, #467244, thanks Lee Trager for the patch
(Portage version: 2.2.0_alpha173/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'net-libs')
| -rw-r--r-- | net-libs/webkit-gtk/ChangeLog | 7 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/metadata.xml | 14 | ||||
| -rw-r--r-- | net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild | 6 |
3 files changed, 18 insertions, 9 deletions
diff --git a/net-libs/webkit-gtk/ChangeLog b/net-libs/webkit-gtk/ChangeLog index 8cf5cc339b12..33badc6a7bca 100644 --- a/net-libs/webkit-gtk/ChangeLog +++ b/net-libs/webkit-gtk/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-libs/webkit-gtk # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.199 2013/04/27 12:23:02 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/ChangeLog,v 1.200 2013/04/30 16:55:38 jlec Exp $ + + 30 Apr 2013; Justin Lecher <jlec@gentoo.org> webkit-gtk-1.10.2-r300.ebuild, + metadata.xml: + Add compatibility for sys-devel/automake-1.13.1, #467244, thanks Lee Trager + for the patch *webkit-gtk-2.0.1 (27 Apr 2013) diff --git a/net-libs/webkit-gtk/metadata.xml b/net-libs/webkit-gtk/metadata.xml index 0637188c76e4..b0ea152e860b 100644 --- a/net-libs/webkit-gtk/metadata.xml +++ b/net-libs/webkit-gtk/metadata.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <herd>gnome</herd> - <use> - <flag name="coverage">Enable code coverage support</flag> - <flag name="geoloc">Enable geolocation support through + <herd>gnome</herd> + <use> + <flag name="coverage">Enable code coverage support</flag> + <flag name="geoloc">Enable geolocation support through <pkg>app-misc/geoclue</pkg></flag> - <flag name="webgl">Build support for the WebGL HTML API using + <flag name="webgl">Build support for the WebGL HTML API using <pkg>virtual/opengl</pkg></flag> - <flag name="webkit2">Enable WebKit2 API that splits web content rendering + <flag name="webkit2">Enable WebKit2 API that splits web content rendering and application UI into separate processes</flag> - </use> + </use> </pkgmetadata> diff --git a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild index 73ef4b23a5c7..340ee1f36613 100644 --- a/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild +++ b/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 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.10.2-r300.ebuild,v 1.5 2013/01/29 12:36:39 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.10.2-r300.ebuild,v 1.6 2013/04/30 16:55:38 jlec Exp $ EAPI="5" @@ -162,6 +162,10 @@ src_prepare() { # Respect CC, otherwise fails on prefix #395875 tc-export CC + # AM_PROG_CC_STDC is obsolete with sys-devel/automake-1.13.1, #467244 + sed -i -e 's/AM_PROG_CC_STDC/AM_PROG_CC/g' aclocal.m4 || die + sed -i -e '/AM_PROG_CC_STDC/d' configure.ac || die + # Prevent maintainer mode from being triggered during make AT_M4DIR=Source/autotools eautoreconf |