diff options
| author | root <root@rshg054.dnsready.net> | 2012-03-23 00:01:14 +0000 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-03-23 00:01:14 +0000 |
| commit | 1512c792951d7fbd2c9c336f9bf35654bbb85cc6 (patch) | |
| tree | d786dcc22bc7f01d7629eb8a07415d2a904fc015 /gnome-unstable/epiphany | |
| parent | 39e662ccfbe62ae77d458159d192816171a22f43 (diff) | |
Fri Mar 23 00:01:14 UTC 2012
Diffstat (limited to 'gnome-unstable/epiphany')
| -rw-r--r-- | gnome-unstable/epiphany/PKGBUILD | 13 | ||||
| -rw-r--r-- | gnome-unstable/epiphany/fix-infinite-loop | 38 |
2 files changed, 46 insertions, 5 deletions
diff --git a/gnome-unstable/epiphany/PKGBUILD b/gnome-unstable/epiphany/PKGBUILD index c3fbe165f..9602efe07 100644 --- a/gnome-unstable/epiphany/PKGBUILD +++ b/gnome-unstable/epiphany/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 152891 2012-03-10 15:41:59Z ibiru $ +# $Id: PKGBUILD 154024 2012-03-21 17:59:29Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=epiphany -pkgver=3.3.91 -pkgrel=1 +pkgver=3.3.92 +pkgrel=2 install=epiphany.install pkgdesc="A GNOME web browser based on the WebKit rendering engine." arch=('i686' 'x86_64') @@ -14,11 +14,14 @@ makedepends=('intltool' 'gnome-doc-utils' 'startup-notification') 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=('44e7d14dea70b13dece9ea86393e722f8600aea7c5ca882c3fff5e04575a4953') +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 \ diff --git a/gnome-unstable/epiphany/fix-infinite-loop b/gnome-unstable/epiphany/fix-infinite-loop new file mode 100644 index 000000000..7322a0a4c --- /dev/null +++ b/gnome-unstable/epiphany/fix-infinite-loop @@ -0,0 +1,38 @@ +From 087cb32d81fd8ef1cf3f493fce9e80e7217dbf04 Mon Sep 17 00:00:00 2001 +From: Xan Lopez <xan@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 + |