Fix auto-scroller broken with middle click, per bug #294712. Patch imported from upstream bug #589560.

Package-Manager: portage-2.2_rc61/cvs/Linux x86_64

4 files changed, 203 insertions, 13 deletions

diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index dacec4cb707d..b09d4118d45f 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/epiphany-extensions
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.117 2009/10/29 21:40:50 eva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.118 2010/01/02 20:33:54 mrpouet Exp $
+
+*epiphany-extensions-2.28.1-r1 (02 Jan 2010)
+
+  02 Jan 2010; Romain Perier <mrpouet@gentoo.org>
+  +epiphany-extensions-2.28.1-r1.ebuild,
+  +files/epiphany-extensions-2.28.1-auto-scroller-broken.patch:
+  Fix auto-scroller broken with middle click, per bug #294712. Patch
+  imported from upstream bug #589560.
 
 *epiphany-extensions-2.28.1 (29 Oct 2009)
 
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index b38f6e1857ac..9a0f445437f0 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX epiphany-extensions-2.28.1-auto-scroller-broken.patch 3424 RMD160 f423c2d682923e4d208802c28d4f849eaec3ae0c SHA1 d8791350efa7fa37a8fb6685064597e6039ecc2e SHA256 04f0b9b3c7273b36ed484f05133212b706ab2b9659e73972e0815ce5cdfb927e
 DIST epiphany-extensions-2.21.92-sessionsaver-v4.patch.gz 10019 RMD160 c0d06082be2b999d59a0b8faf7e70984a3ebd58b SHA1 1ddb28c1a724fd8e5a5d91bc6f53b47e12944bc4 SHA256 74f585a6530d3212f69f140f5f7eee52d786745c1c8cf76f65f13a01da1ac0a2
 DIST epiphany-extensions-2.22.2.tar.bz2 947322 RMD160 586f26851a0fbc4c2664116a3e32596d3bd91188 SHA1 0dff50f48a14e01dc358fa484b218f6d6a7f5519 SHA256 de649d99d19c20d41d6c466ecbaa82a244679fcb0d2bf30ced8b340c4e2481d4
 DIST epiphany-extensions-2.24.3.tar.bz2 1024664 RMD160 180daf656fae89ffe4c3f734431da2edcdc54791 SHA1 39808988aa715aaa2d3f36213152abc6556bb9c6 SHA256 5356d972f32601359446860d49bb0adadea62461d9c02ec8187474a02640a87e
@@ -10,13 +8,7 @@ EBUILD epiphany-extensions-2.22.2.ebuild 2965 RMD160 386db923fab10cd6e852ad64550
 EBUILD epiphany-extensions-2.24.3-r10.ebuild 2700 RMD160 34b9d3112667f87c2316382f1678e61750d1aa77 SHA1 89d09d361ef1c930f42561fd730cb9216b9b6352 SHA256 f0106bc7c0c985065ec9874f19c49cd7c6099dd3968b32f16bb85d5490d2925f
 EBUILD epiphany-extensions-2.24.3.ebuild 3046 RMD160 b0cec6b50b97cb05bc8e31e53c82e416698bbc19 SHA1 af998a0d29626b01dd1fd33b7f03bdbe6e9915ec SHA256 2c4105b2ee1660e7e91c81caab300e88316f01c08d1dde5c51ac3498356f8dad
 EBUILD epiphany-extensions-2.26.1.ebuild 2681 RMD160 f7b55292e0f7de58563d246da1a67534db8d1ac7 SHA1 7bd424509038bcf51c6574b383aef40f6839241a SHA256 dc881adc551cc37e5b51b57bd2d16328e5ab19e1f89e7ff28c8abc73dded5637
+EBUILD epiphany-extensions-2.28.1-r1.ebuild 2285 RMD160 c9373db4fd7fbd03ff04e0a36eab526417e04c9d SHA1 44b90faadffdf80bf9db0970a73974c232d6e510 SHA256 1cddbf162e2a3725b0abf093b3e8297a97c3e01f0dd9109bca911e327bb17018
 EBUILD epiphany-extensions-2.28.1.ebuild 2077 RMD160 76f180a9a7bc2eaa27dbc34226b75e3f1a455e8a SHA1 0489576da42d0e0d7769bde88fb17b8a5180c88b SHA256 398ec736b5d604c85b45242a78f1980755df45e7d6a7fd7cee6841d44da64cae
