[arch-commits] Commit in epiphany/repos (10 files)
Ionut Biru
ibiru at archlinux.org
Wed Mar 21 17:59:30 UTC 2012
Date: Wednesday, March 21, 2012 @ 13:59:29
Author: ibiru
Revision: 154024
archrelease: copy trunk to gnome-unstable-i686, gnome-unstable-x86_64
Added:
epiphany/repos/gnome-unstable-i686/PKGBUILD
(from rev 154023, epiphany/trunk/PKGBUILD)
epiphany/repos/gnome-unstable-i686/epiphany.install
(from rev 154023, epiphany/trunk/epiphany.install)
epiphany/repos/gnome-unstable-i686/fix-infinite-loop
(from rev 154023, epiphany/trunk/fix-infinite-loop)
epiphany/repos/gnome-unstable-x86_64/PKGBUILD
(from rev 154023, epiphany/trunk/PKGBUILD)
epiphany/repos/gnome-unstable-x86_64/epiphany.install
(from rev 154023, epiphany/trunk/epiphany.install)
epiphany/repos/gnome-unstable-x86_64/fix-infinite-loop
(from rev 154023, epiphany/trunk/fix-infinite-loop)
Deleted:
epiphany/repos/gnome-unstable-i686/PKGBUILD
epiphany/repos/gnome-unstable-i686/epiphany.install
epiphany/repos/gnome-unstable-x86_64/PKGBUILD
epiphany/repos/gnome-unstable-x86_64/epiphany.install
-----------------------------------------+
gnome-unstable-i686/PKGBUILD | 67 +++++++++++++++---------------
gnome-unstable-i686/epiphany.install | 26 +++++------
gnome-unstable-i686/fix-infinite-loop | 38 +++++++++++++++++
gnome-unstable-x86_64/PKGBUILD | 67 +++++++++++++++---------------
gnome-unstable-x86_64/epiphany.install | 26 +++++------
gnome-unstable-x86_64/fix-infinite-loop | 38 +++++++++++++++++
6 files changed, 172 insertions(+), 90 deletions(-)
Deleted: gnome-unstable-i686/PKGBUILD
===================================================================
--- gnome-unstable-i686/PKGBUILD 2012-03-21 17:58:06 UTC (rev 154023)
+++ gnome-unstable-i686/PKGBUILD 2012-03-21 17:59:29 UTC (rev 154024)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=epiphany
-pkgver=3.3.92
-pkgrel=1
-install=epiphany.install
-pkgdesc="A GNOME web browser based on the WebKit rendering engine."
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
- 'hicolor-icon-theme' 'seed')
-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=('2f557fafdd40e28e4ceb1b05b7d3117f5c9b9b362983ec435b8b49429141d144')
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-scrollkeeper \
- --enable-seed
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: epiphany/repos/gnome-unstable-i686/PKGBUILD (from rev 154023, epiphany/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-i686/PKGBUILD (rev 0)
+++ gnome-unstable-i686/PKGBUILD 2012-03-21 17:59:29 UTC (rev 154024)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=epiphany
+pkgver=3.3.92
+pkgrel=2
+install=epiphany.install
+pkgdesc="A GNOME web browser based on the WebKit rendering engine."
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
+ 'hicolor-icon-theme' 'seed')
+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
+ 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 \
+ --enable-seed
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Deleted: gnome-unstable-i686/epiphany.install
===================================================================
--- gnome-unstable-i686/epiphany.install 2012-03-21 17:58:06 UTC (rev 154023)
+++ gnome-unstable-i686/epiphany.install 2012-03-21 17:59:29 UTC (rev 154024)
@@ -1,13 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: epiphany/repos/gnome-unstable-i686/epiphany.install (from rev 154023, epiphany/trunk/epiphany.install)
===================================================================
--- gnome-unstable-i686/epiphany.install (rev 0)
+++ gnome-unstable-i686/epiphany.install 2012-03-21 17:59:29 UTC (rev 154024)
@@ -0,0 +1,13 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: epiphany/repos/gnome-unstable-i686/fix-infinite-loop (from rev 154023, epiphany/trunk/fix-infinite-loop)
===================================================================
--- gnome-unstable-i686/fix-infinite-loop (rev 0)
+++ gnome-unstable-i686/fix-infinite-loop 2012-03-21 17:59:29 UTC (rev 154024)
@@ -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
+
Deleted: gnome-unstable-x86_64/PKGBUILD
===================================================================
--- gnome-unstable-x86_64/PKGBUILD 2012-03-21 17:58:06 UTC (rev 154023)
+++ gnome-unstable-x86_64/PKGBUILD 2012-03-21 17:59:29 UTC (rev 154024)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-
-pkgname=epiphany
-pkgver=3.3.92
-pkgrel=1
-install=epiphany.install
-pkgdesc="A GNOME web browser based on the WebKit rendering engine."
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
- 'hicolor-icon-theme' 'seed')
-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=('2f557fafdd40e28e4ceb1b05b7d3117f5c9b9b362983ec435b8b49429141d144')
-
-build() {
- cd "$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var \
- --disable-scrollkeeper \
- --enable-seed
- make
-}
-
-package() {
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
Copied: epiphany/repos/gnome-unstable-x86_64/PKGBUILD (from rev 154023, epiphany/trunk/PKGBUILD)
===================================================================
--- gnome-unstable-x86_64/PKGBUILD (rev 0)
+++ gnome-unstable-x86_64/PKGBUILD 2012-03-21 17:59:29 UTC (rev 154024)
@@ -0,0 +1,35 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+
+pkgname=epiphany
+pkgver=3.3.92
+pkgrel=2
+install=epiphany.install
+pkgdesc="A GNOME web browser based on the WebKit rendering engine."
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('libsoup-gnome' 'libnotify' 'gsettings-desktop-schemas' 'libwebkit3' 'nss' 'iso-codes' 'dconf' 'gobject-introspection' 'desktop-file-utils'
+ 'hicolor-icon-theme' 'seed')
+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
+ 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 \
+ --enable-seed
+ make
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+}
Deleted: gnome-unstable-x86_64/epiphany.install
===================================================================
--- gnome-unstable-x86_64/epiphany.install 2012-03-21 17:58:06 UTC (rev 154023)
+++ gnome-unstable-x86_64/epiphany.install 2012-03-21 17:59:29 UTC (rev 154024)
@@ -1,13 +0,0 @@
-post_install() {
- glib-compile-schemas /usr/share/glib-2.0/schemas
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: epiphany/repos/gnome-unstable-x86_64/epiphany.install (from rev 154023, epiphany/trunk/epiphany.install)
===================================================================
--- gnome-unstable-x86_64/epiphany.install (rev 0)
+++ gnome-unstable-x86_64/epiphany.install 2012-03-21 17:59:29 UTC (rev 154024)
@@ -0,0 +1,13 @@
+post_install() {
+ glib-compile-schemas /usr/share/glib-2.0/schemas
+ update-desktop-database -q
+ gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: epiphany/repos/gnome-unstable-x86_64/fix-infinite-loop (from rev 154023, epiphany/trunk/fix-infinite-loop)
===================================================================
--- gnome-unstable-x86_64/fix-infinite-loop (rev 0)
+++ gnome-unstable-x86_64/fix-infinite-loop 2012-03-21 17:59:29 UTC (rev 154024)
@@ -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
+
More information about the arch-commits
mailing list