[gentoo-commits] proj/gnome:master commit in: net-libs/webkit-gtk/files/, net-libs/webkit-gtk/

[Priit Laes]

commit:     4cb3edcd961376016decf957f2823fb0c4b323ca
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Mon Nov 28 05:33:30 2011 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Mon Nov 28 05:33:30 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4cb3edcd

net-libs/webkit-gtk: Fix GTK2 build, add back 1.7.1

---
 .../files/webkit-gtk-1.7.2-fix-gtk2-build.patch    |   13 ++++++++++
 ....2-r200.ebuild => webkit-gtk-1.7.1-r200.ebuild} |    3 +-
 ....2-r200.ebuild => webkit-gtk-1.7.1-r300.ebuild} |   26 ++++++++++++-------
 net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild   |    1 +
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-gtk2-build.patch b/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-gtk2-build.patch
new file mode 100644
index 0000000..77718b4
--- /dev/null
+++ b/net-libs/webkit-gtk/files/webkit-gtk-1.7.2-fix-gtk2-build.patch
@@ -0,0 +1,13 @@
+diff -ur webkit-1.7.2.orig//Source/WebKit/gtk/tests/testatk.c webkit-1.7.2//Source/WebKit/gtk/tests/testatk.c
+--- webkit-1.7.2.orig//Source/WebKit/gtk/tests/testatk.c	2011-11-28 01:06:19.868230689 +0100
++++ webkit-1.7.2//Source/WebKit/gtk/tests/testatk.c	2011-11-28 01:45:56.214331937 +0100
+@@ -1686,7 +1686,9 @@
+     g_test_init(&argc, &argv, 0);
+     gtk_disable_setlocale();
+     setlocale(LC_ALL, "C");
++#ifndef GTK_API_VERSION_2
+     gdk_disable_multidevice();
++#endif
+     gtk_init(&argc, &argv);
+ }
+ 

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild
similarity index 97%
copy from net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
copy to net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild
index 4d7744b..3506b3c 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r200.ebuild
@@ -10,7 +10,7 @@ inherit autotools eutils flag-o-matic eutils python virtualx
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
 #SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
@@ -91,7 +91,6 @@ src_prepare() {
 
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
-	epatch "${FILESDIR}/${PN}-1.7.2-fix-webgl-build.patch"
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
similarity index 85%
copy from net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
copy to net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
index 4d7744b..80fa1b5 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.1-r300.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.6.1-r200.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/webkit-gtk/webkit-gtk-1.6.1-r300.ebuild,v 1.1 2011/09/30 13:52:33 nirbheek Exp $
 
 EAPI="4"
 
@@ -10,20 +10,22 @@ inherit autotools eutils flag-o-matic eutils python virtualx
 MY_P="webkit-${PV}"
 DESCRIPTION="Open source web browser engine"
 HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.xz"
+SRC_URI="http://www.webkitgtk.org/${MY_P}.tar.gz"
 #SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="LGPL-2 LGPL-2.1 BSD"
-SLOT="2"
+SLOT="3"
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
 # geoclue
-IUSE="aqua coverage debug +gstreamer +introspection +jit spell webgl"
+IUSE="aqua coverage debug doc +gstreamer +introspection +jit spell webgl"
 # bug 372493
 REQUIRED_USE="introspection? ( gstreamer )"
 
 # use sqlite, svg by default
 # dependency on >=x11-libs/gtk+-2.13:2 for gail
+# Aqua support in gtk3 is untested
+# gtk2 is needed for plugin process support
 RDEPEND="
 	dev-libs/libxml2:2
 	dev-libs/libxslt
@@ -31,7 +33,7 @@ RDEPEND="
 	>=media-libs/libpng-1.4:0
 	>=x11-libs/cairo-1.10
 	>=dev-libs/glib-2.27.90:2
-	>=x11-libs/gtk+-2.13:2[aqua=,introspection?]
+	>=x11-libs/gtk+-3.0:3[aqua=,introspection?]
 	>=dev-libs/icu-3.8.1-r1
 	>=net-libs/libsoup-2.33.6:2.4[introspection?]
 	dev-db/sqlite:3
@@ -56,6 +58,7 @@ DEPEND="${RDEPEND}
 	dev-util/gperf
 	dev-util/pkgconfig
 	dev-util/gtk-doc-am
+	doc? ( >=dev-util/gtk-doc-1.10 )
 	test? ( x11-themes/hicolor-icon-theme )
 "
 
@@ -91,7 +94,9 @@ src_prepare() {
 
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
-	epatch "${FILESDIR}/${PN}-1.7.2-fix-webgl-build.patch"
+
+	# Install docs on "make install" when USE=doc
+	epatch "${FILESDIR}/${PN}-1.7.1-install-docs.patch"
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf
@@ -110,22 +115,23 @@ src_configure() {
 	local myconf
 
 	# XXX: Check Web Audio support
-	# WebKit2 can only be built with gtk3
-	# API documentation (gtk-doc) is built in webkit-gtk:3, always disable here
+	# XXX: files for generating DerivedSources/WebKit2/* are missing, see
+	#      https://bugs.webkit.org/show_bug.cgi?id=66527
 	myconf="
 		$(use_enable coverage)
 		$(use_enable debug)
 		$(use_enable debug debug-features)
+		$(use_enable doc gtk-doc)
 		$(use_enable spell spellcheck)
 		$(use_enable introspection)
 		$(use_enable gstreamer video)
 		$(use_enable jit)
 		$(use_enable webgl)
 		--enable-web-sockets
-		--with-gtk=2.0
-		--disable-gtk-doc
+		--with-gtk=3.0
 		--disable-webkit2
 		$(use aqua && echo "--with-font-backend=pango --with-target=quartz")"
+		# Aqua support in gtk3 is untested
 
 	econf ${myconf}
 }

diff --git a/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild b/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
index 4d7744b..cba9d55 100644
--- a/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-1.7.2-r200.ebuild
@@ -92,6 +92,7 @@ src_prepare() {
 	# Required for webgl; https://bugs.webkit.org/show_bug.cgi?id=69085
 	mkdir -p DerivedSources/ANGLE
 	epatch "${FILESDIR}/${PN}-1.7.2-fix-webgl-build.patch"
+	epatch "${FILESDIR}/${P}-fix-gtk2-build.patch"
 
 	# Prevent maintainer mode from being triggered during make
 	AT_M4DIR=Source/autotools eautoreconf