summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2022-03-18 13:39:29 +0000
committer Eric Hameleers <alien@slackware.com>2022-03-18 13:39:29 +0000
commit54e192d48c4e1e65376b8467880a278270af1294 (patch)
treead55507d32be817b53c7a7eb51266d867ad4e0e5
parentf2d2a4fa178c732306394fc47df5a546cdf2d6cd (diff)
downloadasb-54e192d48c4e1e65376b8467880a278270af1294.tar.gz
asb-54e192d48c4e1e65376b8467880a278270af1294.tar.xz
calibre: update to 5.39.0
-rwxr-xr-xcalibre/build/calibre.SlackBuild33
1 files 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 <alien@slackware.com>
+# * 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: