New commits:
commit 62ee0108036146901a7df8875d32c9aa2d93ed9b
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
doc/zathura-pdf-mupdf: adapted to mupdf 1.14.x
commit b3642e64f4e7e77d120259d51ee722b21d55172e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
doc/mupdf: version 1.14.0
diff --git a/doc/mupdf/BUILD b/doc/mupdf/BUILD
index f29510f..62b08f6 100755
--- a/doc/mupdf/BUILD
+++ b/doc/mupdf/BUILD
@@ -1 +1 @@
-CFLAGS= LIBS= make XCFLAGS="$CFLAGS" XLIBS="$LDFLAGS" ${OPTS} build=release
verbose=yes
+CFLAGS= LIBS= make XCFLAGS="$CFLAGS" XLIBS="$LDFLAGS" ${OPTS} build=release
verbose=yes USE_SYSTEM_LIBS=yes
diff --git a/doc/mupdf/DEPENDS b/doc/mupdf/DEPENDS
index c545e4d..ff00fcd 100755
--- a/doc/mupdf/DEPENDS
+++ b/doc/mupdf/DEPENDS
@@ -4,7 +4,6 @@ depends freetype2 &&
depends GLUT &&
depends harfbuzz &&
depends jbig2dec &&
-depends lcms2 &&
depends zlib &&
depends libxext &&
depends libx11 &&
diff --git a/doc/mupdf/DETAILS b/doc/mupdf/DETAILS
index 0b7bd31..5e17839 100755
--- a/doc/mupdf/DETAILS
+++ b/doc/mupdf/DETAILS
@@ -1,10 +1,10 @@
SPELL=mupdf
if [[ "${MUPDF_BRANCH}" == "rc" ]]; then
- VERSION=1.13.0
-
SOURCE_HASH=sha512:c40694d907bb44f18ccf276b3014867f5e0031259064d6f5f4c2bb17bcf1c6773ea0b12b5b99bc3d88bbe69b574e323c490e387e8199f796b44b76bae01f8924
+ VERSION=1.14.0
+ SOURCE_HASH=sha1:b682828373fb1ff9911de08a2b2af7178eb78dc1:UPSTREAM_HASH
else
- VERSION=1.13.0
-
SOURCE_HASH=sha512:c40694d907bb44f18ccf276b3014867f5e0031259064d6f5f4c2bb17bcf1c6773ea0b12b5b99bc3d88bbe69b574e323c490e387e8199f796b44b76bae01f8924
+ VERSION=1.14.0
+ SOURCE_HASH=sha1:b682828373fb1ff9911de08a2b2af7178eb78dc1:UPSTREAM_HASH
fi
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION-source.tar.xz
diff --git a/doc/mupdf/HISTORY b/doc/mupdf/HISTORY
index 3b17ffa..a6656ee 100644
--- a/doc/mupdf/HISTORY
+++ b/doc/mupdf/HISTORY
@@ -1,3 +1,12 @@
+2018-10-07 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.14.0, switched to sha1 UPSTREAM_HASH
+ * BUILD, INSTALL: added flag to use system libraries
+ * DEPENDS, PRE_BUILD: removed lcms2, mupdf now uses its own fork,
+ reoorganized version dependent patching
+ * mupdf-1.13.0-shared_libs-1.patch: removed obsolete patch
+ * patches-1.14/shared_libs.patch: added, inherited from the above
+ * patches-1.14/pkcs7.patch: added to adapt to system libcrypto
+
2018-04-20 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.13.0
* mupdf-1.12.0-shared_libs-1.patch,
diff --git a/doc/mupdf/INSTALL b/doc/mupdf/INSTALL
index 4b8fac4..08b80f5 100755
--- a/doc/mupdf/INSTALL
+++ b/doc/mupdf/INSTALL
@@ -1 +1 @@
-make build=release prefix="$INSTAL_ROOT/usr" ${OPTS} install
+make build=release prefix="$INSTAL_ROOT/usr" ${OPTS} USE_SYSTEM_LIBS=yes
install
diff --git a/doc/mupdf/PRE_BUILD b/doc/mupdf/PRE_BUILD
index 134f85e..9dea187 100755
--- a/doc/mupdf/PRE_BUILD
+++ b/doc/mupdf/PRE_BUILD
@@ -3,9 +3,9 @@ cd "${SOURCE_DIRECTORY}" &&