-MISC ChangeLog 20002 RMD160 4c3a52a3f8fd70fad51915ecdbeca4382403e236 SHA1 dcc0db449e7a1d9a9d3cc9f3822c97923ee02396 SHA256 72ae1e08659b9ebf99a9d6faa61407e1b672812ca036b366b58fd694d2768891
+MISC ChangeLog 20315 RMD160 2fff2679990ca96ec979bdb4b70bc144347fdf18 SHA1 d895f32cfe1bb090bd8428e9a2f7bd95fc42518d SHA256 ca4fa3b80b58c923f3e6176f5e681f77256fb6d7b29134fe8e7fdb115d5119e6
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrqC+gACgkQ1fmVwcYIWAYgngCg4gszntfcYMCa4gcAtPdSV6p6
-w3kAoKtpzW0HFWRxPTdv0YQI6rGSif9C
-=l9W7
------END PGP SIGNATURE-----
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.28.1-r1.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.28.1-r1.ebuild
new file mode 100644
index 000000000000..fe9c6a8f0608
--- /dev/null
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.28.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.28.1-r1.ebuild,v 1.1 2010/01/02 20:33:54 mrpouet Exp $
+
+EAPI="2"
+
+inherit gnome2 eutils versionator
+
+MY_MAJORV=$(get_version_component_range 1-2)
+
+DESCRIPTION="Extensions for the Epiphany web browser"
+HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="dbus examples pcre"
+
+RDEPEND=">=www-client/epiphany-${MY_MAJORV}
+	app-text/opensp
+	>=dev-libs/glib-2.15.5
+	>=gnome-base/gconf-2.0
+	>=dev-libs/libxml2-2.6
+	>=x11-libs/gtk+-2.12.0
+	>=gnome-base/libglade-2
+	>=net-libs/webkit-gtk-1.1
+
+	dbus? ( >=dev-libs/dbus-glib-0.34 )
+	pcre? ( >=dev-libs/libpcre-3.9-r2 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.20
+	>=app-text/gnome-doc-utils-0.3.2"
+# eautoreconf dependencies:
+#	  gnome-base/gnome-common
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+# FIXME: Open security issues:
+# FIXME: - adblock        ( https://bugzilla.gnome.org/show_bug.cgi?id=595255 )
+# FIXME: broken extensions:
+# FIXME: - gestures       ( https://bugzilla.gnome.org/show_bug.cgi?id=563099 )
+# FIXME: - session-saver  ( https://bugzilla.gnome.org/show_bug.cgi?id=316245 )
+# FIXME: - sidebar: hangs ( https://bugzilla.gnome.org/show_bug.cgi?id=594481 )
+
+pkg_setup() {
+	local extensions=""
+
+	extensions="actions auto-reload auto-scroller certificates \
+			   error-viewer extensions-manager-ui \
+			   java-console livehttpheaders page-info permissions \
+			   push-scroller select-stylesheet \
+			   smart-bookmarks soup-fly tab-groups tab-states"
+	use dbus && extensions="${extensions} rss"
+
+	use pcre && extensions="${extensions} greasemonkey"
+
+	use examples && extensions="${extensions} sample"
+
+	G2CONF="${G2CONF}
+		--disable-maintainer-mode
+		--with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+	# auto-scroller is broken and makes middle click be unable to open links in new tabs,
+	# bug 294712
+	epatch "${FILESDIR}/${P}-auto-scroller-broken.patch"
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
diff --git a/www-client/epiphany-extensions/files/epiphany-extensions-2.28.1-auto-scroller-broken.patch b/www-client/epiphany-extensions/files/epiphany-extensions-2.28.1-auto-scroller-broken.patch
new file mode 100644
index 000000000000..bc048d5fcabd
--- /dev/null
+++ b/www-client/epiphany-extensions/files/epiphany-extensions-2.28.1-auto-scroller-broken.patch
@@ -0,0 +1,115 @@
+From c3584c630ac8ec80288f56bdb3ecc350b533d07e Mon Sep 17 00:00:00 2001
+From: Xan Lopez <xan@gnome.org>
+Date: Tue, 22 Sep 2009 10:43:09 +0000
+Subject: Fix auto-scroller extension to use the new WebKitHitTestResult stuff
+
+Upstream Bug #589560,#600140
+Dowstream Bug #294712
+
+---
+diff --git a/extensions/auto-scroller/ephy-auto-scroller-extension.c b/extensions/auto-scroller/ephy-auto-scroller-extension.c
+index 188cc44..f6c54fa 100644
+--- a/extensions/auto-scroller/ephy-auto-scroller-extension.c
++++ b/extensions/auto-scroller/ephy-auto-scroller-extension.c
+@@ -55,21 +55,23 @@ ensure_auto_scroller (EphyWindow *window)
+ 	return scroller;
+ }
+ 
+-#if 0
+ static gboolean
+-dom_mouse_down_cb (EphyEmbed *embed,
+-		   EphyEmbedEvent *event,
++dom_mouse_down_cb (EphyWebView *view,
++		   GdkEventButton *event,
+ 		   EphyWindow *window)
+ {
+ 	EphyAutoScroller *scroller;
+-	EphyEmbedEventContext context;
++	guint context;
+ 	guint button, x, y;
++        WebKitHitTestResult *hit_test;
+ 
+-	button = ephy_embed_event_get_button (event);
+-	context = ephy_embed_event_get_context (event);
++	button = event->button;
++	hit_test = webkit_web_view_get_hit_test_result (WEBKIT_WEB_VIEW (view), event);
++	g_object_get (hit_test, "context", &context, NULL);
++	g_object_unref (hit_test);
+ 
+-	if (button != 2 || (context & EPHY_EMBED_CONTEXT_INPUT) ||
+-	    (context & EPHY_EMBED_CONTEXT_LINK))
++	if (button != 2 || (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE) ||
++	    (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK))
+ 	{
+ 		return FALSE;
+ 	}
+@@ -77,31 +79,9 @@ dom_mouse_down_cb (EphyEmbed *embed,
+ 	scroller = ensure_auto_scroller (window);
+ 	g_return_val_if_fail (scroller != NULL, FALSE);
+ 
+-	ephy_embed_event_get_coords (event, &x, &y);
+-	ephy_auto_scroller_start (scroller, embed, x, y);
+-
+-	return TRUE;
+-}
+-#endif
+-
+-static gboolean
+-button_press_cb (GtkWidget *widget,
+-		 GdkEventButton *event,
+-		 EphyWindow *window)
+-{
+-	EphyAutoScroller *scroller;
+-	EphyEmbed *embed = (EphyEmbed*) gtk_widget_get_parent (widget);
+-
+-	// FIXME: This will swallow middle clicks on inputs and links.
+-	if (event->button != 2)
+-	{
+-		return FALSE;
+-	}
+-
+-	scroller = ensure_auto_scroller (window);
+-	g_return_val_if_fail (scroller != NULL, FALSE);
+-
+-	ephy_auto_scroller_start (scroller, embed, event->x_root, event->y_root);
++	x = (guint)event->x_root;
++	y = (guint)event->y_root;
++	ephy_auto_scroller_start (scroller, EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW (view), x, y);
+ 
+ 	return TRUE;
+ }
+@@ -123,14 +103,9 @@ impl_attach_tab (EphyExtension *ext,
+ 
+ 	g_return_if_fail (embed != NULL);
+ 
+-#if 0
+-	g_signal_connect_object (embed, "ge-dom-mouse-down",
+-				 G_CALLBACK (dom_mouse_down_cb), window, 0);
+-#endif
+-
+ 	web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
+-	g_signal_connect_object (web_view, "button_press_event",
+-				 G_CALLBACK (button_press_cb), window, 0);
++	g_signal_connect_object (web_view, "button-press-event",
++				 G_CALLBACK (dom_mouse_down_cb), window, 0);
+ }
+ 
+ static void
+@@ -143,14 +118,9 @@ impl_detach_tab (EphyExtension *ext,
+ 
+ 	g_return_if_fail (embed != NULL);
+ 
+-#if 0
+-	g_signal_handlers_disconnect_by_func
+-		(embed, G_CALLBACK (dom_mouse_down_cb), window);
+-#endif
+-
+ 	web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
+ 	g_signal_handlers_disconnect_by_func
+-		(web_view, G_CALLBACK (button_press_cb), window);
++		(web_view, G_CALLBACK (dom_mouse_down_cb), window);
+ }
+ 
+ static void
+--
+cgit v0.8.3.1