r36601 - in /desktop/unstable/epiphany-browser/debian: changelog control patches/history-thread-startup-race.patch patches/series

[jcristau at users.alioth.debian.org]

Author: jcristau
Date: Sat Jan 26 18:02:30 2013
New Revision: 36601

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36601
Log:
* Non-maintainer upload.
* Apply patch from Stephan Schreiber to fix a race condition starting the
  history service thread (closes: #697173).

Added:
    desktop/unstable/epiphany-browser/debian/patches/history-thread-startup-race.patch
Modified:
    desktop/unstable/epiphany-browser/debian/changelog
    desktop/unstable/epiphany-browser/debian/control
    desktop/unstable/epiphany-browser/debian/patches/series

Modified: desktop/unstable/epiphany-browser/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/changelog?rev=36601&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/changelog [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/changelog [utf-8] Sat Jan 26 18:02:30 2013
@@ -1,3 +1,11 @@
+epiphany-browser (3.4.2-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Apply patch from Stephan Schreiber to fix a race condition starting the
+    history service thread (closes: #697173).
+
+ -- Julien Cristau <jcristau at debian.org>  Sat, 26 Jan 2013 17:38:36 +0000
+
 epiphany-browser (3.4.2-2) unstable; urgency=low
 
   * Rename epiphany.desktop to epiphany-browser.desktop so that the 

Modified: desktop/unstable/epiphany-browser/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/control?rev=36601&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/control [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/control [utf-8] Sat Jan 26 18:02:30 2013
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Gustavo Noronha Silva <kov at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: debhelper (>= 8),
                cdbs (>= 0.4.90),
                dh-autoreconf,

Added: desktop/unstable/epiphany-browser/debian/patches/history-thread-startup-race.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/history-thread-startup-race.patch?rev=36601&op=file
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/history-thread-startup-race.patch (added)
+++ desktop/unstable/epiphany-browser/debian/patches/history-thread-startup-race.patch [utf-8] Sat Jan 26 18:02:30 2013
@@ -1,0 +1,46 @@
+diff -pr -u8 epiphany-browser-orig/lib/history/ephy-history-service.c epiphany-browser-3.4.2/lib/history/ephy-history-service.c
+--- epiphany-browser-orig/lib/history/ephy-history-service.c	2012-12-27 15:42:56.478406326 +0100
++++ epiphany-browser-3.4.2/lib/history/ephy-history-service.c	2012-12-27 15:44:06.958409578 +0100
+@@ -183,18 +183,19 @@ ephy_history_service_class_init (EphyHis
+   g_type_class_add_private (gobject_class, sizeof (EphyHistoryServicePrivate));
+ }
+ 
+ static void
+ ephy_history_service_init (EphyHistoryService *self)
+ {
+   self->priv = EPHY_HISTORY_SERVICE_GET_PRIVATE (self);
+ 
+-  self->priv->history_thread = g_thread_new ("EphyHistoryService", (GThreadFunc) run_history_service_thread, self);
++  self->priv->history_thread = NULL;
+   self->priv->queue = g_async_queue_new ();
++  g_thread_new ("EphyHistoryService", (GThreadFunc) run_history_service_thread, self);
+ }
+ 
+ EphyHistoryService *
+ ephy_history_service_new (const char *history_filename)
+ {
+   return EPHY_HISTORY_SERVICE (g_object_new (EPHY_TYPE_HISTORY_SERVICE,
+                                              "history-filename", history_filename,
+                                               NULL));
+@@ -355,17 +356,17 @@ ephy_history_service_execute_quit (EphyH
+ }
+ 
+ static gpointer
+ run_history_service_thread (EphyHistoryService *self)
+ {
+   EphyHistoryServicePrivate *priv = self->priv;
+   EphyHistoryServiceMessage *message;
+ 
+-  g_assert (priv->history_thread == g_thread_self ());
++  priv->history_thread = g_thread_self ();
+ 
+   if (ephy_history_service_open_database_connections (self) == FALSE)
+     return NULL;
+ 
+   do {
+     message = g_async_queue_try_pop (priv->queue);
+     if (!message) {
+       /* Schedule commit if needed. */
+
+
+Signed-off-by: Stephan Schreiber <info at fs-driver.org>

Modified: desktop/unstable/epiphany-browser/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/epiphany-browser/debian/patches/series?rev=36601&op=diff
==============================================================================
--- desktop/unstable/epiphany-browser/debian/patches/series [utf-8] (original)
+++ desktop/unstable/epiphany-browser/debian/patches/series [utf-8] Sat Jan 26 18:02:30 2013
@@ -2,3 +2,4 @@
 07_bookmarks.patch
 12_safetypes.patch
 14_pkglibdir.patch
+history-thread-startup-race.patch