From 8db9fe47fec72ebecf75f6c8a8eb2cd0864786f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 8 Mar 2014 11:23:46 +0100
Subject: [PATCH] poppler_0_18: remove, only used by libreoffice

I need to test libreoffice still builds, so I push this to x-updates.
(I hate having to do such things to try a couple of jobs.)
---
 pkgs/development/libraries/poppler/0.18.nix | 53 ---------------------
 pkgs/top-level/all-packages.nix             |  8 ----
 2 files changed, 61 deletions(-)
 delete mode 100644 pkgs/development/libraries/poppler/0.18.nix

diff --git a/pkgs/development/libraries/poppler/0.18.nix b/pkgs/development/libraries/poppler/0.18.nix
deleted file mode 100644
index 123d229f2ba..00000000000
--- a/pkgs/development/libraries/poppler/0.18.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ fetchurl, stdenv, cairo, freetype, fontconfig, zlib
-, libjpeg, curl, libpthreadstubs, xorg, openjpeg
-, libxml2, pkgconfig, cmake, lcms, libiconvOrEmpty
-, glibSupport ? false, glib, gtk3Support ? false, gtk3 # gtk2 no longer accepted
-, qt4Support ? false, qt4 ? null
-}:
-
-stdenv.mkDerivation rec {
-  name = "poppler-0.18.4";
-
-  src = fetchurl {
-    url = "${meta.homepage}${name}.tar.gz";
-    sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik";
-  };
-
-  propagatedBuildInputs = with xorg;
-    [ zlib cairo freetype fontconfig libjpeg lcms curl
-      libpthreadstubs libxml2 stdenv.gcc.libc
-      libXau libXdmcp libxcb libXrender libXext
-      openjpeg
-    ]
-    ++ stdenv.lib.optional glibSupport glib
-    ++ stdenv.lib.optional gtk3Support gtk3
-    ++ stdenv.lib.optional qt4Support qt4;
-
-  nativeBuildInputs = [ pkgconfig cmake ] ++ libiconvOrEmpty;
-
-  cmakeFlags = "-DENABLE_XPDF_HEADERS=ON -DENABLE_LIBCURL=ON -DENABLE_ZLIB=ON";
-
-  patches = [ ./datadir_env.patch ];
-
-  # XXX: The Poppler/Qt4 test suite refers to non-existent PDF files
-  # such as `../../../test/unittestcases/UseNone.pdf'.
-  #doCheck = !qt4Support;
-  checkTarget = "test";
-
-  enableParallelBuilding = true;
-
-  meta = {
-    homepage = http://poppler.freedesktop.org/;
-    description = "Poppler, a PDF rendering library";
-
-    longDescription = ''
-      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 9441da57ccd..05bede0bfd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5437,13 +5437,6 @@ let
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
   popplerQt4 = poppler.poppler_qt4;
 
-  poppler_0_18 = callPackage ../development/libraries/poppler/0.18.nix {
-    lcms = lcms2;
-    glibSupport = true;
-    gtk3Support = false;
-    qt4Support  = false;
-  };
-
   popt = callPackage ../development/libraries/popt { };
 
   portaudio = callPackage ../development/libraries/portaudio {
@@ -8390,7 +8383,6 @@ let
         freefont_ttf xorg.fontmiscmisc xorg.fontbhttf
       ];
     };
-    poppler = poppler_0_18;
     clucene_core = clucene_core_2;
     lcms = lcms2;
     mdds = mdds_0_7_1;