r27320 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in patches/04_allow_flash_with_npwrapper.patch patches/series
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Fri Apr 8 19:37:12 UTC 2011
Author: kov
Date: Fri Apr 8 19:37:11 2011
New Revision: 27320
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27320
Log:
Bump version to 3.0.0 and add patch to support flash through npwrapper.
Added:
desktop/experimental/epiphany-browser/debian/patches/04_allow_flash_with_npwrapper.patch
Modified:
desktop/experimental/epiphany-browser/debian/changelog
desktop/experimental/epiphany-browser/debian/control
desktop/experimental/epiphany-browser/debian/control.in
desktop/experimental/epiphany-browser/debian/patches/series
Modified: desktop/experimental/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/changelog?rev=27320&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/changelog [utf-8] Fri Apr 8 19:37:11 2011
@@ -1,4 +1,4 @@
-epiphany-browser (2.91.92-1) UNRELEASED; urgency=low
+epiphany-browser (3.0.0-1) UNRELEASED; urgency=low
[ Josselin Mouette ]
* Make the -dev package depend on the gir package.
@@ -9,6 +9,10 @@
* debian/patches/16_fix_missing_restore_option.patch,
debian/patches/17_do_not_include_removed_header.patch:
- removed; included in this upstream version
+ * debian/patches/04_allow_flash_with_npwrapper.patch:
+ - imported from upstream's bugzilla to allow flash when used through
+ npwrapper; also bump build-dep on webkit to 1.3.13-2 that has a patch
+ to support this
-- Gustavo Noronha Silva <kov at debian.org> Thu, 31 Mar 2011 23:37:12 -0300
Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=27320&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control [utf-8] Fri Apr 8 19:37:11 2011
@@ -23,7 +23,7 @@
libsoup-gnome2.4-dev (>= 2.29.91),
libnss3-dev,
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 1.3.13),
+ libwebkitgtk-3.0-dev (>= 1.3.13-2),
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12),
gir1.2-glib-2.0,
Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=27320&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/control.in [utf-8] Fri Apr 8 19:37:11 2011
@@ -18,7 +18,7 @@
libsoup-gnome2.4-dev (>= 2.29.91),
libnss3-dev,
libxml-parser-perl,
- libwebkitgtk-3.0-dev (>= 1.3.13),
+ libwebkitgtk-3.0-dev (>= 1.3.13-2),
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12),
gir1.2-glib-2.0,
Added: desktop/experimental/epiphany-browser/debian/patches/04_allow_flash_with_npwrapper.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/04_allow_flash_with_npwrapper.patch?rev=27320&op=file
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/04_allow_flash_with_npwrapper.patch (added)
+++ desktop/experimental/epiphany-browser/debian/patches/04_allow_flash_with_npwrapper.patch [utf-8] Fri Apr 8 19:37:11 2011
@@ -1,0 +1,46 @@
+From bad2677e1a3ad9a56882471ced20d4a24f6000e6 Mon Sep 17 00:00:00 2001
+From: Gustavo Noronha Silva <gns at gnome.org>
+Date: Wed, 6 Apr 2011 16:08:36 -0300
+Subject: [PATCH] Do not disable flash if running through npwrapper.
+
+We use the new API added in WebKitGTK+ 1.4.0 to look at the plugin's
+path. If the filename begins with 'npwrapper' we assume it is being
+made available through nspluginwrapper, and will thus work.
+
+Bug #647096
+---
+ configure.ac | 2 +-
+ embed/ephy-embed-single.c | 13 ++++++++++---
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/embed/ephy-embed-single.c b/embed/ephy-embed-single.c
+index 3fd58aa..7d4af78 100644
+--- a/embed/ephy-embed-single.c
++++ b/embed/ephy-embed-single.c
+@@ -549,13 +549,20 @@ ephy_embed_single_initialize (EphyEmbedSingle *single)
+ #endif
+
+ /* Disable Flash by default, since it uses GTK+2.x and we can't mix
+- * it in our GTK+3.x process */
++ * it in our GTK+3.x process, but only if it is not being wrapped by
++ * nspluginwrapper. */
+ database = webkit_get_web_plugin_database ();
+ list = webkit_web_plugin_database_get_plugins (database);
+ for (p = list; p; p = p->next) {
+ WebKitWebPlugin *plugin = WEBKIT_WEB_PLUGIN (p->data);
+- if (g_strcmp0 (webkit_web_plugin_get_name (plugin), "Shockwave Flash") == 0)
+- webkit_web_plugin_set_enabled (plugin, FALSE);
++ if (g_strcmp0 (webkit_web_plugin_get_name (plugin), "Shockwave Flash") == 0) {
++ char *filename = g_path_get_basename (webkit_web_plugin_get_path (plugin));
++
++ if (!g_str_has_prefix (filename, "npwrapper."))
++ webkit_web_plugin_set_enabled (plugin, FALSE);
++
++ g_free (filename);
++ }
+ }
+
+ webkit_web_plugin_database_plugins_list_free (list);
+--
+1.7.4.1
+
Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=27320&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series [utf-8] Fri Apr 8 19:37:11 2011
@@ -1,6 +1,7 @@
00_epiphany-browser.patch
01_bookmarks_menu.patch
03_dbus.patch
+04_allow_flash_with_npwrapper.patch
05_libexecdir.patch
07_bookmarks.patch
10_smart_bookmarks.patch
More information about the pkg-gnome-commits
mailing list