From e50eed4a85c028f4c4e1e73c63cbb14ac1d22e24 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sun, 15 Jun 2014 11:59:59 +0200 Subject: [PATCH] Add fix for openjpeg2 --- mupdf-1.5-openjpeg.patch | 13 +++++++++++++ mupdf.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 mupdf-1.5-openjpeg.patch diff --git a/mupdf-1.5-openjpeg.patch b/mupdf-1.5-openjpeg.patch new file mode 100644 index 0000000..a61d9e0 --- /dev/null +++ b/mupdf-1.5-openjpeg.patch @@ -0,0 +1,13 @@ +diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c +index dd7bf9e..3a1c7a8 100644 +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -116,7 +116,7 @@ fz_load_jpx(fz_context *ctx, unsigned char *data, int size, fz_colorspace *defcs + opj_stream_set_read_function(stream, fz_opj_stream_read); + opj_stream_set_skip_function(stream, fz_opj_stream_skip); + opj_stream_set_seek_function(stream, fz_opj_stream_seek); +- opj_stream_set_user_data(stream, &sb); ++ opj_stream_set_user_data(stream, &sb, (opj_stream_free_user_data_fn) fclose); + /* Set the length to avoid an assert */ + opj_stream_set_user_data_length(stream, size); + diff --git a/mupdf.spec b/mupdf.spec index 4a18b42..8713eb3 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -1,12 +1,13 @@ Name: mupdf Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A lightweight PDF viewer and toolkit Group: Applications/Publishing License: GPLv3 URL: http://mupdf.com/ Source0: http://mupdf.com/download/%{name}-%{version}-source.tar.gz Source1: %{name}.desktop +Patch0: %{name}-%{version}-openjpeg.patch BuildRequires: openjpeg2-devel jbig2dec-devel desktop-file-utils BuildRequires: libjpeg-devel freetype-devel libXext-devel @@ -38,6 +39,7 @@ applications that use mupdf and static libraries %prep %setup -q -n %{name}-%{version}-source rm -rf thirdparty +%patch0 -p1 %build export CFLAGS="%{optflags}" @@ -72,6 +74,9 @@ update-desktop-database &> /dev/null || : %{_libdir}/lib%{name}.a %Changelog +* Sun Jun 15 2014 Pavel Zhukov - 1.5-2 +- Add fix for new openjpeg2 + * Sun Jun 15 2014 Pavel Zhukov - 1.5-1 - New release 1.5 (#1108710)