diff options
author | Leo Famulari <leo@famulari.name> | 2017-12-21 13:58:35 -0500 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-12-21 13:58:35 -0500 |
commit | f76fc968669721e3baa6a0662da8e9e9f5da66cf (patch) | |
tree | ae58b84d89f144fbec974b7e75b24574f99b2e33 /gnu/packages/patches/mupdf-build-with-latest-openjpeg.patch | |
parent | 24ee3b28c6def91e4e41dd46441a029ab01b6d00 (diff) | |
parent | 5dc0e0b055ce2ab12c40066cee34511cd7a5cf03 (diff) | |
download | gnu-guix-f76fc968669721e3baa6a0662da8e9e9f5da66cf.tar gnu-guix-f76fc968669721e3baa6a0662da8e9e9f5da66cf.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/mupdf-build-with-latest-openjpeg.patch')
-rw-r--r-- | gnu/packages/patches/mupdf-build-with-latest-openjpeg.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/gnu/packages/patches/mupdf-build-with-latest-openjpeg.patch b/gnu/packages/patches/mupdf-build-with-latest-openjpeg.patch new file mode 100644 index 0000000000..d5c9c60242 --- /dev/null +++ b/gnu/packages/patches/mupdf-build-with-latest-openjpeg.patch @@ -0,0 +1,27 @@ +Make it possible to build MuPDF with OpenJPEG 2.3, which is the latest +release series and contains many important bug fixes. + +Patch adapted from Debian: + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=745246 + +And related to this upstream commit: + +http://git.ghostscript.com/?p=mupdf.git;a=commit;h=f88bfe2e62dbadb96d4f52d7aa025f0a516078da + +diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c +index 65699ba..ea84778 100644 +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -445,11 +445,6 @@ fz_load_jpx_info(fz_context *ctx, const unsigned char *data, size_t size, int *w + + #else /* HAVE_LURATECH */ + +-#define OPJ_STATIC +-#define OPJ_HAVE_INTTYPES_H +-#if !defined(_MSC_VER) || _MSC_VER >= 1600 +-#define OPJ_HAVE_STDINT_H +-#endif + #define USE_JPIP + + #include <openjpeg.h> |