[arch-commits] Commit in poppler/repos (3 files)

[Jan de Groot]

    Date: Friday, November 7, 2008 @ 18:45:58
  Author: jgc
Revision: 18594

Merged revisions 18593 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/poppler/trunk

........
  r18593 | jgc | 2008-11-08 00:45:37 +0100 (Sat, 08 Nov 2008) | 1 line
  
  upgpkg: poppler 0.10.0-1
........

Modified:
  poppler/repos/extra-i686/	(properties)
  poppler/repos/extra-i686/PKGBUILD
Deleted:
  poppler/repos/extra-i686/poppler-0.6.1-cairoheaders.patch

----------------------------------+
 PKGBUILD                         |   27 ++++++++++++---------------
 poppler-0.6.1-cairoheaders.patch |   20 --------------------
 2 files changed, 12 insertions(+), 35 deletions(-)


Property changes on: poppler/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /poppler/trunk:1-9886
   + /poppler/trunk:1-18593

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-07 23:45:37 UTC (rev 18593)
+++ extra-i686/PKGBUILD	2008-11-07 23:45:58 UTC (rev 18594)
@@ -2,8 +2,8 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=poppler
-pkgver=0.8.6
-_dataver=0.2.0
+pkgver=0.10.0
+_dataver=0.2.1
 pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0"
 arch=(i686 x86_64)
@@ -13,15 +13,12 @@
 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
-	poppler-0.6.1-cairoheaders.patch)
-md5sums=('6f2f5761ea06074d581951014b646372'
-         'b7f98e84a4d2a2c794271d746ec7ee0b'
-         'ce8f07aaca7abfafdca604582a9f8398')
+	http://poppler.freedesktop.org/poppler-data-${_dataver}.tar.gz)
+md5sums=('c5f3002c2cb295c4e290925a040f80be'
+         'bca78b8786746c7b48b324283992d658')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np1 -i ${startdir}/src/poppler-0.6.1-cairoheaders.patch || return 1
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --enable-cairo-output \
@@ -30,13 +27,13 @@
 	      --disable-poppler-qt4 \
 	      --disable-poppler-glib \
 	      --disable-poppler-qt \
-	      --disable-gtk-test
+	      --disable-gtk-test || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR="${pkgdir}" install || return 1
 
-  cd ${startdir}/src/poppler-data-${_dataver}
-  make prefix=/usr DESTDIR=${startdir}/pkg install
+  cd "${srcdir}/poppler-data-${_dataver}" || return 1
+  make prefix=/usr DESTDIR="${pkgdir}" install || return 1
 
-  mkdir -p ${startdir}/pkg/usr/share/licenses/${pkgname}
-  install -m644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
 }

Deleted: extra-i686/poppler-0.6.1-cairoheaders.patch
===================================================================
--- extra-i686/poppler-0.6.1-cairoheaders.patch	2008-11-07 23:45:37 UTC (rev 18593)
+++ extra-i686/poppler-0.6.1-cairoheaders.patch	2008-11-07 23:45:58 UTC (rev 18594)
@@ -1,20 +0,0 @@
-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		\