From b93fed7f312a0d395aefaea5f82930d340322554 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 14 Dec 2010 13:30:06 +0000
Subject: [PATCH] poppler-0.14.5

svn path=/nixpkgs/trunk/; revision=25122
---
 .../development/libraries/poppler/default.nix | 35 +++++++++----------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 7c9223a91fd..918f84e3b74 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,34 +1,27 @@
-{ fetchurl, stdenv, qt4Support ? false, qt4 ? null
-, cairo, freetype, fontconfig, zlib, libjpeg
-, pkgconfig, glib, gtk }:
-
-assert qt4Support -> (qt4 != null);
+{ fetchurl, stdenv, qt4Support ? false, qt4, cairo, freetype, fontconfig, zlib,
+  libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg,
+  libxml2, pkgconfig, glib, gtk, cmake, lcms }:
 
 stdenv.mkDerivation rec {
-  name = "poppler-0.12.3";
+  name = "poppler-0.14.5";
 
   src = fetchurl {
-    url = "http://poppler.freedesktop.org/${name}.tar.gz";
-    sha256 = "1k7vilpz0ipnmw9dfpb3rqkhlm4rqcnkn3bhhp14di2h55nzwkvs";
+    url = "${meta.homepage}${name}.tar.gz";
+    sha256 = "0k41cj0yp3l7854y1hlghn2cgqmqq6hw5iz8i84q0w0s9iy321f8";
   };
 
-  buildInputs = [pkgconfig zlib glib cairo freetype fontconfig libjpeg gtk]
+  propagatedBuildInputs = [zlib glib cairo freetype fontconfig libjpeg gtk lcms
+    pixman curl libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc]
     ++ (if qt4Support then [qt4] else []);
 
-  configureFlags =
-    ''
-      --enable-exceptions --enable-cairo --enable-splash
-      --enable-poppler-glib --enable-zlib --enable-xpdf-headers
-    ''
-    + (if qt4Support then "--enable-qt-poppler" else "--disable-qt-poppler");
-
-  patches = [ ./GDir-const.patch ];
+  buildInputs = [ pkgconfig cmake ];
 
-  preConfigure = "sed -e '/jpeg_incdirs/s@/usr@${libjpeg}@' -i configure";
+  cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";
 
   # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
   # such as `../../../test/unittestcases/UseNone.pdf'.
-  doCheck = !qt4Support;
+#doCheck = !qt4Support;
+  checkTarget = "test";
 
   meta = {
     homepage = http://poppler.freedesktop.org/;
@@ -38,6 +31,10 @@ stdenv.mkDerivation rec {
       Poppler is a PDF rendering library based on the xpdf-3.0 code base.
     '';
 
+    platforms = if qt4Support
+      then qt4.meta.platforms
+      else stdenv.lib.platforms.all;
+
     license = "GPLv2";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd57be7a560..535271c7b03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3788,6 +3788,7 @@ let
   policykit = callPackage ../development/libraries/policykit { };
 
   poppler = callPackage ../development/libraries/poppler {
+    stdenv = stdenv2;
     qt4Support = false;
   };