From 537af47b979f809d15d41ffbda4aacf4826df413 Mon Sep 17 00:00:00 2001
From: Moritz Lipp <mlq@pwmt.org>
Date: Fri, 5 Sep 2014 10:01:36 +0200
Subject: [PATCH] Use systems openjpeg2

---
 PKGBUILD        | 13 +++++++++----
 mupdf-1.5.patch | 13 +++++++++++++
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 mupdf-1.5.patch

diff --git a/PKGBUILD b/PKGBUILD
index 415b623..94b780e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,19 +13,24 @@ arch=('i686' 'x86_64')
 url='http://mupdf.com'
 license=('GPL3')
 depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext'
-         'openssl')
+         'openssl' 'openjpeg2')
 install=mupdf.install
 options=('staticlibs')
 source=(http://mupdf.com/downloads/mupdf-$pkgver-source.tar.gz
         mupdf.desktop
-        mupdf.xpm)
+        mupdf.xpm
+        mupdf-${pkgver}.patch
+        )
 md5sums=('89bd4ddc74c266062ebf2702741bb173'
          '39b54f82a763aac54e352315a0ee9037'
-         'f3f35e7320bafde331250de1c99186a1')
+         'f3f35e7320bafde331250de1c99186a1'
+         '8e71587ad9b86e10c9144618ab43149b')
 
 prepare() {
   cd $pkgname-$pkgver-source
-  rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec}
+  rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec,openjpeg}
+
+  patch -p1 < "${srcdir}/${pkgname}-${pkgver}.patch"
 }
 
 build() {
diff --git a/mupdf-1.5.patch b/mupdf-1.5.patch
new file mode 100644
index 0000000..889edcd
--- /dev/null
+++ b/mupdf-1.5.patch
@@ -0,0 +1,13 @@
+diff --git a/source/fitz/load-jpx.c b/source/fitz/load-jpx.c
+index dd7bf9e..b7c8680 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);
+ 
-- 
2.1.0