Hello community, here is the log from the commit of package epiphany-extensions for openSUSE:Factory checked in at Wed Dec 30 00:14:40 CET 2009. -------- --- GNOME/epiphany-extensions/epiphany-extensions.changes 2009-12-04 20:00:46.000000000 +0100 +++ /mounts/work_src_done/STABLE/epiphany-extensions/epiphany-extensions.changes 2009-12-24 20:44:23.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Dec 24 12:20:18 CET 2009 - vuntz@opensuse.org + +- Add epiphany-extensions-api-change.patch to fix build with latest + epiphany. +- Add gnome-common BuildRequires, needed by the patch. +- Version the Provides/Obsoletes of epiphany-plugins to avoid a + rpmlint warning. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- epiphany-extensions-api-change.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany-extensions.spec ++++++ --- /var/tmp/diff_new_pack.X5DvM3/_old 2009-12-30 00:14:31.000000000 +0100 +++ /var/tmp/diff_new_pack.X5DvM3/_new 2009-12-30 00:14:31.000000000 +0100 @@ -19,14 +19,16 @@ Name: epiphany-extensions Version: 2.28.1 -Release: 1 +Release: 2 License: GPLv2+ ; LGPLv2.1+ Summary: Extensions Collection for Epiphany Url: http://www.gnome.org/projects/epiphany/ Group: Productivity/Networking/Web/Browsers Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.20/%{name}-%{version}.tar.bz2 +# PATCH-FIX-UPSTREAM epiphany-extensions-api-change.patch vuntz@opensuse.org -- Taken from git +Patch0: epiphany-extensions-api-change.patch %define lang_version 2.28 -%define major_version 2.28 +%define major_version 2.29 BuildRequires: dbus-1-glib-devel BuildRequires: epiphany BuildRequires: epiphany-devel >= 2.27.0 @@ -40,10 +42,12 @@ BuildRequires: libxml2-python BuildRequires: opensp-devel BuildRequires: translation-update-upstream +# Needed for Patch0 - epiphany-extensions-api-change.patch +BuildRequires: gnome-common Requires: %{name}-lang = %{version} Supplements: epiphany -Provides: epiphany-plugins -Obsoletes: epiphany-plugins +Provides: epiphany-plugins = %{version} +Obsoletes: epiphany-plugins < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -54,6 +58,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build %configure \ ++++++ epiphany-extensions-api-change.patch ++++++
From 2ec26ba89d23a8ff5e84139fffafb3e763ec3668 Mon Sep 17 00:00:00 2001 From: Xan Lopez
Date: Tue, 22 Sep 2009 10:28:23 +0000 Subject: Fix some extensions to work with the new WebKitHitTestResult
I've blacklisted sidebar and gestures, which need a bit of major surgery to come back to life. Bug #594486 is fixed with this. --- diff --git a/configure.ac b/configure.ac index b634136..6348370 100644 --- a/configure.ac +++ b/configure.ac @@ -172,8 +172,8 @@ AM_CONDITIONAL([HAVE_OPENSP],[test "x$enable_opensp" = "xyes"]) AC_MSG_CHECKING([which extensions to build]) ALL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui gestures greasemonkey java-console livehttpheaders page-info permissions push-scroller rss sample select-stylesheet sidebar smart-bookmarks soup-fly tab-groups tab-states" -USEFUL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui gestures java-console page-info push-scroller select-stylesheet sidebar smart-bookmarks soup-fly tab-groups tab-states" -DEFAULT_EXTENSIONS="actions adblock auto-scroller certificates error-viewer extensions-manager-ui gestures java-console page-info push-scroller select-stylesheet sidebar smart-bookmarks soup-fly tab-groups tab-states greasemonkey" +USEFUL_EXTENSIONS="actions adblock auto-reload auto-scroller certificates error-viewer extensions-manager-ui java-console page-info push-scroller select-stylesheet smart-bookmarks soup-fly tab-groups tab-states" +DEFAULT_EXTENSIONS="actions adblock auto-scroller certificates error-viewer extensions-manager-ui java-console page-info push-scroller select-stylesheet smart-bookmarks soup-fly tab-groups tab-states greasemonkey" MOZILLA_ALL_EXTENSIONS="error-viewer java-console livehttpheaders page-info select-stylesheet smart-bookmarks" diff --git a/extensions/actions/ephy-actions-extension.c b/extensions/actions/ephy-actions-extension.c index b141e13..5517e6f 100644 --- a/extensions/actions/ephy-actions-extension.c +++ b/extensions/actions/ephy-actions-extension.c @@ -8,7 +8,7 @@ * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License @@ -64,9 +64,9 @@ typedef struct typedef struct { EphyNode *node; - gboolean apply_to_image; + gboolean apply_to_image; gboolean apply_to_page; - EphyEmbedEventContext context; + guint context; } ActionData; enum @@ -369,7 +369,7 @@ ephy_actions_extension_add_action (EphyWindow *window, action_data->node = action; action_data->apply_to_page = apply_to_page; action_data->apply_to_image = apply_to_image; - action_data->context = EPHY_EMBED_CONTEXT_NONE; + action_data->context = WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT; if (callback) { @@ -453,7 +453,7 @@ ephy_actions_extension_run_action_on_embed_property (GtkAction *action, const char *property_name) { EphyEmbedEvent *event; - const GValue *value; + GValue value = { 0, }; g_return_if_fail (GTK_IS_ACTION (action)); g_return_if_fail (EPHY_IS_WINDOW (window)); @@ -462,16 +462,17 @@ ephy_actions_extension_run_action_on_embed_property (GtkAction *action, event = ephy_window_get_context_event (window); g_return_if_fail (event != NULL); - value = ephy_embed_event_get_property (event, property_name); + ephy_embed_event_get_property (event, property_name, &value); ephy_actions_extension_run_action (action, window, - g_value_get_string (value)); + g_value_get_string (&value)); + g_value_unset (&value); } static void ephy_actions_extension_document_popup_cb (GtkAction *action, EphyWindow *window) { - EphyEmbedEventContext context; + guint context; EphyEmbed *embed; char *url; ActionData *action_data; @@ -481,18 +482,18 @@ ephy_actions_extension_document_popup_cb (GtkAction *action, context = action_data->context; - if (context & EPHY_EMBED_CONTEXT_IMAGE) + if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE) { ephy_actions_extension_run_action_on_embed_property (action, window, - "image"); + "image-uri"); return; } - if (context & EPHY_EMBED_CONTEXT_LINK) + if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK) { ephy_actions_extension_run_action_on_embed_property (action, window, - "link"); + "link-uri"); return; } @@ -750,17 +751,23 @@ ephy_actions_extension_get_actions (EphyActionsExtension *extension) static gboolean ephy_actions_extension_context_menu_cb (EphyEmbed *embed, - EphyEmbedEvent *event, + GdkEventButton *event, EphyWindow *window) { - EphyEmbedEventContext context; + guint context; GList *actions, *l; WindowData *data; + WebKitHitTestResult *hit_test; + + if (event->button != 3) + return FALSE; data = g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY); g_return_val_if_fail (data != NULL, FALSE); - context = ephy_embed_event_get_context (event); + hit_test = webkit_web_view_get_hit_test_result (EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed), event); + g_object_get (hit_test, "context", &context, NULL); + g_object_unref (hit_test); actions = gtk_action_group_list_actions (data->user_action_group); for (l = actions; l != NULL; l = l->next) @@ -773,12 +780,12 @@ ephy_actions_extension_context_menu_cb (EphyEmbed *embed, action_data->context = context; - if (context & EPHY_EMBED_CONTEXT_IMAGE) + if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_IMAGE) { gtk_action_set_visible (action, action_data->apply_to_image); continue; } - if (context & EPHY_EMBED_CONTEXT_DOCUMENT) + if (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_DOCUMENT) { gtk_action_set_visible (action, action_data->apply_to_page); continue; @@ -798,7 +805,7 @@ ephy_actions_extension_attach_tab (EphyExtension *extension, { g_return_if_fail (EPHY_IS_EMBED (embed)); - g_signal_connect (embed, "ge_context_menu", + g_signal_connect (embed, "button-press-event", G_CALLBACK (ephy_actions_extension_context_menu_cb), window); } diff --git a/extensions/push-scroller/ephy-push-scroller-extension.c b/extensions/push-scroller/ephy-push-scroller-extension.c index d87b653..4843381 100644 --- a/extensions/push-scroller/ephy-push-scroller-extension.c +++ b/extensions/push-scroller/ephy-push-scroller-extension.c @@ -57,20 +57,23 @@ ensure_push_scroller (EphyWindow *window) static gboolean dom_mouse_down_cb (EphyWebView *view, - EphyEmbedEvent *event, + GdkEventButton *event, EphyWindow *window) { EphyPushScroller *scroller; EphyEmbed *embed; - EphyEmbedEventContext context; + guint context; guint button, x, y; + WebKitHitTestResult *hit_test; - embed = gtk_widget_get_parent (GTK_WIDGET (view)); - button = ephy_embed_event_get_button (event); - context = ephy_embed_event_get_context (event); + embed = EPHY_EMBED (gtk_widget_get_parent (GTK_WIDGET (view))); + 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; } @@ -78,7 +81,8 @@ dom_mouse_down_cb (EphyWebView *view, scroller = ensure_push_scroller (window); g_return_val_if_fail (scroller != NULL, FALSE); - ephy_embed_event_get_coords (event, &x, &y); + x = (guint)event->x; + y = (guint)event->y; ephy_push_scroller_start (scroller, embed, x, y); return TRUE; @@ -101,7 +105,7 @@ impl_attach_tab (EphyExtension *ext, g_return_if_fail (embed != NULL); g_signal_connect_object (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), - "ge-dom-mouse-down", + "button-press-event", G_CALLBACK (dom_mouse_down_cb), window, 0); } -- cgit v0.8.3.1
From ce17a751c3fe20042945473c43ba2fe6bf78940a Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Silva
Date: Sat, 19 Dec 2009 17:17:33 +0000 Subject: Adapt extensions to API changes in Epiphany
--- diff --git a/extensions/actions/ephy-actions-extension.c b/extensions/actions/ephy-actions-extension.c index 5517e6f..cc5c4c5 100644 --- a/extensions/actions/ephy-actions-extension.c +++ b/extensions/actions/ephy-actions-extension.c @@ -498,7 +498,7 @@ ephy_actions_extension_document_popup_cb (GtkAction *action, } embed = ephy_embed_container_get_active_child (EPHY_EMBED_CONTAINER (window)); - url = ephy_web_view_get_location (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), TRUE); + url = ephy_web_view_get_location (ephy_embed_get_web_view (embed), TRUE); ephy_actions_extension_run_action (action, window, url); g_free (url); } diff --git a/extensions/push-scroller/ephy-push-scroller-extension.c b/extensions/push-scroller/ephy-push-scroller-extension.c index 4843381..560aa00 100644 --- a/extensions/push-scroller/ephy-push-scroller-extension.c +++ b/extensions/push-scroller/ephy-push-scroller-extension.c @@ -104,7 +104,7 @@ impl_attach_tab (EphyExtension *ext, g_return_if_fail (embed != NULL); - g_signal_connect_object (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed), + g_signal_connect_object (ephy_embed_get_web_view (embed), "button-press-event", G_CALLBACK (dom_mouse_down_cb), window, 0); } @@ -119,7 +119,7 @@ impl_detach_tab (EphyExtension *ext, g_return_if_fail (embed != NULL); g_signal_handlers_disconnect_by_func - (EPHY_GET_EPHY_WEB_VIEW_FROM_EMBED (embed) + (ephy_embed_get_web_view (embed) , G_CALLBACK (dom_mouse_down_cb), window); } -- cgit v0.8.3.1
From 11c3810ce92fc3f6647614dcb91c21ef9a19425c Mon Sep 17 00:00:00 2001 From: Gustavo Noronha Silva
Date: Sat, 19 Dec 2009 19:02:21 +0000 Subject: Don't assume the EphyWebView has EphyEmbed as parent
--- diff --git a/extensions/push-scroller/ephy-push-scroller-extension.c b/extensions/push-scroller/ephy-push-scroller-extension.c index 560aa00..06de1e7 100644 --- a/extensions/push-scroller/ephy-push-scroller-extension.c +++ b/extensions/push-scroller/ephy-push-scroller-extension.c @@ -66,7 +66,7 @@ dom_mouse_down_cb (EphyWebView *view, guint button, x, y; WebKitHitTestResult *hit_test; - embed = EPHY_EMBED (gtk_widget_get_parent (GTK_WIDGET (view))); + embed = EPHY_EMBED (EPHY_GET_EMBED_FROM_EPHY_WEB_VIEW (GTK_WIDGET (view))); 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); -- cgit v0.8.3.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org