From 4cd7b284e8b122bec155bc98454817b18ca9bea3 Mon Sep 17 00:00:00 2001
From: Lprndn <lprndn@gmail.com>
Date: Wed, 1 Feb 2017 14:59:35 +0100
Subject: [PATCH 1/2] fontforge-gtk: Add support for libspiro.

Add Spiro toolkit in fontforge-gtk for designing fonts.
libspiro: Init at c26afeb.
---
 .../development/libraries/libspiro/default.nix | 18 ++++++++++++++++++
 pkgs/tools/misc/fontforge/default.nix          |  2 ++
 pkgs/top-level/all-packages.nix                |  3 +++
 3 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/libspiro/default.nix

diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix
new file mode 100644
index 00000000000..dcec6b058fc
--- /dev/null
+++ b/pkgs/development/libraries/libspiro/default.nix
@@ -0,0 +1,18 @@
+{stdenv, pkgconfig, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "libspiro-${version}";
+  version = "0.5.20150702";
+  src = fetchurl {
+    url = "https://github.com/fontforge/libspiro/releases/download/${version}/${name}.tar.gz";
+    sha256 = "0z4zpxd3nwwchqdsbmmjbp13aw5jg8v5p1993190bpykkrjlh6nv";
+  };
+
+  nativeBuildInputs = [pkgconfig];
+
+  meta = with stdenv.lib; {
+    description = "A library that simplifies the drawing of beautiful curves";
+    homepage = "https://github.com/fontforge/libspiro";
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/tools/misc/fontforge/default.nix b/pkgs/tools/misc/fontforge/default.nix
index 2cccee0a4e3..90d17ba5281 100644
--- a/pkgs/tools/misc/fontforge/default.nix
+++ b/pkgs/tools/misc/fontforge/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub, fetchpatch, lib
 , autoconf, automake, gnum4, libtool, perl, gnulib, uthash, pkgconfig, gettext
 , python, freetype, zlib, glib, libungif, libpng, libjpeg, libtiff, libxml2, pango
+, withSpiro ? false, libspiro
 , withGTK ? false, gtk2
 , withPython ? true
 , Carbon ? null, Cocoa ? null
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
     autoconf automake gnum4 libtool perl pkgconfig gettext uthash
     python freetype zlib glib libungif libpng libjpeg libtiff libxml2
   ]
+    ++ lib.optionals withSpiro [libspiro]
     ++ lib.optionals withGTK [ gtk2 pango ]
     ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90e44c9819a..f246df2874f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1738,6 +1738,7 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   });
   fontforge-gtk = callPackage ../tools/misc/fontforge {
+    withSpiro = true;
     withGTK = true;
     gtk2 = gtk2-x11;
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
@@ -8495,6 +8496,8 @@ with pkgs;
 
   libsoup = callPackage ../development/libraries/libsoup { };
 
+  libspiro = callPackage ../development/libraries/libspiro {};
+
   libssh = callPackage ../development/libraries/libssh { };
 
   libssh2 = callPackage ../development/libraries/libssh2 { };

From 8a534d53281c5aead91a67ca526d8cb7f27a14c5 Mon Sep 17 00:00:00 2001
From: Lprndn <lprndn@gmail.com>
Date: Sun, 12 Feb 2017 16:32:14 +0100
Subject: [PATCH 2/2] pdf2htmlEX: Switch from fontforge-gtk to fontforge.

---
 pkgs/tools/typesetting/pdf2htmlEX/default.nix | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/tools/typesetting/pdf2htmlEX/default.nix

diff --git a/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
new file mode 100644
index 00000000000..299f075115a
--- /dev/null
+++ b/pkgs/tools/typesetting/pdf2htmlEX/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig
+, poppler, xlibs, pcre, python, glib, fontforge, cairo, pango, openjdk8
+}:
+
+stdenv.mkDerivation rec {
+  name = "pdf2htmlEX-0.14.6";
+
+  src = fetchFromGitHub {
+    repo   = "pdf2htmlEX";
+    owner  = "coolwanglu";
+    rev    = "v0.14.6";
+    sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78";
+  };
+
+  patches = [ ./add-glib-cmake.patch ];
+
+  cmakeFlags = [ "-DENABLE_SVG=ON" ];
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkgconfig
+  ];
+
+  buildInputs = [
+    xlibs.libpthreadstubs
+    xlibs.libXdmcp
+    pcre
+    python
+    glib
+    cairo
+    pango
+    (poppler.override { withData = true; })
+    fontforge
+    openjdk8
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Render PDF files to beautiful HTML";
+    homepage    = "https://github.com/coolwanglu/pdf2htmlEX";
+    license     = licenses.gpl3Plus;
+    maintainers = [ maintainers.taktoa ];
+    platforms   = with platforms; linux;
+  };
+}