diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-04-18 18:30:13 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-04-18 18:30:13 +0200 |
| commit | 8c4b4b65624198261d6e583214da9aa7c5524290 (patch) | |
| tree | 5950b2d9e7608d154109b69dc349d1ab2b3ab371 /gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch | |
| parent | 40522a7e89bc169233ec724592c9439e8004f4ad (diff) | |
| parent | f8818360d5c185543b4bd1ad1c3c3ad7191af0c4 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch')
| -rw-r--r-- | gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch b/gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch index d97c1cb348..0b5b735ff3 100644 --- a/gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch +++ b/gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch @@ -13,17 +13,15 @@ diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c index 6b92e5c..72dea50 100644 --- a/source/fitz/load-jpx.c +++ b/source/fitz/load-jpx.c -@@ -1,13 +1,5 @@ - #include "mupdf/fitz.h" +@@ -444,11 +444,6 @@ + + #else /* HAVE_LURATECH */ --/* Without the definition of OPJ_STATIC, compilation fails on windows -- * due to the use of __stdcall. We believe it is required on some -- * linux toolchains too. */ -#define OPJ_STATIC --#ifndef _MSC_VER +-#define OPJ_HAVE_INTTYPES_H +-#if !defined(_WIN32) && !defined(_WIN64) -#define OPJ_HAVE_STDINT_H -#endif -- - #include <openjpeg.h> + #define USE_JPIP - static void fz_opj_error_callback(const char *msg, void *client_data) + #include <openjpeg.h> |