Merge pull request #336608 from LeSuisse/mupdf-1.17-drop

diff -ruN mupdf-1.14.0-source.orig/Makerules mupdf-1.14.0-source/Makerules

--- mupdf-1.14.0-source.orig/Makerules	2018-11-02 06:57:12.114012496 +0100

+++ mupdf-1.14.0-source/Makerules	2018-11-02 10:11:56.717232992 +0100

@@ -80,13 +80,6 @@

   HAVE_GLUT := yes

   SYS_GLUT_CFLAGS := -Wno-deprecated-declarations

   SYS_GLUT_LIBS := -framework GLUT -framework OpenGL

-  CC = xcrun cc

-  AR = xcrun ar

-  LD = xcrun ld

-  RANLIB = xcrun ranlib

-

-else ifeq ($(OS),Linux)

-  HAVE_OBJCOPY := yes

   ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)

 	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)

@@ -119,12 +112,6 @@

 	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)

   endif

-  HAVE_GLUT := yes

-  ifeq ($(HAVE_GLUT),yes)

-	SYS_GLUT_CFLAGS :=

-	SYS_GLUT_LIBS := -lglut -lGL

-  endif

-

   HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)

   ifeq ($(HAVE_X11),yes)

 	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)

{ stdenv, lib, fetchurl, pkg-config, freetype, harfbuzz, openjpeg

, jbig2dec, libjpeg , darwin

, enableX11 ? true, libX11, libXext, libXi, libXrandr

, enableCurl ? true, curl, openssl

, enableGL ? true, libglut, libGLU

}:

let

  # OpenJPEG version is hardcoded in package source

  openJpegVersion = with stdenv;

    lib.versions.majorMinor (lib.getVersion openjpeg);

in stdenv.mkDerivation rec {

  version = "1.17.0";

  pname = "mupdf";

  src = fetchurl {

    url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";

    sha256 = "13nl9nrcx2awz9l83mlv2psi1lmn3hdnfwxvwgwiwbxlkjl3zqq0";

  };

  patches =

    # Use shared libraries to decrease size

    lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch

    ++ lib.optional stdenv.isDarwin ./darwin.patch

  ;

  postPatch = ''

    sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c

  '';

  makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];

  nativeBuildInputs = [ pkg-config ];

  buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg libglut libGLU ]

                ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]

                ++ lib.optionals enableCurl [ curl openssl ]

                ++ lib.optionals enableGL (

                  if stdenv.isDarwin then

                    with darwin.apple_sdk.frameworks; [ GLUT OpenGL ]

                  else

                    [ libglut libGLU ])

                ;

  outputs = [ "bin" "dev" "out" "man" "doc" ];

  preConfigure = ''

    # Don't remove mujs because upstream version is incompatible

    rm -rf thirdparty/{curl,freetype,glfw,harfbuzz,jbig2dec,libjpeg,openjpeg,zlib}

  '';

  postInstall = ''

    mkdir -p "$out/lib/pkgconfig"

    cat >"$out/lib/pkgconfig/mupdf.pc" <<EOF

    prefix=$out

    libdir=$out/lib

    includedir=$out/include

    Name: mupdf

    Description: Library for rendering PDF documents

    Version: ${version}

    Libs: -L$out/lib -lmupdf -lmupdf-third

    Cflags: -I$dev/include

    EOF

    moveToOutput "bin" "$bin"

    ln -s "$bin/bin/mupdf-x11" "$bin/bin/mupdf"

    mkdir -p $bin/share/applications

    cat > $bin/share/applications/mupdf.desktop <<EOF

    [Desktop Entry]

    Type=Application

    Version=1.0

    Name=mupdf

    Comment=PDF viewer

    Exec=$bin/bin/mupdf-x11 %f

    Terminal=false

    MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip

    EOF

  '';

  enableParallelBuilding = true;

  meta = with lib; {

    homepage = "https://mupdf.com";

    description = "Lightweight PDF, XPS, and E-book viewer and toolkit written in portable C";

    license = licenses.agpl3Plus;

    maintainers = with maintainers; [ fpletz ];

    platforms = platforms.unix;

    knownVulnerabilities = [

      "CVE-2020-26519: denial of service when parsing JBIG2"

      "CVE-2017-5991: NULL pointer dereference"

    ];

  };

}

--- mupdf-1.14.0-source.orig/Makefile	2018-11-02 06:57:12.114012496 +0100

+++ mupdf-1.14.0-source/Makefile	2018-11-02 09:57:10.067945307 +0100

@@ -20,7 +20,7 @@

 # Do not specify CFLAGS or LIBS on the make invocation line - specify

 # XCFLAGS or XLIBS instead. Make ignores any lines in the makefile that

 # set a variable that was set on the command line.

-CFLAGS += $(XCFLAGS) -Iinclude

+CFLAGS += $(XCFLAGS) -Iinclude -fPIC

 LIBS += $(XLIBS) -lm

 ifneq ($(threading),no)

@@ -190,17 +190,21 @@

 # --- Library ---

-MUPDF_LIB = $(OUT)/libmupdf.a

-THIRD_LIB = $(OUT)/libmupdf-third.a

-THREAD_LIB = $(OUT)/libmupdf-threads.a

-PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a

+MUPDF_LIB = $(OUT)/libmupdf.so

+THIRD_LIB = $(OUT)/libmupdf-third.so

+THREAD_LIB = $(OUT)/libmupdf-threads.so

+PKCS7_LIB = $(OUT)/libmupdf-pkcs7.so

-$(MUPDF_LIB) : $(MUPDF_OBJ)

+$(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_LIB) $(THREAD_LIB)

+	$(LINK_CMD) $(THIRD_LIBS) -shared -Wl,-soname -Wl,libmupdf.so -Wl,--no-undefined

 $(THIRD_LIB) : $(THIRD_OBJ)

+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-third.so -Wl,--no-undefined

 $(THREAD_LIB) : $(THREAD_OBJ)

+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-threads.so -Wl,--no-undefined -lpthread

 $(PKCS7_LIB) : $(PKCS7_OBJ)

+	$(LINK_CMD) -shared -Wl,-soname -Wl,libmupdf-pkcs7.so

-INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB)

+INSTALL_LIBS := $(MUPDF_LIB) $(THIRD_LIB) $(THREAD_LIB) $(PKCS7_LIB)

 # --- Main tools and viewers ---

  mpdevil = plattenalbum; # Added 2024-05-22

  mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10

  mumble_git = throw "'mumble_git' has been renamed to/replaced by 'pkgs.mumble'"; # Converted to throw 2023-09-10

  mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22

  murmur_git = throw "'murmur_git' has been renamed to/replaced by 'pkgs.murmur'"; # Converted to throw 2023-09-10

  mutt-with-sidebar = mutt; # Added 2022-09-17

  mysql-client = hiPrio mariadb.client;

    enableX11 = false;

    enableGL = false;

  };

  mupdf_1_17 = callPackage ../applications/misc/mupdf/1.17 { };

  muso = callPackage ../applications/audio/muso {

    inherit (darwin.apple_sdk.frameworks) CoreServices;