[arch-commits] Commit in mupdf/trunk (PKGBUILD mupdf-1.5-openjpeg-2.1.0.patch)

[Bartłomiej Piotrowski]

    Date: Sunday, September 7, 2014 @ 09:07:19
  Author: bpiotrowski
Revision: 118518

upgpkg: mupdf 1.5-2

use system openjpeg2 to make zathura users happy (FS#41831)

Added:
  mupdf/trunk/mupdf-1.5-openjpeg-2.1.0.patch
Modified:
  mupdf/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |   13 ++++++++-----
 mupdf-1.5-openjpeg-2.1.0.patch |   13 +++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-07 06:31:15 UTC (rev 118517)
+++ PKGBUILD	2014-09-07 07:07:19 UTC (rev 118518)
@@ -7,25 +7,28 @@
 
 pkgname=mupdf
 pkgver=1.5
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight PDF and XPS viewer'
 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-1.5-openjpeg-2.1.0.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 -i ../mupdf-1.5-openjpeg-2.1.0.patch
 }
 
 build() {

Added: mupdf-1.5-openjpeg-2.1.0.patch
===================================================================
--- mupdf-1.5-openjpeg-2.1.0.patch	                        (rev 0)
+++ mupdf-1.5-openjpeg-2.1.0.patch	2014-09-07 07:07:19 UTC (rev 118518)
@@ -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);
+