New release (1.10a)

Signed-off-by: Pavel Zhukov <landgraf@fedoraproject.org>

.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

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 <openjpeg.h>
+-
++#include <openjpeg-2.1/openjpeg.h>
++    
+ /* 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

mupdf-1.7a-openjpeg.patch

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

mupdf.spec

@@ -1,16 +1,19 @@
+%global debug_package %{nil}
+
 Name:           mupdf
-Version:        1.8
+Version:        1.10a
-Release:        3%{?dist}
+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 <pzhukov@redhat.com> - 1.10a-1
+- New release (1.10a)
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

sources

@@ -1 +1 @@
-3205256d78d8524d67dd2a47c7a345fa  mupdf-1.8-source.tar.gz
+SHA512 (mupdf-1.10a-source.tar.gz) = 8c735963364985e74ceb38242afae555a3d2ee7c69abe3fe5c485e8613a83d996a58f231cb689a156019d431fa67d565503247d010b0a404054850483aed9fec