office/mupdf: Updated for version 1.24.8.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 13 insertions, 22 deletions

diff --git a/office/mupdf/mupdf.SlackBuild b/office/mupdf/mupdf.SlackBuild
index 81d5742501..59f69d4311 100644
--- a/office/mupdf/mupdf.SlackBuild
+++ b/office/mupdf/mupdf.SlackBuild
@@ -7,6 +7,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20240813 bkw: update for 1.24.8.
 # 20240314 bkw: update for 1.23.11.
 # 20230531 bkw: BUILD=2, actually use SLKCFLAGS.
 # 20230117 bkw: update for 1.21.1.
@@ -63,7 +64,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mupdf
-VERSION=${VERSION:-1.23.11}
+VERSION=${VERSION:-1.24.8}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -132,30 +133,17 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-# 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
-
 # 20230531 bkw: derp. Never did apply the flags...
 sed -i "s,-O2,$SLKCFLAGS," Makerules
 
-# As of 1.18.0, we don't actually have to patch the Makefile
-# to do a versioned shared lib, but we do have to override some
-# variables. SOMAJOR is the mupdf major and zero-padded minor version
-# jammed together (e.g. 113 for 1.13.0, 203 for 2.3.0). SOMINOR is the
-# mupdf micro version (e.g. 0 for 1.13.0).
-SOMAJOR=$(echo $VERSION | cut -d. -f1-2 | sed -e 's,\.[0-9]$,0&,' -e 's,\.,,g')
-SOMINOR=$(echo $VERSION | cut -d. -f3-  | sed 's,\.,,g' )
-SOVER=$SOMAJOR.$SOMINOR
-
 # Build against system libs instead of bundled ones, where possible.
 # Upstream recommends using their bundled lcms2 and mujs, I'll go with that.
 # Also, we *still* (in Slack 15.0) have to use the bundled freeglut
 # to get copy/paste working in mupdf-gl.
 # C++ (XCXXFLAGS) is only actually used if building with tesseract.
+
 make verbose=yes \
   shared=yes \
-  LIB_LDFLAGS="-shared -Wl,-soname -Wl,libmupdf.so.$SOMAJOR" \
   USE_SYSTEM_LIBS=yes \
   USE_SYSTEM_GLUT=no \
   tesseract=$TESS \
@@ -176,7 +164,7 @@ cd $PKG/usr/lib$LIBDIRSUFFIX
   # depends on in the .pc file. This rather odd-looking bit of code
   # creates the list.
   PCLIBS="-lmupdf $(
-    objdump -p libmupdf.so | \
+    objdump -p libmupdf.so.*.* | \
        perl -ne 'next unless /NEEDED/;
                  chomp;
                  s,.* lib([^.]*)\.so.*,\1,;
@@ -186,9 +174,12 @@ cd $PKG/usr/lib$LIBDIRSUFFIX
   echo "$PCLIBS" | grep -q ltesseract && WITHTESS=WITH
   echo "==> PCLIBS='$PCLIBS'"
 
-  # 20230117 bkw: the library is versioned, but the filename isn't...
-  chmod 755 libmupdf.so
-  mv libmupdf.so libmupdf.so.$SOVER
+
+  # 20240813 bkw: shared library gets installed without symlinks...
+  SO="$( echo libmupdf.so.*.* )"
+  SOVER="$( echo $SO | cut -d. -f3,4 )"
+  SOMAJOR="$( echo $SO | cut -d. -f3 )"
+  chmod 755 $SO
   ln -s libmupdf.so.$SOVER libmupdf.so
   ln -s libmupdf.so.$SOVER libmupdf.so.$SOMAJOR
 
diff --git a/office/mupdf/mupdf.info b/office/mupdf/mupdf.info
index 8c3e38516c..9401ac05a8 100644
--- a/office/mupdf/mupdf.info
+++ b/office/mupdf/mupdf.info
@@ -1,8 +1,8 @@
 PRGNAM="mupdf"
-VERSION="1.23.11"
+VERSION="1.24.8"
 HOMEPAGE="https://www.mupdf.com/"
-DOWNLOAD="https://www.mupdf.com/downloads/archive/mupdf-1.23.11-source.tar.lz"
-MD5SUM="2a1afc01ba949a383ac3a308058b063b"
+DOWNLOAD="https://mupdf.com/downloads/archive/mupdf-1.24.8-source.tar.lz"
+MD5SUM="dee21c13ebfa542f3001c85b2a36b627"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jbig2dec gumbo-parser"