From a7b9ef8f4b77e9d7199f07b4adc59db843604c2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jul 2011 13:04:38 +0000
Subject: [PATCH] * Update Poppler to 0.16.7.
svn path=/nixpkgs/branches/kde-4.7/; revision=27703
---
.../development/libraries/poppler/default.nix | 26 ++++++++++++-------
pkgs/top-level/all-packages.nix | 3 ++-
2 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 918f84e3b748..3091c6497e54 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -1,18 +1,24 @@
-{ fetchurl, stdenv, qt4Support ? false, qt4, cairo, freetype, fontconfig, zlib,
- libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg,
- libxml2, pkgconfig, glib, gtk, cmake, lcms }:
+{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib
+, libjpeg, pixman, curl, libpthreadstubs, libXau, libXdmcp, openjpeg
+, libxml2, pkgconfig, cmake, lcms
+, gtkSupport ? false, glib ? null, gtk ? null
+, qt4Support ? false, qt4 ? null
+}:
stdenv.mkDerivation rec {
- name = "poppler-0.14.5";
+ name = "poppler-0.16.7";
src = fetchurl {
url = "${meta.homepage}${name}.tar.gz";
- sha256 = "0k41cj0yp3l7854y1hlghn2cgqmqq6hw5iz8i84q0w0s9iy321f8";
+ sha256 = "1k9by922qkn9pkkf03jjxxqhp4s0gmsgs6c8f4m19m1l5npyid7s";
};
- propagatedBuildInputs = [zlib glib cairo freetype fontconfig libjpeg gtk lcms
- pixman curl libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc]
- ++ (if qt4Support then [qt4] else []);
+ propagatedBuildInputs =
+ [ zlib cairo freetype fontconfig libjpeg lcms pixman curl
+ libpthreadstubs libXau libXdmcp openjpeg libxml2 stdenv.gcc.libc
+ ]
+ ++ stdenv.lib.optionals gtkSupport [ glib gtk ]
+ ++ stdenv.lib.optional qt4Support qt4;
buildInputs = [ pkgconfig cmake ];
@@ -20,9 +26,11 @@ stdenv.mkDerivation rec {
# XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
# such as `../../../test/unittestcases/UseNone.pdf'.
-#doCheck = !qt4Support;
+ #doCheck = !qt4Support;
checkTarget = "test";
+ enableParallelBuilding = true;
+
meta = {
homepage = http://poppler.freedesktop.org/;
description = "Poppler, a PDF rendering library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12b1cd4a6eb9..824c7268132d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4123,11 +4123,12 @@ let
policykit = callPackage ../development/libraries/policykit { };
poppler = callPackage ../development/libraries/poppler {
+ gtkSupport = true;
qt4Support = false;
};
popplerQt4 = poppler.override {
- inherit qt4;
+ gtkSupport = false;
qt4Support = true;
};