pyrox.dev
mupdf: 1.13.0 -> 1.14.0
Changelog: https://mupdf.com/release_history.html
danieldk.tngl.sh
+27
-44
pkgs/applications/misc/mupdf/darwin.patch
+27
-44
pkgs/applications/misc/mupdf/darwin.patch
···
1
-
diff --git a/Makerules b/Makerules
2
-
--- a/Makerules
3
-
+++ b/Makerules
4
-
@@ -81,22 +81,10 @@ HAVE_GLUT ?= yes
5
-
SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
6
-
SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
7
-
8
-
-CC = xcrun cc
9
-
-AR = xcrun ar
10
-
-LD = xcrun ld
11
-
-RANLIB_CMD = xcrun ranlib $@
12
-
-
13
-
-# Linux uses pkg-config for system libraries.
14
-
-else ifeq "$(OS)" "Linux"
1
+
diff -ruN mupdf-1.14.0-source.orig/Makerules mupdf-1.14.0-source/Makerules
2
+
--- mupdf-1.14.0-source.orig/Makerules 2018-11-02 06:57:12.114012496 +0100
3
+
+++ mupdf-1.14.0-source/Makerules 2018-11-02 10:11:56.717232992 +0100
4
+
@@ -80,13 +80,6 @@
5
+
HAVE_GLUT := yes
6
+
SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
7
+
SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
8
+
- CC = xcrun cc
9
+
- AR = xcrun ar
10
+
- LD = xcrun ld
11
+
- RANLIB = xcrun ranlib
15
12
-
16
-
HAVE_PTHREAD := yes
17
-
SYS_PTHREAD_CFLAGS :=
18
-
SYS_PTHREAD_LIBS := -lpthread
13
+
-else ifeq ($(OS),Linux)
14
+
- HAVE_OBJCOPY := yes
15
+
16
+
ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
17
+
SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
18
+
@@ -119,12 +112,6 @@
19
+
SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
20
+
endif
19
21
20
-
-HAVE_GLUT := yes
21
-
-SYS_GLUT_CFLAGS :=
22
-
-SYS_GLUT_LIBS := -lglut -lGL
22
+
- HAVE_GLUT := yes
23
+
- ifeq ($(HAVE_GLUT),yes)
24
+
- SYS_GLUT_CFLAGS :=
25
+
- SYS_GLUT_LIBS := -lglut -lGL
26
+
- endif
23
27
-
24
-
ifeq "$(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)" "yes"
25
-
HAVE_LIBCRYPTO := yes
26
-
SYS_LIBCRYPTO_CFLAGS := -DHAVE_LIBCRYPTO $(shell pkg-config --cflags libcrypto)
27
-
@@ -113,7 +101,7 @@ SYS_CURL_CFLAGS += $(shell pkg-config --cflags openssl)
28
-
SYS_CURL_DEPS += $(shell pkg-config --libs openssl)
29
-
endif
30
-
endif
31
-
-SYS_CURL_DEPS += -lpthread -lrt
32
-
+SYS_CURL_DEPS += -lpthread
33
-
34
-
ifeq "$(shell pkg-config --exists x11 xext && echo yes)" "yes"
35
-
HAVE_X11 := yes
36
-
diff --git a/platform/gl/gl-main.c b/platform/gl/gl-main.c
37
-
index d58f7ba..808af18 100644
38
-
--- a/platform/gl/gl-main.c
39
-
+++ b/platform/gl/gl-main.c
40
-
@@ -16,6 +16,7 @@ void glutExit(void) {}
41
-
void glutMouseWheelFunc(void *fn) {}
42
-
void glutInitErrorFunc(void *fn) {}
43
-
void glutInitWarningFunc(void *fn) {}
44
-
+#define glutSetOption(X,Y)
45
-
#endif
46
-
47
-
enum
28
+
HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
29
+
ifeq ($(HAVE_X11),yes)
30
+
X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
+6
-12
pkgs/applications/misc/mupdf/default.nix
+6
-12
pkgs/applications/misc/mupdf/default.nix
···
1
-
{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, freetype, harfbuzz, openjpeg
1
+
{ stdenv, lib, fetchurl, pkgconfig, freetype, harfbuzz, openjpeg
2
2
, jbig2dec, libjpeg , darwin
3
3
, enableX11 ? true, libX11, libXext, libXi, libXrandr
4
4
, enableCurl ? true, curl, openssl
···
14
14
15
15
16
16
in stdenv.mkDerivation rec {
17
-
version = "1.13.0";
17
+
version = "1.14.0";
18
18
name = "mupdf-${version}";
19
19
20
20
src = fetchurl {
21
21
url = "https://mupdf.com/downloads/archive/${name}-source.tar.gz";
22
-
sha256 = "02faww5bnjw76k6igrjzwf0lnw4xd9ckc8d6ilc3c4gfrdi6j707";
22
+
sha256 = "093p7lv6pgyymagn28n58fs0np928r0i5p2az9cc4gwccwx4hhy4";
23
23
};
24
24
25
-
patches = [
26
-
(fetchpatch {
27
-
name = "CVE-2018-10289.patch";
28
-
url = "https://bugs.ghostscript.com/attachment.cgi?id=15230";
29
-
sha256 = "0jmpacxd9930g6k57kda9jrcrbk75whdlv8xwmqg5jwn848qvy4q";
30
-
})
31
-
]
25
+
patches =
32
26
# Use shared libraries to decrease size
33
-
++ stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.13-shared_libs-1.patch
27
+
stdenv.lib.optional (!stdenv.isDarwin) ./mupdf-1.14-shared_libs.patch
34
28
++ stdenv.lib.optional stdenv.isDarwin ./darwin.patch
35
29
;
36
30
···
38
32
sed -i "s/__OPENJPEG__VERSION__/${openJpegVersion}/" source/fitz/load-jpx.c
39
33
'';
40
34
41
-
makeFlags = [ "prefix=$(out)" ];
35
+
makeFlags = [ "prefix=$(out) USE_SYSTEM_LIBS=yes" ];
42
36
nativeBuildInputs = [ pkgconfig ];
43
37
buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ]
44
38
++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ]