[arch-commits] CVS update of extra/gnome/evince (3 files)

[Jan de Groot]

    Date: Saturday, July 7, 2007 @ 08:20:34
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/evince

   Added: evince-no-gnomeprint.patch (1.1)
Modified: PKGBUILD (1.34 -> 1.35) evince.install (1.13 -> 1.14)

upgpkg: evince 0.8.3-1
Wreck gnomeprint support, we no longer have to uninstall it


----------------------------+
 PKGBUILD                   |   23 ++++++++++--------
 evince-no-gnomeprint.patch |   54 +++++++++++++++++++++++++++++++++++++++++++
 evince.install             |   14 +----------
 3 files changed, 69 insertions(+), 22 deletions(-)


Index: extra/gnome/evince/PKGBUILD
diff -u extra/gnome/evince/PKGBUILD:1.34 extra/gnome/evince/PKGBUILD:1.35
--- extra/gnome/evince/PKGBUILD:1.34	Sun Apr 22 12:38:00 2007
+++ extra/gnome/evince/PKGBUILD	Sat Jul  7 08:20:33 2007
@@ -1,26 +1,29 @@
-# $Id: PKGBUILD,v 1.34 2007/04/22 16:38:00 jgc Exp $
+# $Id: PKGBUILD,v 1.35 2007/07/07 12:20:33 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
-# NOTE: pacman -Rd libgnomeprint libgnomeprintui before compilation.
-
 pkgname=evince
-pkgver=0.8.1
-pkgrel=2
+pkgver=0.8.3
+pkgrel=1
 pkgdesc="Simply a document viewer"
 url="http://www.gnome.org"
 arch=(i686 x86_64)
 license=('GPL')
-depends=('libgnomeui>=2.18.1-2' 'ghostscript' 'poppler-glib' 'libdjvu' 'gnome-icon-theme>=2.18.0' 't1lib' 'scrollkeeper')
-makedepends=('perlxml' 'gnome-doc-utils>=0.10.3' 'nautilus>=2.18.1' 'pkgconfig' 'tetex')
+depends=('libgnomeui>=2.18.1-2' 'ghostscript' 'poppler-glib>=0.5.9' 'libdjvu' 'gnome-icon-theme>=2.18.0' 't1lib' 'scrollkeeper' 'gconf>=2.18.0.1-4')
+makedepends=('intltool' 'gnome-doc-utils>=0.10.3' 'nautilus>=2.18.1' 'pkgconfig' 'tetex' 'gnome-common' 'gtk-doc')
 install=evince.install
-options=('nolibtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2)
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.8/${pkgname}-${pkgver}.tar.bz2
+	evince-no-gnomeprint.patch)
 replaces=('gpdf')
 groups=('gnome-extra')
-md5sums=('f09c8d2a6c75abe50c6db7833d66a5b4')
+md5sums=('0603d3f3f5648c88f10f75c89807c3d1')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/evince-no-gnomeprint.patch || return 1
+  aclocal || return 1
+  autoconf || return 1
+  automake || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --with-print=gtk --enable-nautilus \
Index: extra/gnome/evince/evince-no-gnomeprint.patch
diff -u /dev/null extra/gnome/evince/evince-no-gnomeprint.patch:1.1
--- /dev/null	Sat Jul  7 08:20:33 2007
+++ extra/gnome/evince/evince-no-gnomeprint.patch	Sat Jul  7 08:20:33 2007
@@ -0,0 +1,54 @@
+--- configure.ac.orig	2007-07-07 12:05:37.000000000 +0000
++++ configure.ac	2007-07-07 12:12:35.000000000 +0000
+@@ -71,36 +71,18 @@
+ 	    PRINT=$withval,
+             PRINT="auto")
+ 
+-PKG_CHECK_MODULES(GNOME_PRINT, 
+-		  libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED,
+-		  enable_gnome_print=yes, enable_gnome_print=no)
+ PKG_CHECK_MODULES(GTK_PRINT,
+ 		  gtk+-unix-print-2.0 >= $GTK_PRINT_REQUIRED,
+ 		  enable_gtk_print=yes, enable_gtk_print=no)
+ enable_print=no
+-if test x$PRINT = xgnome -a x$enable_gnome_print = xyes; then
+-   enable_print=gnome
++if test x$PRINT = xgtk -a x$enable_gtk_print = xyes; then
++  enable_print=gtk
+ else
+-   if test x$PRINT = xgtk -a x$enable_gtk_print = xyes; then
++  if test x$PRINT = xauto; then
++    if test x$enable_gtk_print = xyes; then
+       enable_print=gtk
+-   else
+-      if test x$PRINT = xauto; then
+-	 if test x$enable_gtk_print = xyes; then
+-	    enable_print=gtk
+-	 else
+-	    if test x$enable_gnome_print = xyes; then
+-	       enable_print=gnome
+-	    fi
+-	 fi
+-      fi
+-   fi
+-fi
+-
+-if test x$enable_print = xgnome; then
+-   AC_SUBST(GNOME_PRINT_CFLAGS)
+-   AC_SUBST(GNOME_PRINT_LIBS)
+-   AC_DEFINE([WITH_GNOME_PRINT],[1],[Enable GNOME Print Support.])
+-   AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.])
++    fi
++  fi
+ fi
+ 
+ if test x$enable_print = xgtk; then   
+@@ -109,7 +91,7 @@
+    AC_DEFINE([WITH_GTK_PRINT],[1],[Enable GTK Print Support.])
+    AC_DEFINE([WITH_PRINT],[1],[Enable Print Support.])
+ fi
+-   
++ 
+ AM_CONDITIONAL(WITH_GNOME_PRINT, test x$enable_print = xgnome)
+ AM_CONDITIONAL(WITH_GTK_PRINT, test x$enable_print = xgtk)
+ 
Index: extra/gnome/evince/evince.install
diff -u extra/gnome/evince/evince.install:1.13 extra/gnome/evince/evince.install:1.14
--- extra/gnome/evince/evince.install:1.13	Sun Apr 22 12:38:00 2007
+++ extra/gnome/evince/evince.install	Sat Jul  7 08:20:34 2007
@@ -1,8 +1,7 @@
 pkgname=evince
 
 post_install() {
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  usr/bin/gconftool-2 --makefile-install-rule usr/share/gconf/schemas/${pkgname}.schemas >/dev/null
+  usr/sbin/gconfpkg --install ${pkgname}
   gtk-update-icon-cache -q -f -t usr/share/icons/hicolor
   update-desktop-database -q
   scrollkeeper-update -q -p var/lib/scrollkeeper
@@ -17,16 +16,7 @@
 }
 
 pre_remove() {
-  if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(usr/share/gconf/schemas/${pkgname}.schemas)
-  elif [ -f opt/gnome/share/gconf/schemas/${pkgname}.schemas ]; then
-    schemas=(opt/gnome/share/gconf/schemas/${pkgname}.schemas)
-  else
-    schemas=(`pacman -Ql $pkgname | grep 'gconf/schemas/.*schemas$' | awk '{ print $2 }'`)
-  fi
-  export GCONF_CONFIG_SOURCE=`usr/bin/gconftool-2 --get-default-source`
-  
-  usr/bin/gconftool-2 --makefile-uninstall-rule ${schemas[@]} >/dev/null
+  usr/sbin/gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {