office/mupdf: Updated for version 1.10a.

4 files changed, 9 insertions, 30 deletions

diff --git a/office/mupdf/mupdf.SlackBuild b/office/mupdf/mupdf.SlackBuild
index 1dd4d1108b7d..b4e6b2c89a93 100644
--- a/office/mupdf/mupdf.SlackBuild
+++ b/office/mupdf/mupdf.SlackBuild
@@ -5,6 +5,9 @@
 # Originally written by Hubert Hesse (slackbuilds@hubertscorner.de).
 # Heavily modified by B. Watson (yalhcru@gmail.com).
 
+# 20170122 bkw:
+# - version bump to 1.10a.
+
 # 20160725 bkw:
 # - version bump to 1.9a.
 # - s/i486/i586/g (to match new 14.2 template).
@@ -77,7 +80,7 @@
 # - Fix the man pages slightly.
 
 PRGNAM=mupdf
-VERSION=${VERSION:-1.9a}
+VERSION=${VERSION:-1.10a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -149,21 +152,11 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# opj_stream_set_user_data() now takes 3 args in openjpeg 2.1.
-# Patch applies to both 1.4 and 1.5 (and later).
-patch -p1 < $CWD/openjpeg-2.1-api-change.diff
-
-# Makerules incorrectly tries to build with openjpeg-1.x system lib, while
-# the bundled version is 2.0, and the code uses the 2.0 API.
-# Actually this was fixed in 1.5, but I leave this here in case someone
-# wants to use this script to build mupdf-1.4 for some reason.
-sed -i 's,libopenjpeg1,libopenjp2,g' Makerules
-
 # Hard-code the version number so it'll stop trying to use git to retrieve
 # it and spewing harmless but scary 'fatal: Not a git repository' errors.
 sed -i "/^VERSION/s,=.*,= $VERSION," Makefile
 
-make \
+make verbose=yes \
   XCFLAGS="$SLKCFLAGS -DJBIG_NO_MEMENTO" \
   HAVE_MUJS="$MUJS" \
   build=release \
@@ -207,7 +200,7 @@ mkdir -p $PKG/usr/share/pixmaps
 cat $CWD/$PRGNAM.png > $PKG/usr/share/pixmaps/$PRGNAM.png
 
 # .pc file taken from debian and parameterized.
-PCLIBS="-l$PRGNAM"
+PCLIBS="-l$PRGNAM -lfreetype -lharfbuzz -ljbig2dec -ljpeg -lcrypto -lopenjp2 -lz -lm"
 [ "$MUJS" = "yes" ] && PCLIBS="$PCLIBS -lmupdfthird"
 
 mkdir -p $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/
diff --git a/office/mupdf/mupdf.info b/office/mupdf/mupdf.info
index fa420662db93..6a4ba72e3371 100644
--- a/office/mupdf/mupdf.info
+++ b/office/mupdf/mupdf.info
@@ -1,8 +1,8 @@
 PRGNAM="mupdf"
-VERSION="1.9a"
+VERSION="1.10a"
 HOMEPAGE="http://www.mupdf.com/"
-DOWNLOAD="http://www.mupdf.com/downloads/archive/mupdf-1.9a-source.tar.gz"
-MD5SUM="658b90788a57d858dcb069cf326e11c3"
+DOWNLOAD="http://www.mupdf.com/downloads/archive/mupdf-1.10a-source.tar.gz"
+MD5SUM="f80fbba2524d1d52f6ed09237d382411"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jbig2dec"
diff --git a/office/mupdf/mupdf.pc b/office/mupdf/mupdf.pc
index 34bbb1552e72..50cb195d72d6 100644
--- a/office/mupdf/mupdf.pc
+++ b/office/mupdf/mupdf.pc
@@ -8,5 +8,4 @@ Description: Library for rendering PDF documents
 Requires.private: freetype2
 Version: @VERSION@
 Libs: -L${libdir} @PCLIBS@
-Libs.private: -lopenjp2 -ljbig2dec -ljpeg -lz -lm
 Cflags: -I${includedir}
diff --git a/office/mupdf/openjpeg-2.1-api-change.diff b/office/mupdf/openjpeg-2.1-api-change.diff
deleted file mode 100644
index e6edc7998596..000000000000
--- a/office/mupdf/openjpeg-2.1-api-change.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur mupdf-1.5-source/source/fitz/load-jpx.c mupdf-1.5-source.patched/source/fitz/load-jpx.c
---- mupdf-1.5-source/source/fitz/load-jpx.c	2014-06-10 11:09:28.000000000 -0400
-+++ mupdf-1.5-source.patched/source/fitz/load-jpx.c	2014-08-21 23:49:21.000000000 -0400
-@@ -116,7 +116,8 @@
- 	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);
-