r15898 - in /desktop/experimental/epiphany-browser/debian: changelog control control.in patches/13_extensions_need_xpcom.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Mon May 12 12:43:36 2008
New Revision: 15898

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15898
Log:
* epiphany-gecko conflicts against python-xpcom, because of 
  bug#416068.
* 13_extensions_need_xpcom.patch: new patch; ensure that xpcomglue is 
  initialized before the extensions that could link to gecko are 
  loaded.

Added:
    desktop/experimental/epiphany-browser/debian/patches/13_extensions_need_xpcom.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=15898&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/changelog (original)
+++ desktop/experimental/epiphany-browser/debian/changelog Mon May 12 12:43:36 2008
@@ -1,3 +1,13 @@
+epiphany-browser (2.22.1.1-3) experimental; urgency=low
+
+  * epiphany-gecko conflicts against python-xpcom, because of 
+    bug#416068.
+  * 13_extensions_need_xpcom.patch: new patch; ensure that xpcomglue is 
+    initialized before the extensions that could link to gecko are 
+    loaded.
+
+ -- Josselin Mouette <joss at debian.org>  Mon, 12 May 2008 14:04:33 +0200
+
 epiphany-browser (2.22.1.1-2) experimental; urgency=low
 
   * Build against xulrunner 1.9:

Modified: desktop/experimental/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control?rev=15898&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control (original)
+++ desktop/experimental/epiphany-browser/debian/control Mon May 12 12:43:36 2008
@@ -59,7 +59,9 @@
          xulrunner-1.9,
          xulrunner-1.9-gnome-support,
          ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20), epiphany-extensions (<< 2.22.1-3)
+Conflicts: epiphany-browser (<< 2.20),
+           epiphany-extensions (<< 2.22.1-3),
+           python-xpcom
 Recommends: yelp, epiphany-extensions
 Suggests: mozplugger
 Provides: www-browser, gnome-www-browser

Modified: desktop/experimental/epiphany-browser/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/control.in?rev=15898&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/control.in (original)
+++ desktop/experimental/epiphany-browser/debian/control.in Mon May 12 12:43:36 2008
@@ -59,7 +59,9 @@
          xulrunner-1.9,
          xulrunner-1.9-gnome-support,
          ${misc:Depends}
-Conflicts: epiphany-browser (<< 2.20), epiphany-extensions (<< 2.22.1-3)
+Conflicts: epiphany-browser (<< 2.20),
+           epiphany-extensions (<< 2.22.1-3),
+           python-xpcom
 Recommends: yelp, epiphany-extensions
 Suggests: mozplugger
 Provides: www-browser, gnome-www-browser

Added: desktop/experimental/epiphany-browser/debian/patches/13_extensions_need_xpcom.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/13_extensions_need_xpcom.patch?rev=15898&op=file
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/13_extensions_need_xpcom.patch (added)
+++ desktop/experimental/epiphany-browser/debian/patches/13_extensions_need_xpcom.patch Mon May 12 12:43:36 2008
@@ -1,0 +1,14 @@
+Index: epiphany-2.22.1.1/src/ephy-shell.c
+===================================================================
+--- epiphany-2.22.1.1.orig/src/ephy-shell.c	2008-05-12 14:02:25.576933713 +0200
++++ epiphany-2.22.1.1/src/ephy-shell.c	2008-05-12 14:09:14.000934821 +0200
+@@ -708,6 +708,9 @@ ephy_shell_get_extensions_manager (EphyS
+ 
+ 	if (es->priv->extensions_manager == NULL)
+ 	{
++	    /* Ensure Gecko is booted (necessary for the xpcomglue crackpipe) */
++	    ephy_embed_shell_get_embed_single (EPHY_EMBED_SHELL (es));
++
+ 		/* Instantiate extensions manager */
+ 		es->priv->extensions_manager =
+ 			g_object_new (EPHY_TYPE_EXTENSIONS_MANAGER, NULL);

Modified: desktop/experimental/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/epiphany-browser/debian/patches/series?rev=15898&op=diff
==============================================================================
--- desktop/experimental/epiphany-browser/debian/patches/series (original)
+++ desktop/experimental/epiphany-browser/debian/patches/series Mon May 12 12:43:36 2008
@@ -11,4 +11,5 @@
 10_url_double-click.patch
 11_useragent-weasel.patch
 12_safetypes_rss.patch
+13_extensions_need_xpcom.patch
 99_autoreconf.patch