From c923519b02ec8fd5e2a3054b193630c041b5a8c4 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Sat, 11 Feb 2017 20:19:36 +0100 Subject: [PATCH] New release (1.10a) Signed-off-by: Pavel Zhukov --- .gitignore | 1 + mupdf-1.10a-openjpeg.patch | 31 +++++++++++++++++++++++++++++++ mupdf-1.7a-openjpeg.patch | 13 ------------- mupdf.spec | 15 ++++++++++----- sources | 2 +- 5 files changed, 43 insertions(+), 19 deletions(-) create mode 100644 mupdf-1.10a-openjpeg.patch delete mode 100644 mupdf-1.7a-openjpeg.patch diff --git a/.gitignore b/.gitignore index 16b92d0..1e6cd81 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /mupdf-1.7-source.tar.gz /mupdf-1.7a-source.tar.gz /mupdf-1.8-source.tar.gz +/mupdf-1.10a-source.tar.gz diff --git a/mupdf-1.10a-openjpeg.patch b/mupdf-1.10a-openjpeg.patch new file mode 100644 index 0000000..b41e347 --- /dev/null +++ b/mupdf-1.10a-openjpeg.patch @@ -0,0 +1,31 @@ +--- a/source/fitz/load-jpx.c ++++ b/source/fitz/load-jpx.c +@@ -484,13 +484,18 @@ + /* 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. */ ++ ++#ifdef __cplusplus ++extern "C" ++{ + #define OPJ_STATIC + #ifndef _MSC_VER + #define OPJ_HAVE_STDINT_H + #endif ++#endif + +-#include +- ++#include ++ + /* OpenJPEG does not provide a safe mechanism to intercept + * allocations. In the latest version all allocations go + * though opj_malloc etc, but no context is passed around. +@@ -972,3 +977,7 @@ + } + + #endif /* HAVE_LURATECH */ ++ ++#ifdef __cplusplus ++} ++#endif diff --git a/mupdf-1.7a-openjpeg.patch b/mupdf-1.7a-openjpeg.patch deleted file mode 100644 index 46d1389..0000000 --- a/mupdf-1.7a-openjpeg.patch +++ /dev/null @@ -1,13 +0,0 @@ -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, NULL); - /* Set the length to avoid an assert */ - opj_stream_set_user_data_length(stream, size); - diff --git a/mupdf.spec b/mupdf.spec index c6a97f2..dfa2bbe 100644 --- a/mupdf.spec +++ b/mupdf.spec @@ -1,16 +1,19 @@ +%global debug_package %{nil} + Name: mupdf -Version: 1.8 -Release: 3%{?dist} +Version: 1.10a +Release: 1%{?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}-1.7a-openjpeg.patch BuildRequires: gcc make binutils desktop-file-utils coreutils BuildRequires: openjpeg2-devel jbig2dec-devel desktop-file-utils BuildRequires: libjpeg-devel freetype-devel libXext-devel curl-devel +BuildRequires: xulrunner-devel +Patch0: %{name}-1.10a-openjpeg.patch %description MuPDF is a lightweight PDF viewer and toolkit written in portable C. @@ -39,7 +42,6 @@ applications that use mupdf and static libraries %prep %setup -q -n %{name}-%{version}-source -rm -rf thirdparty %patch0 -p1 %build @@ -74,9 +76,12 @@ update-desktop-database &> /dev/null || : %files devel %{_includedir}/%{name} -%{_libdir}/lib%{name}.a +%{_libdir}/lib%{name}*.a %changelog +* Sat Feb 11 2017 Pavel Zhukov - 1.10a-1 +- New release (1.10a) + * Fri Feb 10 2017 Fedora Release Engineering - 1.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 22fcb2a..c384fbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3205256d78d8524d67dd2a47c7a345fa mupdf-1.8-source.tar.gz +SHA512 (mupdf-1.10a-source.tar.gz) = 8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec