Unverified Commit 3bbd1772 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #237846 from mweinelt/libe-book-icu-patch

libe-book: build with latest icu version
parents 13ab0007 a07a1272
Loading
Loading
Loading
Loading
+13 −7
Original line number Diff line number Diff line
@@ -15,11 +15,20 @@
stdenv.mkDerivation rec {
  pname = "libe-book";
  version = "0.1.3";

  src = fetchurl {
    url = "https://kent.dl.sourceforge.net/project/libebook/libe-book-${version}/libe-book-${version}.tar.xz";
    sha256 = "sha256-fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk=";
    url = "mirror://sourceforge/libebook/libe-book-${version}/libe-book-${version}.tar.xz";
    hash = "sha256-fo2P808ngxrKO8b5zFMsL5DSBXx3iWO4hP89HjTf4fk=";
  };

  # restore compatibility with icu68+
  postPatch = ''
    substituteInPlace src/lib/EBOOKCharsetConverter.cpp --replace \
      "TRUE, TRUE, &status)" \
      "true, true, &status)"
  '';
  nativeBuildInputs = [ pkg-config ];

  buildInputs = [
    gperf
    librevenge
@@ -30,12 +39,9 @@ stdenv.mkDerivation rec {
    zlib
    liblangtag
  ];
  # Boost 1.59 compatibility fix
  # Attempt removing when updating
  postPatch = ''
    sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
  '';

  env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-function";

  meta = with lib; {
    description = "Library for import of reflowable e-book formats";
    license = licenses.lgpl21Plus;
+1 −3
Original line number Diff line number Diff line
@@ -22066,9 +22066,7 @@ with pkgs;
  liblscp = callPackage ../development/libraries/liblscp { };
  libe-book = callPackage ../development/libraries/libe-book {
    icu = icu67;
  };
  libe-book = callPackage ../development/libraries/libe-book { };
  libemf2svg = callPackage ../development/libraries/libemf2svg { };