[arch-commits] CVS update of extra/office/poppler (2 files)

[Jan de Groot]

    Date: Thursday, October 18, 2007 @ 14:29:11
  Author: jgc
    Path: /home/cvs-extra/extra/office/poppler

   Added: poppler-0.6.1-cairoheaders.patch (1.1)
Modified: PKGBUILD (1.28 -> 1.29)

upgpkg: poppler 0.6.1-1
Install cairo headers. Thanks to Martin Schmidt for the patch


----------------------------------+
 PKGBUILD                         |   17 ++++++++++-------
 poppler-0.6.1-cairoheaders.patch |   20 ++++++++++++++++++++
 2 files changed, 30 insertions(+), 7 deletions(-)


Index: extra/office/poppler/PKGBUILD
diff -u extra/office/poppler/PKGBUILD:1.28 extra/office/poppler/PKGBUILD:1.29
--- extra/office/poppler/PKGBUILD:1.28	Wed Sep 19 16:09:50 2007
+++ extra/office/poppler/PKGBUILD	Thu Oct 18 14:29:11 2007
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD,v 1.28 2007/09/19 20:09:50 jgc Exp $
+# $Id: PKGBUILD,v 1.29 2007/10/18 18:29:11 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=poppler
-pkgver=0.6
-_dataver=0.1
-pkgrel=2
+pkgver=0.6.1
+_dataver=0.1.1
+pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
@@ -13,12 +13,15 @@
 options=('!libtool')
 url="http://poppler.freedesktop.org/"
 source=(http://poppler.freedesktop.org/${pkgname}-${pkgver}.tar.gz
-	http://poppler.freedesktop.org/poppler-data-${_dataver}.tar.gz)
-md5sums=('96883867572aa1e55e979ec75369c562'
-         '5c700eb06dda9dafec09cd85225e34d4')
+	http://poppler.freedesktop.org/poppler-data-${_dataver}.tar.gz
+	poppler-0.6.1-cairoheaders.patch)
+md5sums=('78a5f8ff1a3464eddb127577eea7a191'
+         '79bf19ca41242ab705b8d4ff440c83d9'
+         'ce8f07aaca7abfafdca604582a9f8398')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np1 -i ${startdir}/src/poppler-0.6.1-cairoheaders.patch || return 1  
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --enable-cairo-output \
Index: extra/office/poppler/poppler-0.6.1-cairoheaders.patch
diff -u /dev/null extra/office/poppler/poppler-0.6.1-cairoheaders.patch:1.1
--- /dev/null	Thu Oct 18 14:29:11 2007
+++ extra/office/poppler/poppler-0.6.1-cairoheaders.patch	Thu Oct 18 14:29:11 2007
@@ -0,0 +1,20 @@
+diff -ur poppler-0.6.1.org/poppler/Makefile.in poppler-0.6.1.new/poppler/Makefile.in
+--- poppler-0.6.1.org/poppler/Makefile.in	2007-10-12 05:48:31.000000000 -0600
++++ poppler-0.6.1.new/poppler/Makefile.in	2007-10-17 12:19:20.000000000 -0600
+@@ -140,6 +140,7 @@
+ 	$(am__libpoppler_la_SOURCES_DIST)
+ am__poppler_include_HEADERS_DIST = SplashOutputDev.h Annot.h Array.h \
+ 	BaseFile.h BuiltinFont.h BuiltinFontTables.h Catalog.h \
++	CairoFontEngine.h CairoOutputDev.h \
+ 	CharCodeToUnicode.h CMap.h Decrypt.h Dict.h Error.h \
+ 	FontEncodingTables.h FontInfo.h Form.h Function.cc Function.h \
+ 	Gfx.h GfxFont.h GfxState.h GlobalParams.h JArithmeticDecoder.h \
+@@ -418,6 +419,8 @@
+ @ENABLE_XPDF_HEADERS_TRUE@	BuiltinFont.h		\
+ @ENABLE_XPDF_HEADERS_TRUE@	BuiltinFontTables.h	\
+ @ENABLE_XPDF_HEADERS_TRUE@	Catalog.h		\
++ at ENABLE_XPDF_HEADERS_TRUE@	CairoFontEngine.h	\
++ at ENABLE_XPDF_HEADERS_TRUE@	CairoOutputDev.h	\
+ @ENABLE_XPDF_HEADERS_TRUE@	CharCodeToUnicode.h	\
+ @ENABLE_XPDF_HEADERS_TRUE@	CMap.h			\
+ @ENABLE_XPDF_HEADERS_TRUE@	Decrypt.h		\