[arch-commits] Commit in epiphany/trunk (PKGBUILD fix-infinite-loop)

[Ionut Biru]

    Date: Wednesday, March 21, 2012 @ 13:58:06
  Author: ibiru
Revision: 154023

fix startup

Added:
  epiphany/trunk/fix-infinite-loop
Modified:
  epiphany/trunk/PKGBUILD

-------------------+
 PKGBUILD          |    9 ++++++---
 fix-infinite-loop |   38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-21 17:44:28 UTC (rev 154022)
+++ PKGBUILD	2012-03-21 17:58:06 UTC (rev 154023)
@@ -3,7 +3,7 @@
 
 pkgname=epiphany
 pkgver=3.3.92
-pkgrel=1
+pkgrel=2
 install=epiphany.install
 pkgdesc="A GNOME web browser based on the WebKit rendering engine."
 arch=('i686' 'x86_64')
@@ -14,11 +14,14 @@
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('2f557fafdd40e28e4ceb1b05b7d3117f5c9b9b362983ec435b8b49429141d144')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        fix-infinite-loop)
+sha256sums=('2f557fafdd40e28e4ceb1b05b7d3117f5c9b9b362983ec435b8b49429141d144'
+            '5b9a6f69afb39e3d270d2446bc57ed9e190804b67eb4e1f0a16cd013d3dc7851')
 
 build() {
   cd "$pkgname-$pkgver"
+  patch -Np1 -i $srcdir/fix-infinite-loop
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-scrollkeeper \

Added: fix-infinite-loop
===================================================================
--- fix-infinite-loop	                        (rev 0)
+++ fix-infinite-loop	2012-03-21 17:58:06 UTC (rev 154023)
@@ -0,0 +1,38 @@
+From 087cb32d81fd8ef1cf3f493fce9e80e7217dbf04 Mon Sep 17 00:00:00 2001
+From: Xan Lopez <xan at igalia.com>
+Date: Wed, 21 Mar 2012 14:41:36 +0100
+Subject: [PATCH] profile-migrator: do not freak out if the history is empty
+
+If the old history file exists but has no actual visits we'll enter
+into an infinite loop.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=672547
+---
+ lib/ephy-profile-migrator.c |   10 ++++++----
+ 1 files changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/lib/ephy-profile-migrator.c b/lib/ephy-profile-migrator.c
+index f7a3406..a37638c 100644
+--- a/lib/ephy-profile-migrator.c
++++ b/lib/ephy-profile-migrator.c
+@@ -594,11 +594,13 @@ migrate_history ()
+   g_input_stream_close (G_INPUT_STREAM (input), NULL, NULL);
+   g_object_unref (input);
+ 
+-  ephy_history_service_add_visits (history_service, parse_data.visits, NULL, (EphyHistoryJobCallback)visit_cb, NULL);
+-  ephy_history_page_visit_list_free (parse_data.visits);
++  if (parse_data.visits) {
++    ephy_history_service_add_visits (history_service, parse_data.visits, NULL, (EphyHistoryJobCallback)visit_cb, NULL);
++    ephy_history_page_visit_list_free (parse_data.visits);
+ 
+-  while (!all_done)
+-    g_main_context_iteration (NULL, FALSE);
++    while (!all_done)
++      g_main_context_iteration (NULL, FALSE);
++  }
+ 
+   g_object_unref (history_service);
+ }
+-- 
+1.7.7.6
+