r22242 - in /packages/unstable/epiphany-extensions/debian: changelog control control.in patches/01_epiphany-2.29.patch patches/02_disable-sidebar.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Fri Nov 6 10:01:47 UTC 2009
Author: slomo
Date: Fri Nov 6 10:01:46 2009
New Revision: 22242
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22242
Log:
* debian/control.in,
debian/patches/01_epiphany-2.29.patch:
+ Rebuild against epiphany 2.29.1.
* debian/patches/02_disable-sidebar.patch:
+ Disable sidebar extension for now, porting it is not trivial.
Added:
packages/unstable/epiphany-extensions/debian/patches/01_epiphany-2.29.patch
packages/unstable/epiphany-extensions/debian/patches/02_disable-sidebar.patch
Modified:
packages/unstable/epiphany-extensions/debian/changelog
packages/unstable/epiphany-extensions/debian/control
packages/unstable/epiphany-extensions/debian/control.in
Modified: packages/unstable/epiphany-extensions/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/changelog?rev=22242&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions/debian/changelog [utf-8] (original)
+++ packages/unstable/epiphany-extensions/debian/changelog [utf-8] Fri Nov 6 10:01:46 2009
@@ -1,3 +1,13 @@
+epiphany-extensions (2.28.1-1+exp1) experimental; urgency=low
+
+ * debian/control.in,
+ debian/patches/01_epiphany-2.29.patch:
+ + Rebuild against epiphany 2.29.1.
+ * debian/patches/02_disable-sidebar.patch:
+ + Disable sidebar extension for now, porting it is not trivial.
+
+ -- Sebastian Dröge <slomo at debian.org> Fri, 06 Nov 2009 10:32:51 +0100
+
epiphany-extensions (2.28.1-1) unstable; urgency=low
* New upstream bugfix release.
Modified: packages/unstable/epiphany-extensions/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/control?rev=22242&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions/debian/control [utf-8] (original)
+++ packages/unstable/epiphany-extensions/debian/control [utf-8] Fri Nov 6 10:01:46 2009
@@ -11,7 +11,7 @@
libxml-parser-perl,
intltool (>= 0.35.0),
gnome-doc-utils (>= 0.3.2),
- epiphany-browser-dev (>= 2.28),
+ epiphany-browser-dev (>= 2.29),
libxml2-dev (>= 2.6.0),
libglib2.0-dev (>= 2.15.5),
libgtk2.0-dev (>= 2.11.6),
@@ -26,8 +26,8 @@
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- epiphany-browser (>= ${gnome:Version}),
- epiphany-browser (<< ${gnome:NextVersion}),
+ epiphany-browser (>= 2.29),
+ epiphany-browser (<< 2.31),
sgml-data,
w3c-dtd-xhtml,
Suggests: epiphany-extension-gwget
Modified: packages/unstable/epiphany-extensions/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/control.in?rev=22242&op=diff
==============================================================================
--- packages/unstable/epiphany-extensions/debian/control.in [utf-8] (original)
+++ packages/unstable/epiphany-extensions/debian/control.in [utf-8] Fri Nov 6 10:01:46 2009
@@ -11,7 +11,7 @@
libxml-parser-perl,
intltool (>= 0.35.0),
gnome-doc-utils (>= 0.3.2),
- epiphany-browser-dev (>= 2.28),
+ epiphany-browser-dev (>= 2.29),
libxml2-dev (>= 2.6.0),
libglib2.0-dev (>= 2.15.5),
libgtk2.0-dev (>= 2.11.6),
@@ -26,8 +26,8 @@
Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
- epiphany-browser (>= ${gnome:Version}),
- epiphany-browser (<< ${gnome:NextVersion}),
+ epiphany-browser (>= 2.29),
+ epiphany-browser (<< 2.31),
sgml-data,
w3c-dtd-xhtml,
Suggests: epiphany-extension-gwget
Added: packages/unstable/epiphany-extensions/debian/patches/01_epiphany-2.29.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/patches/01_epiphany-2.29.patch?rev=22242&op=file
==============================================================================
--- packages/unstable/epiphany-extensions/debian/patches/01_epiphany-2.29.patch (added)
+++ packages/unstable/epiphany-extensions/debian/patches/01_epiphany-2.29.patch [utf-8] Fri Nov 6 10:01:46 2009
@@ -1,0 +1,192 @@
+--- ../tmp/epiphany-extensions-2.28.1/extensions/actions/ephy-actions-extension.c 2009-09-30 14:49:41.000000000 +0200
++++ extensions/actions/ephy-actions-extension.c 2009-11-06 10:51:26.000000000 +0100
+@@ -66,7 +66,7 @@
+ EphyNode *node;
+ gboolean apply_to_image;
+ gboolean apply_to_page;
+- EphyEmbedEventContext context;
++ guint context;
+ } ActionData;
+
+ enum
+@@ -369,7 +369,7 @@
+ 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 = 0;
+
+ if (callback)
+ {
+@@ -453,7 +453,7 @@
+ 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 @@
+ 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,14 +482,14 @@
+
+ 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");
+ 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,
+@@ -753,7 +754,7 @@
+ EphyEmbedEvent *event,
+ EphyWindow *window)
+ {
+- EphyEmbedEventContext context;
++ guint context;
+ GList *actions, *l;
+ WindowData *data;
+
+@@ -773,12 +774,12 @@
+
+ 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;
+--- ../tmp/epiphany-extensions-2.28.1/extensions/gestures/ephy-gestures-extension.c 2009-09-22 12:27:03.000000000 +0200
++++ extensions/gestures/ephy-gestures-extension.c 2009-11-06 10:45:28.000000000 +0100
+@@ -273,7 +273,7 @@
+ EphyEmbedEvent *event,
+ EphyGesturesExtension *extension)
+ {
+- EphyEmbedEventContext context;
++ guint context;
+ guint button;
+ gint handled = FALSE;
+ EphyWindow *window;
+@@ -296,8 +296,8 @@
+ context = ephy_embed_event_get_context (event);
+
+ if (button == 2 &&
+- !((context & EPHY_EMBED_CONTEXT_INPUT) ||
+- (context & EPHY_EMBED_CONTEXT_LINK)))
++ !((context & WEBKIT_HIT_TEST_RESULT_CONTEXT_EDITABLE) ||
++ (context & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK)))
+ {
+ EphyGesture *gesture;
+
+--- ../tmp/epiphany-extensions-2.28.1/extensions/push-scroller/ephy-push-scroller-extension.c 2009-09-30 14:49:42.000000000 +0200
++++ extensions/push-scroller/ephy-push-scroller-extension.c 2009-11-06 10:48:05.000000000 +0100
+@@ -62,15 +62,15 @@
+ {
+ EphyPushScroller *scroller;
+ EphyEmbed *embed;
+- EphyEmbedEventContext context;
++ guint context;
+ guint button, x, y;
+
+ embed = gtk_widget_get_parent (GTK_WIDGET (view));
+ button = ephy_embed_event_get_button (event);
+ context = ephy_embed_event_get_context (event);
+
+- 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;
+ }
+--- ../tmp/epiphany-extensions-2.28.1/extensions/rss/ephy-rss-extension.c 2009-09-11 13:50:58.000000000 +0200
++++ extensions/rss/ephy-rss-extension.c 2009-11-06 10:50:37.000000000 +0100
+@@ -114,7 +114,7 @@
+ ephy_rss_feed_subscribe_cb (GtkAction *action,
+ EphyWindow *window)
+ {
+- const GValue *value;
++ GValue value = {0, };
+ GError *error = NULL;
+ EphyEmbedEvent *event;
+ gboolean success;
+@@ -127,10 +127,10 @@
+ event = ephy_window_get_context_event (window);
+ if (event == NULL) return;
+
+- value = ephy_embed_event_get_property (event, "link");
++ ephy_embed_event_get_property (event, "link", &value);
+
+ if (!dbus_g_proxy_call (extension->priv->proxy, RSS_DBUS_SUBSCRIBE, &error,
+- G_TYPE_STRING, g_value_get_string (value),
++ G_TYPE_STRING, g_value_get_string (&value),
+ G_TYPE_INVALID,
+ G_TYPE_BOOLEAN, &success,
+ G_TYPE_INVALID))
+@@ -138,6 +138,7 @@
+ LOG ("Error while retreiving method answer: %s", error->message);
+ g_error_free (error);
+ }
++ g_value_unset (&value);
+
+ g_object_set(action, "sensitive", FALSE, "visible", FALSE, NULL);
+ }
+@@ -148,20 +149,21 @@
+ EphyWindow *window)
+ {
+ WindowData *data;
+- const GValue *value;
++ GValue value;
+ const char *address;
+ FeedList *list;
+ gboolean active = FALSE;
+
+ list = (FeedList *) g_object_get_data (G_OBJECT (embed), FEEDLIST_DATA_KEY);
+- if ((ephy_embed_event_get_context (event) & EPHY_EMBED_CONTEXT_LINK) && (list != NULL))
++ if ((ephy_embed_event_get_context (event) & WEBKIT_HIT_TEST_RESULT_CONTEXT_LINK) && (list != NULL))
+ {
+ LOG ("Context menu on a link");
+ data = (WindowData *) g_object_get_data (G_OBJECT (window), WINDOW_DATA_KEY);
+ g_return_val_if_fail (data != NULL, FALSE);
+
+- value = ephy_embed_event_get_property (event, "link");
+- address = g_value_get_string (value);
++ ephy_embed_event_get_property (event, "link", &value);
++ address = g_value_get_string (&value);
++ g_value_unset (&value);
+
+ active = rss_feedlist_contains (list, address);
+
Added: packages/unstable/epiphany-extensions/debian/patches/02_disable-sidebar.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/epiphany-extensions/debian/patches/02_disable-sidebar.patch?rev=22242&op=file
==============================================================================
--- packages/unstable/epiphany-extensions/debian/patches/02_disable-sidebar.patch (added)
+++ packages/unstable/epiphany-extensions/debian/patches/02_disable-sidebar.patch [utf-8] Fri Nov 6 10:01:46 2009
@@ -1,0 +1,26 @@
+--- configure.ac.old 2009-11-06 10:59:46.000000000 +0100
++++ configure.ac 2009-11-06 11:00:02.000000000 +0100
+@@ -172,8 +172,8 @@
+ 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 gestures 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 gestures 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"
+
+--- configure.old 2009-11-06 10:59:49.000000000 +0100
++++ configure 2009-11-06 11:00:14.000000000 +0100
+@@ -20199,8 +20199,8 @@
+ $as_echo_n "checking which extensions to build... " >&6; }
+
+ 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 gestures 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 gestures 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"
+
More information about the pkg-gnome-commits
mailing list