From 54e192d48c4e1e65376b8467880a278270af1294 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 18 Mar 2022 13:39:29 +0000 Subject: calibre: update to 5.39.0 --- calibre/build/calibre.SlackBuild | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild index 3e4ed05e..61fa28c7 100755 --- a/calibre/build/calibre.SlackBuild +++ b/calibre/build/calibre.SlackBuild @@ -129,6 +129,8 @@ # be built. Qt5 libraries are expected to be supplied by # the OS, meaning Slackware older than 15.0 is not supported. # Python3 is now powering Calibre. +# 5.39.0-1: 18/mar/2022 by Eric Hameleers +# * Update. # # Run 'sh calibre.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -138,7 +140,7 @@ PRGNAM=calibre SRCNAM=calibre -VERSION=${VERSION:-5.38.0} +VERSION=${VERSION:-5.39.0} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} TAG=${TAG:-alien} @@ -2092,20 +2094,29 @@ make_calibre () { # # Not part of Slackware or too old, and need it: -make_hunspell -rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ +if [ ! -f $SRCDIR/${PRGNAM}_pythondeps-${SLACKVER}-${ARCH}.tar.bz2 ]; then + # No tarball containing pre-compiled libraries was found. + # We need to build these supporting tools ourself. + + # After each part is built we will sync to here because in the end, calibre + # will wipe the origin and we will have to sync it all back: + mkdir -p /usr/lib${LIBDIRSUFFIX}/calibre + + make_hunspell + rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ -make_optipng -rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ + make_optipng + rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ -make_podofo -rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ + make_podofo + rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ -make_hyphen -rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ + make_hyphen + rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ -make_unrarsrc -rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ + make_unrarsrc + rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/ +fi # End - not part of Slackware # Compilation of the optional software: -- cgit v1.2.3-65-gdbad