diff --git a/pkgs/development/libraries/pdf2htmlex/default.nix b/pkgs/development/libraries/pdf2htmlex/default.nix
new file mode 100644
index 000000000000..597385aa9fa3
--- /dev/null
+++ b/pkgs/development/libraries/pdf2htmlex/default.nix
@@ -0,0 +1,27 @@
+{stdenv, fetchurl, cmake, poppler, fontforge, unzip, pkgconfig, python}:
+
+stdenv.mkDerivation rec {
+ version = "0.8.1";
+ name = "pdf2htmlex-${version}";
+
+ src = fetchurl {
+ url = "https://github.com/coolwanglu/pdf2htmlEX/archive/v${version}.zip";
+ sha256 = "0v8x03vq46ng9s27ryn76lcsjgpxgak6062jnx59lnyz856wvp8a";
+ };
+
+ buildInputs = [
+ cmake
+ unzip
+ poppler
+ fontforge
+ pkgconfig
+ python
+ ];
+
+ meta = with stdenv.lib; {
+ description = "Convert PDF to HTML without losing text or format. ";
+ license = licenses.gpl3;
+ maintainers = [ maintainers.iElectric ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch
new file mode 100644
index 000000000000..596a3aea6749
--- /dev/null
+++ b/pkgs/development/libraries/pdf2htmlex/pdf2xml.patch
@@ -0,0 +1,48 @@
+diff -rc pdf2xml/pdf2xml/Makefile.linux pdf2xml-new/pdf2xml/Makefile.linux
+*** pdf2xml/Makefile.linux 2008-02-07 17:43:10.000000000 +0100
+--- pdf2xml-new/Makefile.linux 2010-08-25 15:41:23.000000000 +0200
+***************
+*** 30,36 ****
+
+
+ # Executable name
+! PDFTOXMLEXE=pdftoxml.exe
+
+ # Main target
+ all: pdftoxmlEXE
+--- 30,36 ----
+
+
+ # Executable name
+! PDFTOXMLEXE=pdftoxml
+
+ # Main target
+ all: pdftoxmlEXE
+diff -rc pdf2xml/pdf2xml/src/pdftoxml.cc pdf2xml-new/pdf2xml/src/pdftoxml.cc
+*** pdf2xml/src/pdftoxml.cc 2010-04-26 10:58:01.000000000 +0200
+--- pdf2xml-new/src/pdftoxml.cc 2010-08-25 15:36:15.000000000 +0200
+***************
+*** 11,21 ****
+ //
+ //===========================================================================
+
+ #include
+- #include
+ #include
+ #include
+! #include
+ #include "parseargs.h"
+ #include "GString.h"
+ #include "gmem.h"
+--- 11,21 ----
+ //
+ //===========================================================================
+
++ #include
+ #include
+ #include
+ #include
+! #include
+ #include "parseargs.h"
+ #include "GString.h"
+ #include "gmem.h"
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 2512979bfa3d..1d796789210c 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -6,11 +6,11 @@
}:
stdenv.mkDerivation rec {
- name = "poppler-0.18.4";
+ name = "poppler-0.22.4";
src = fetchurl {
url = "${meta.homepage}${name}.tar.gz";
- sha256 = "0bnl05al7mjndp2h0355946j59nfw76f5v0x57d47q68rm412hik";
+ sha256 = "0fz1vk0rbxvnv7ssj8l910k1rx0gjhzl5wr7hkdf4r9jwqs8yhsg";
};
propagatedBuildInputs =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a3082392d94..bb646a7af859 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4867,6 +4867,8 @@ let
pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
+ pdf2htmlex = callPackage ../development/libraries/pdf2htmlex {} ;
+
phonon = callPackage ../development/libraries/phonon { };
phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { };