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

[Jan de Groot]

    Date: Wednesday, August 20, 2008 @ 15:44:25
  Author: jgc
Revision: 9890

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

........
  r9886 | jgc | 2008-08-20 19:37:40 +0000 (Wed, 20 Aug 2008) | 1 line
  
  upgpkg: poppler 0.8.6-1
........

Modified:
  poppler/repos/extra-x86_64/	(properties)
  poppler/repos/extra-x86_64/PKGBUILD
Deleted:
  poppler/repos/extra-x86_64/bug16579.patch

----------------+
 PKGBUILD       |   11 ++++-------
 bug16579.patch |   22 ----------------------
 2 files changed, 4 insertions(+), 29 deletions(-)


Property changes on: poppler/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /poppler/trunk:1-4482
   + /poppler/trunk:1-9889

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-08-20 19:41:41 UTC (rev 9889)
+++ extra-x86_64/PKGBUILD	2008-08-20 19:44:25 UTC (rev 9890)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=poppler
-pkgver=0.8.4
+pkgver=0.8.6
 _dataver=0.2.0
 pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0"
@@ -14,17 +14,14 @@
 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
-	bug16579.patch)
-md5sums=('29d341f295d01bff64c63a29a6abb274'
+	poppler-0.6.1-cairoheaders.patch)
+md5sums=('6f2f5761ea06074d581951014b646372'
          'b7f98e84a4d2a2c794271d746ec7ee0b'
-         'ce8f07aaca7abfafdca604582a9f8398'
-	 '3d8f2457a2c70bcc81809541481d67f7')
+         'ce8f07aaca7abfafdca604582a9f8398')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
   patch -Np1 -i ${startdir}/src/poppler-0.6.1-cairoheaders.patch || return 1
-  patch -Np1 -i ${startdir}/src/bug16579.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --enable-cairo-output \

Deleted: extra-x86_64/bug16579.patch
===================================================================
--- extra-x86_64/bug16579.patch	2008-08-20 19:41:41 UTC (rev 9889)
+++ extra-x86_64/bug16579.patch	2008-08-20 19:44:25 UTC (rev 9890)
@@ -1,22 +0,0 @@
-From 1f266d2e8183c703be391ee8393c56a3e5654b27 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid at kde.org>
-Date: Tue, 01  Jul  2008  18:16:50  +0000
-Subject: Fix condition, we want fetched_thumb to be a Stream, not to be non null
-
-Fixes bug 16579
----
-diff --git a/poppler/Page.cc b/poppler/Page.cc
-index 3da5976..fa2d86d 100644
---- a/poppler/Page.cc
-+++ b/poppler/Page.cc
-@@ -466,7 +466,7 @@ GBool Page::loadThumb(unsigned char **data_out,
- 
-   /* Get stream dict */
-   thumb.fetch(xref, &fetched_thumb);
--  if (fetched_thumb.isNull()) {
-+  if (!fetched_thumb.isStream()) {
-     fetched_thumb.free();
-     return gFalse;
-   }
---
-cgit v0.7.2-37-g538c