amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: mupdf: Update to 1.11.

Browse source 
Also delete two stray patches that were added in
92ae98e2a0 and lost in a subsequent merge
(mupdf/fixed was already gone at e90e0fad1b).

* gnu/packages/patches/mupdf-CVE-2017-5896.patch,
gnu/packages/patches/mupdf-CVE-2017-5991.patch,
gnu/packages/patches/mupdf-mujs-CVE-2016-10132.patch,
gnu/packages/patches/mupdf-mujs-CVE-2016-10133.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
* gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch: Adjust.
* gnu/packages/pdf.scm (mupdf): Update to 1.11.
[source]: Remove mujs patches. Adjust snippet to source rename.
This commit is contained in:
Marius Bakke 2017-04-14 11:52:11 +02:00
parent f46eb986c2
commit e5da4d8b40
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
7 changed files with 11 additions and 407 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/patches/mupdf-build-with-openjpeg-2.1.patch
View file

@ -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>