summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'www-client')
-rw-r--r--www-client/epiphany-extensions/ChangeLog15
-rw-r--r--www-client/epiphany-extensions/Manifest19
-rw-r--r--www-client/epiphany-extensions/epiphany-extensions-2.26.1-r1.ebuild4
-rw-r--r--www-client/epiphany-extensions/epiphany-extensions-2.32.0.ebuild (renamed from www-client/epiphany-extensions/epiphany-extensions-2.28.1-r2.ebuild)42
-rw-r--r--www-client/epiphany-extensions/files/epiphany-extensions-2.28.1-auto-scroller-broken.patch115
5 files changed, 47 insertions, 148 deletions
diff --git a/www-client/epiphany-extensions/ChangeLog b/www-client/epiphany-extensions/ChangeLog
index 695316cc6d4e..d09dc274cf40 100644
--- a/www-client/epiphany-extensions/ChangeLog
+++ b/www-client/epiphany-extensions/ChangeLog
@@ -1,6 +1,19 @@
# ChangeLog for www-client/epiphany-extensions
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.136 2010/10/17 15:39:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/ChangeLog,v 1.137 2010/10/29 21:17:08 pacho Exp $
+
+*epiphany-extensions-2.32.0 (29 Oct 2010)
+
+ 29 Oct 2010; Pacho Ramos <pacho@gentoo.org>
+ epiphany-extensions-2.26.1-r1.ebuild,
+ -epiphany-extensions-2.28.1-r2.ebuild,
+ -files/epiphany-extensions-2.28.1-auto-scroller-broken.patch,
+ +epiphany-extensions-2.32.0.ebuild:
+ Version bump for Gnome 2.32: Remove deprecated GTK+ symbols, update
+ html5tube extension to handle the latest youtube layout changes. Let it
+ build when having python3 as default interpreter. Pass
+ --disable-maintainer-mode to 2.26 since it is still needed for ppc64.
+ Remove old testing.
17 Oct 2010; Raúl Porcel <armin76@gentoo.org>
epiphany-extensions-2.30.1.ebuild:
diff --git a/www-client/epiphany-extensions/Manifest b/www-client/epiphany-extensions/Manifest
index 22163a845582..2a74d55e9f63 100644
--- a/www-client/epiphany-extensions/Manifest
+++ b/www-client/epiphany-extensions/Manifest
@@ -1,13 +1,22 @@
-AUX epiphany-extensions-2.28.1-auto-scroller-broken.patch 3424 RMD160 f423c2d682923e4d208802c28d4f849eaec3ae0c SHA1 d8791350efa7fa37a8fb6685064597e6039ecc2e SHA256 04f0b9b3c7273b36ed484f05133212b706ab2b9659e73972e0815ce5cdfb927e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX epiphany-extensions-2.30.1-fix-es_ES.patch 4792 RMD160 47b5f80b0cfafba3b57877bbeb17d7798e86cd78 SHA1 6c73ee8fbfc5ab8871470cfa7065ca7c11d87666 SHA256 a2a8a073c2092cfdb1ecb82e6591109657a35f844553cef27bf5a91545679346
DIST epiphany-extensions-2.21.92-sessionsaver-v4.patch.gz 10019 RMD160 c0d06082be2b999d59a0b8faf7e70984a3ebd58b SHA1 1ddb28c1a724fd8e5a5d91bc6f53b47e12944bc4 SHA256 74f585a6530d3212f69f140f5f7eee52d786745c1c8cf76f65f13a01da1ac0a2
DIST epiphany-extensions-2.26.1.tar.bz2 1025146 RMD160 cec5fe817f088741fea6bcb9625a35aa1ab966e6 SHA1 55584734bf9931d5e75761f046f1bcd8224494cc SHA256 928b444783332fefb4abccd98827aa3fabd8e7279e2fe0400019dcbab9ea072c
-DIST epiphany-extensions-2.28.1.tar.bz2 1389667 RMD160 6f4f1bae74918211f820828a69b6c43a8d00dccf SHA1 9bd08585b3e0937e40f77019797f7ec2a3dca150 SHA256 0f14413316ebbdba392c9df7468d0d08811376ee26c735d7e523fc4eba44572a
DIST epiphany-extensions-2.30.1.tar.bz2 1565963 RMD160 47fec6abc2afc771282e9e80751e7cdca665f751 SHA1 b6ac443ab9fcf82dab53518a4af2f43828fd781a SHA256 2f91b34e5854df382bb30bf93ae469490a5321d1ad006ff45032e3127eddb63d
DIST epiphany-extensions-2.30.2.tar.bz2 1565280 RMD160 4d96f8f180d861a00e4a7391a0cd1f45c0aef773 SHA1 e62bb53d17bf1ffc755c91061d4d8ea8eb880550 SHA256 bdd0aad473262f2ac780d34c09644d0dd0066cb01f2cc66b3d200b946fd2db27
-EBUILD epiphany-extensions-2.26.1-r1.ebuild 2753 RMD160 27bdcd739e788156acfc3be89eb9094e38513bc6 SHA1 6d91806d11c8a4aca2b6a79817f4eb886e8fffc4 SHA256 ebe8c84db570f4bb088f9769d153b253e80f7023bd21ff70d26e8a84fabca68e
-EBUILD epiphany-extensions-2.28.1-r2.ebuild 2383 RMD160 27df16e7d85dd6e2507c2e144efcd4a0013ad497 SHA1 58f43853ee873e5aabd31b7bb9bbbe426ec6ce26 SHA256 8fe37450af8d5220492345d7af178f77b8d109c83185eb291cc25fbe62084633
+DIST epiphany-extensions-2.32.0.tar.bz2 1045984 RMD160 f4ff2a8b937486e8d5ac8571c52b1c8f34e9516e SHA1 20541ea312d1860886a8d377f26779a9bbc99ca6 SHA256 1d6ac9f24050f409812a1653156033c6c005c27bc590f2a54164715771a1e16e
+EBUILD epiphany-extensions-2.26.1-r1.ebuild 2781 RMD160 e7c6cae8fc90aeafcc8daf51215885dc49f211b0 SHA1 407010dfd9afeba34f7874707acb5feb3266d9d0 SHA256 3dec598c1e6045a1f29572d6dabe4c5ecd5423c27650c29f487f0f4c35c52024
EBUILD epiphany-extensions-2.30.1.ebuild 2074 RMD160 d16d81a5697b5ff9a1104afe5c37f7e84db5391e SHA1 da31ddb502164869219a7978cd4c0a66cb841dd8 SHA256 dfa9739d8b837bd760b0b821794d47ff7681c46145f49f9e011a96aa7d25542a
EBUILD epiphany-extensions-2.30.2.ebuild 1931 RMD160 670b45a3dcac92c2d0de50f373d03cc6e2594c85 SHA1 231c50b4052b5c3c2d2ddca1292c709b9afe2ebb SHA256 ff89221d43c78bd4eef348824c6e03d722cdbfe332609c60e43e5bf658ed6e74
-MISC ChangeLog 23155 RMD160 13d5a357ae2bfd28b2f6f7cbb8ded0da86fb44d0 SHA1 53bdc95e1c6d759465484ccc25cc7bf84eec182d SHA256 8956d756fdf3bf78d294bbcf5649e44d25f93d56b011d119d0d2fe3219762c26
+EBUILD epiphany-extensions-2.32.0.ebuild 2011 RMD160 d822beee28a600f0d032271d7cfd578fa00fb12f SHA1 bed64886aff968ecf82b9d4094181d6a27c3abe7 SHA256 5d45d781047db4ef0671ecd82bbf8b70cf376900d28c2d09ca528b045563e3c2
+MISC ChangeLog 23721 RMD160 9169c5214fd3760a1d009e03e364f64fd63e9253 SHA1 2d8823e5c77c9bc69b920650d1af3b81a0f8424d SHA256 5122dffbcfec26864a416be4fae219d84d6bb0536468d1450e94a4c6156a5b3e
MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkzLOdoACgkQCaWpQKGI+9S4wQCffz72PEkSe2nZ8c9uUqcBqq+y
+YL0An3Fepr9+kgd1goiDTssk6NpGZsqs
+=t1WJ
+-----END PGP SIGNATURE-----
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.26.1-r1.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.26.1-r1.ebuild
index 020d690b65f1..6458bee7a515 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-2.26.1-r1.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.26.1-r1.ebuild
@@ -1,6 +1,6 @@
# 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.26.1-r1.ebuild,v 1.7 2010/07/20 15:46:36 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.26.1-r1.ebuild,v 1.8 2010/10/29 21:17:08 pacho Exp $
EAPI="2"
@@ -59,7 +59,7 @@ pkg_setup() {
G2CONF="${G2CONF} --with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
- G2CONF="${G2CONF} --with-gecko=libxul-embedding"
+ G2CONF="${G2CONF} --with-gecko=libxul-embedding --disable-maintainer-mode"
}
src_prepare() {
diff --git a/www-client/epiphany-extensions/epiphany-extensions-2.28.1-r2.ebuild b/www-client/epiphany-extensions/epiphany-extensions-2.32.0.ebuild
index 69bf7dbcd356..4ab5e589093c 100644
--- a/www-client/epiphany-extensions/epiphany-extensions-2.28.1-r2.ebuild
+++ b/www-client/epiphany-extensions/epiphany-extensions-2.32.0.ebuild
@@ -1,12 +1,12 @@
# 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-r2.ebuild,v 1.2 2010/05/29 17:41:57 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/epiphany-extensions/epiphany-extensions-2.32.0.ebuild,v 1.1 2010/10/29 21:17:08 pacho Exp $
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
+PYTHON_DEPEND="2"
-inherit gnome2 eutils versionator
-
-MY_MAJORV=$(get_version_component_range 1-2)
+inherit gnome2 python
DESCRIPTION="Extensions for the Epiphany web browser"
HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
@@ -14,19 +14,18 @@ HOMEPAGE="http://www.gnome.org/projects/epiphany/extensions.html"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
-IUSE="dbus examples"
+IUSE="dbus examples pcre"
-RDEPEND=">=www-client/epiphany-${MY_MAJORV}
+RDEPEND=">=www-client/epiphany-2.30.0
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
+ >=x11-libs/gtk+-2.21.6
>=net-libs/webkit-gtk-1.1
- dbus? ( >=dev-libs/dbus-glib-0.34 )"
-# pcre? ( >=dev-libs/libpcre-3.9-r2 )"
+ 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
@@ -34,43 +33,36 @@ DEPEND="${RDEPEND}
# 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 )
-# FIXME: - greasemonkey ( https://bugzilla.gnome.org/show_bug.cgi?id=598434 )
pkg_setup() {
local extensions=""
-
extensions="actions auto-reload auto-scroller certificates \
- error-viewer extensions-manager-ui \
+ error-viewer extensions-manager-ui gestures html5tube \
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 pcre && extensions="${extensions} greasemonkey"
use examples && extensions="${extensions} sample"
G2CONF="${G2CONF}
--disable-maintainer-mode
--with-extensions=$(echo "${extensions}" | sed -e 's/[[:space:]]\+/,/g')"
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ python_set_active_version 2
}
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"
+ python_convert_shebangs -r 2 .
}
src_install() {
gnome2_src_install
- find "${D}" -name "*.la" -delete || die "remove of la files failed"
+ find "${ED}" -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
deleted file mode 100644
index bc048d5fcabd..000000000000
--- a/www-client/epiphany-extensions/files/epiphany-extensions-2.28.1-auto-scroller-broken.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-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