Merge pull request #102525 from freezeboy/remove-pdf2htmlEx

pdf2htmlEx: remove
This commit is contained in:
Daniël de Kok 2020-11-03 13:17:36 +01:00 committed by GitHub
commit 2730e02a90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 1 additions and 67 deletions

View File

@ -1,17 +0,0 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3fdabb0..378621a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,12 @@ include_directories(${FONTFORGE_INCLUDE_DIRS})
link_directories(${FONTFORGE_LIBRARY_DIRS})
set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES})
+# add glib dependency
+pkg_check_modules(GLIB REQUIRED glib-2.0)
+include_directories(${GLIB_INCLUDE_DIRS})
+link_directories(${GLIB_INCLUDE_DIRS})
+set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${GLIB_LIBRARIES})
+
# debug build flags (overwrite default cmake debug flags)
set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg")
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pg")

View File

@ -1,48 +0,0 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, poppler, xorg, pcre, python, glib, fontforge, cairo, pango, openjdk8
}:
stdenv.mkDerivation {
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 = [
xorg.libpthreadstubs
xorg.libXdmcp
pcre
python
glib
cairo
pango
poppler
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;
broken = true; # 2018-09-08
};
}

View File

@ -368,6 +368,7 @@ mapAliases ({
parity = openethereum; # added 2020-08-01 parity = openethereum; # added 2020-08-01
parquet-cpp = arrow-cpp; # added 2018-09-08 parquet-cpp = arrow-cpp; # added 2018-09-08
pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04
pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03
perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 perlXMLParser = perlPackages.XMLParser; # added 2018-10-12
perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12
pgp-tools = signing-party; # added 2017-03-26 pgp-tools = signing-party; # added 2017-03-26

View File

@ -6331,8 +6331,6 @@ in
pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
pdf2htmlEX = callPackage ../tools/typesetting/pdf2htmlEX { };
pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; pdf2odt = callPackage ../tools/typesetting/pdf2odt { };
pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { }; pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { };