From c3d55a8ec98f6e596338ce39c719ddde33410481 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Wed, 6 Jun 2012 00:28:12 +0200
Subject: [PATCH] poppler: rebuild against libpng-1.5.

---
 srcpkgs/poppler/poppler-cpp.rshlibs  |  2 +-
 srcpkgs/poppler/poppler-glib.rshlibs |  2 +-
 srcpkgs/poppler/poppler.rshlibs      |  2 +-
 srcpkgs/poppler/template             | 18 ++++++------------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/poppler/poppler-cpp.rshlibs b/srcpkgs/poppler/poppler-cpp.rshlibs
index 46e0bbde01..cc27a2a129 100644
--- a/srcpkgs/poppler/poppler-cpp.rshlibs
+++ b/srcpkgs/poppler/poppler-cpp.rshlibs
@@ -1,5 +1,4 @@
 libjpeg.so.8
-libpng14.so.14
 libcurl.so.4
 libfreetype.so.6
 libfontconfig.so.1
@@ -11,3 +10,4 @@ libgcc_s.so.1
 libtiff.so.5
 libpoppler.so.25
 liblcms2.so.2
+libpng15.so.15
diff --git a/srcpkgs/poppler/poppler-glib.rshlibs b/srcpkgs/poppler/poppler-glib.rshlibs
index f6fed1bd95..9de80980ca 100644
--- a/srcpkgs/poppler/poppler-glib.rshlibs
+++ b/srcpkgs/poppler/poppler-glib.rshlibs
@@ -1,5 +1,4 @@
 libjpeg.so.8
-libpng14.so.14
 libcurl.so.4
 libgobject-2.0.so.0
 libglib-2.0.so.0
@@ -14,3 +13,4 @@ libgcc_s.so.1
 libtiff.so.5
 libpoppler.so.25
 liblcms2.so.2
+libpng15.so.15
diff --git a/srcpkgs/poppler/poppler.rshlibs b/srcpkgs/poppler/poppler.rshlibs
index fbbb4b8138..36492789f3 100644
--- a/srcpkgs/poppler/poppler.rshlibs
+++ b/srcpkgs/poppler/poppler.rshlibs
@@ -1,5 +1,4 @@
 libjpeg.so.8
-libpng14.so.14
 libcurl.so.4
 libfreetype.so.6
 libfontconfig.so.1
@@ -10,3 +9,4 @@ libc.so.6
 libgcc_s.so.1
 libtiff.so.5
 liblcms2.so.2
+libpng15.so.15
diff --git a/srcpkgs/poppler/template b/srcpkgs/poppler/template
index 0fc34f1185..23f29e963f 100644
--- a/srcpkgs/poppler/template
+++ b/srcpkgs/poppler/template
@@ -1,18 +1,19 @@
 # Template build file for 'poppler'.
 pkgname=poppler
 version=0.20.0
-homepage="http://poppler.freedesktop.org"
-distfiles="${homepage}/$pkgname-$version.tar.gz"
+revision=3
 build_style=gnu-configure
 configure_args="--enable-zlib --enable-libcurl --enable-libjpeg
 --enable-libtiff --disable-libopenjpeg --enable-cairo-output
 --enable-xpdf-headers --disable-poppler-qt4 --disable-gtk-test"
-makedepends="pkg-config gobject-introspection tiff-devel lcms2-devel libcurl-devel"
+makedepends="pkg-config libpng-devel>=1.5.10 gobject-introspection tiff-devel lcms2-devel libcurl-devel"
 fulldepends="poppler-data"
-revision=2
+subpackages="poppler-glib poppler-glib-devel poppler-utils poppler-cpp poppler-cpp-devel poppler-devel"
 short_desc="PDF rendering library"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
+homepage="http://poppler.freedesktop.org"
+distfiles="${homepage}/$pkgname-$version.tar.gz"
 checksum=b2e3253c2f4af248a2ffaac29161de6e462c587031e7875287b9956b45a0570d
 long_desc="
  This is poppler, a PDF rendering library. It is a fork of the xpdf
@@ -21,11 +22,4 @@ long_desc="
  Poppler provides PDF rendering functionality as a shared library,
  to centralize the maintenence effort and to reduce duplicated
  effort. And the poppler developers would like to move libpoppler
- forward in a number of areas that doesn't fit within the goals of
- xpdf."
-
-subpackages="$pkgname-glib $pkgname-glib-devel $pkgname-utils"
-subpackages="$subpackages $pkgname-cpp $pkgname-cpp-devel"
-subpackages="$subpackages $pkgname-devel"
-
-
+ forward in a number of areas that doesn't fit within the goals of xpdf."