# HG changeset patch
# User Antoine Bodin <gokhlayeh@slitaz.org>
# Date 1324259370 -3600
# Node ID 52f5e479761849c503f3bf2d1165bdfc1ed562f0
# Parent  a612b276a27c8dda0588ba9d3976183e2bc790c7
Up: poppler 0.18.2; poppler-data 0.4.5 (fix build of epdfview; thank godane)

diff -r a612b276a27c -r 52f5e4797618 poppler-apps/receipt
--- a/poppler-apps/receipt	Mon Dec 19 02:49:30 2011 +0100
+++ b/poppler-apps/receipt	Mon Dec 19 02:49:30 2011 +0100
@@ -1,12 +1,12 @@
 # SliTaz package receipt.
 
 PACKAGE="poppler-apps"
-VERSION="0.14.5"
+VERSION="0.18.2"
 CATEGORY="office"
 SHORT_DESC="Poppler utilities to manipulate PDF file."
 MAINTAINER="pankso@slitaz.org"
 WANTED="poppler"
-DEPENDS="fontconfig poppler zlib libpng gcc-lib-base"
+DEPENDS="fontconfig poppler cairo zlib libpng gcc-lib-base"
 WEB_SITE="http://poppler.freedesktop.org/"
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r a612b276a27c -r 52f5e4797618 poppler-data/receipt
--- a/poppler-data/receipt	Mon Dec 19 02:49:30 2011 +0100
+++ b/poppler-data/receipt	Mon Dec 19 02:49:30 2011 +0100
@@ -1,12 +1,12 @@
 # SliTaz package receipt.
 
 PACKAGE="poppler-data"
-VERSION="0.4.4"
+VERSION="0.4.5"
 CATEGORY="office"
 SHORT_DESC="Poppler encoding data."
 MAINTAINER="rocky@slitaz.org"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-DEPENDS="poppler"
+DEPENDS=""
 WEB_SITE="http://poppler.freedesktop.org/"
 WGET_URL="http://poppler.freedesktop.org/$TARBALL"
 
@@ -14,7 +14,7 @@
 compile_rules()
 {
     cd $src
-    make datadir=/usr/share DESTDIR=$PWD/_pkg install
+    make datadir=/usr/share DESTDIR=$DESTDIR install
 }
 
 # Rules to gen a SliTaz package suitable for Tazpkg.
diff -r a612b276a27c -r 52f5e4797618 poppler-dev/receipt
--- a/poppler-dev/receipt	Mon Dec 19 02:49:30 2011 +0100
+++ b/poppler-dev/receipt	Mon Dec 19 02:49:30 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="poppler-dev"
-VERSION="0.14.5"
+VERSION="0.18.2"
 CATEGORY="development"
 SHORT_DESC="Poppler PDF rendering library devel files."
 MAINTAINER="pankso@slitaz.org"
diff -r a612b276a27c -r 52f5e4797618 poppler/receipt
--- a/poppler/receipt	Mon Dec 19 02:49:30 2011 +0100
+++ b/poppler/receipt	Mon Dec 19 02:49:30 2011 +0100
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="poppler"
-VERSION="0.14.5"
+VERSION="0.18.2"
 CATEGORY="office"
 SHORT_DESC="Poppler is a PDF rendering library."
 MAINTAINER="pankso@slitaz.org"
@@ -9,15 +9,17 @@
 WEB_SITE="http://poppler.freedesktop.org/"
 WGET_URL="http://poppler.freedesktop.org/$TARBALL"
 
-DEPENDS="expat freetype glib jpeg libxml2 xorg-libXdamage lcms \
-gcc-lib-base cairo"
-BUILD_DEPENDS="$DEPENDS expat-dev pkg-config jpeg-dev libxml2-dev \
-freetype-dev fontconfig-dev glib-dev lcms-dev zlib-dev"
+DEPENDS="expat freetype glib jpeg xorg-libXdamage lcms \
+gcc-lib-base cairo poppler-data"
+BUILD_DEPENDS="$DEPENDS expat-dev pkg-config jpeg-dev \
+freetype-dev fontconfig-dev glib-dev lcms-dev zlib-dev \
+automake"
 
 # Rules to configure and make the package.
 compile_rules()
 {
 	cd $src
+	autoreconf -fi
 	./configure \
 		--enable-zlib \
 		$CONFIGURE_ARGS &&
diff -r a612b276a27c -r 52f5e4797618 poppler/stuff/fix_cairo.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/poppler/stuff/fix_cairo.patch	Mon Dec 19 02:49:30 2011 +0100
@@ -0,0 +1,19 @@
+From 66ab373365b8f9060ff3d117bb677520e32c7e8e Mon Sep 17 00:00:00 2001
+From: Adrian Johnson <ajohnson@redneon.com>
+Date: Wed, 28 Sep 2011 11:50:23 +0000
+Subject: cairo: fix crash when using poppler_page_get_image()
+
+---
+diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
+index effa9dd..0f202a5 100644
+--- a/poppler/CairoOutputDev.h
++++ b/poppler/CairoOutputDev.h
+@@ -434,6 +434,7 @@ public:
+   virtual void stroke(GfxState *state) { }
+   virtual void fill(GfxState *state) { }
+   virtual void eoFill(GfxState *state) { }
++  virtual void clipToStrokePath(GfxState *state) { }
+   virtual GBool tilingPatternFill(GfxState *state, Catalog *cat, Object *str,
+ 				  double *pmat, int paintType, int tilingType, Dict *resDict,
+ 				  double *mat, double *bbox,
+