[arch-commits] Commit in evince/trunk (PKGBUILD fix_creating_last_settings.patch)

[Jan de Groot]

    Date: Tuesday, June 22, 2010 @ 14:12:58
  Author: jgc
Revision: 83734

upgpkg: evince 2.30.2-1
Build against poppler 0.14

Modified:
  evince/trunk/PKGBUILD
Deleted:
  evince/trunk/fix_creating_last_settings.patch

----------------------------------+
 PKGBUILD                         |   23 ++++++++++-------------
 fix_creating_last_settings.patch |   22 ----------------------
 2 files changed, 10 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-06-22 18:05:16 UTC (rev 83733)
+++ PKGBUILD	2010-06-22 18:12:58 UTC (rev 83734)
@@ -2,27 +2,24 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=evince
-pkgver=2.30.1
-pkgrel=2
+pkgver=2.30.2
+pkgrel=1
 pkgdesc="Simply a document viewer"
-url="http://www.gnome.org"
+url="http://projects.gnome.org/evince/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('libspectre>=0.2.3' 'gsfonts' 'poppler-glib>=0.12.4' 'libdjvu>=3.5.22' 'gnome-icon-theme>=2.30.2' 't1lib' 'libgnome-keyring>=2.30.1' 'desktop-file-utils')
+depends=('libspectre>=0.2.6' 'gsfonts' 'poppler-glib>=0.14.0' 'libdjvu>=3.5.22' 'gnome-icon-theme>=2.30.2' 't1lib' 'libgnome-keyring>=2.30.1' 'desktop-file-utils')
 makedepends=('gnome-doc-utils>=0.20.1' 'nautilus>=2.30.1' 'pkgconfig' 'texlive-bin' 'intltool' 'gobject-introspection')
 optdepends=('texlive-bin: DVI support')
 replaces=('gpdf')
 groups=('gnome-extra')
 install=evince.install
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
-       fix_creating_last_settings.patch)
-sha256sums=('ab6b957ab422341f023baa8ee4061bc5719389f92d6745874d239cd1e737f225'
- 	    '8a6b6fc4752ead2f2843782e581ae66717cea62a778a39f17da5a9ca82014f9d')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('e4081d537a1a960ff826000c89a8d327c036478d64b08178610b938ed319250e')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i ${srcdir}/fix_creating_last_settings.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var --libexecdir=/usr/lib/evince \
       --disable-static --enable-nautilus \
@@ -31,11 +28,11 @@
       --enable-t1lib --enable-pixbuf \
       --enable-comics --enable-impress \
       --enable-introspection \
-      --disable-scrollkeeper || return 1
-  make || return 1
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
+      --disable-scrollkeeper
+  make
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
 
   install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
-  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evince ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+  gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain evince ${pkgdir}/etc/gconf/schemas/*.schemas
   rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
 }

Deleted: fix_creating_last_settings.patch
===================================================================
--- fix_creating_last_settings.patch	2010-06-22 18:05:16 UTC (rev 83733)
+++ fix_creating_last_settings.patch	2010-06-22 18:12:58 UTC (rev 83734)
@@ -1,22 +0,0 @@
-From 0ac70b958c575996f760fdd987718649398fd51b Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <carlosgc at gnome.org>
-Date: Thu, 29 Apr 2010 09:53:26 +0000
-Subject: Make sure dot_dir exists before creating last_settings file
-
-Fixes bug #617154.
----
-diff --git a/shell/ev-window.c b/shell/ev-window.c
-index fb40f70..4c4c460 100644
---- a/shell/ev-window.c
-+++ b/shell/ev-window.c
-@@ -6107,7 +6107,7 @@ ev_window_create_last_settings_metadata (EvWindow *window)
- 	GFile *file;
- 	gchar *path;
- 
--	path = g_build_filename (ev_application_get_dot_dir (EV_APP, FALSE), "last_settings", NULL);
-+	path = g_build_filename (ev_application_get_dot_dir (EV_APP, TRUE), "last_settings", NULL);
- 	file = g_file_new_for_path (path);
- 	g_free (path);
- 
---
-cgit v0.8.3.1