calibre: revert to older 6.11.0. Calibre as of 6.12.0 does not include required resources in its source tarball, instead wants to download those using the bootstrap command. Need to investigate.

1 files changed, 44 insertions, 25 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index b34aa0de..685e33e8 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -137,8 +137,10 @@
 #             * Update. Final 5.x release, Calibre 6.x is built on top of Qt6.
 # 6.7.1-1:    18/oct/2022 by Eric Hameleers <alien@slackware.com>
 #             * Calibre6 is built on Qt6.
-# 6.13.0-1:   24/feb/2023 by Eric Hameleers <alien@slackware.com>
+# 6.11.0-1:   24/feb/2023 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+#               Note that sources for 6.12.0 and up no longer ship some
+#               required files. SlackBuild needs to be re-worked to cope.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -148,7 +150,7 @@
 
 PRGNAM=calibre
 SRCNAM=calibre
-VERSION=${VERSION:-6.13.0}
+VERSION=${VERSION:-6.11.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
@@ -2299,15 +2301,32 @@ make_calibre () {
   export LDFLAGS="$LDFLAGS $SLKLDFLAGS -lfontconfig"
   export CFLAGS="$CFLAGS $SLKCFLAGS"
 
+  touch $OUTPUT/make-${PRGNAM}.log
   LANG='en_US.UTF-8' \
   python3 setup.py build \
-    2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+  LANG='en_US.UTF-8' \
+  python3 setup.py iso3166 \
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+  LANG='en_US.UTF-8' \
+  python3 setup.py iso639 \
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+  LANG='en_US.UTF-8' \
+  python3 setup.py translations \
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+  LANG='en_US.UTF-8' \
+  python3 setup.py resources --system-liberation_fonts \
+    --path-to-liberation_fonts=/usr/share/fonts/TTF \
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
   LANG='en_US.UTF-8' \
   python3 setup.py gui \
-    2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+  LANG='en_US.UTF-8' \
+  python3 setup.py mathjax \
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
   LANG='en_US.UTF-8' \
   python3 setup.py rapydscript \
-    2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
 
   # Create the directories the xdg-utils expects to be present:
   mkdir -p $PKG/usr/share/{applications,icons/hicolor,mime/packages}
@@ -2338,26 +2357,26 @@ make_calibre () {
   # We don't need this either at runtime:
   rm -rf $PKG/usr/share/$PRGNAM/rapydscript/
 
-  # Create symlinks to system Libration fonts:
-  if [ -d $PKG/usr/share/$PRGNAM/fonts/liberation ]; then
-    echo  "** Replacing Liberation fonts with symlinks..."
-    ( cd $PKG/usr/share/$PRGNAM/fonts/liberation/
-      for FONT in *.ttf *.otf ; do
-        if [ -f /usr/share/fonts/TTF/$FONT ]; then
-          rm -f $FONT
-          ln -sf /usr/share/fonts/TTF/$FONT
-        fi
-      done
-    )
-  else
-    echo  "** Adding Liberation fonts as symlinks..."
-    mkdir -p $PKG/usr/share/$PRGNAM/fonts/liberation
-    ( cd $PKG/usr/share/$PRGNAM/fonts/liberation
-      for FONT in /usr/share/fonts/TTF/Liberation*.ttf ; do
-        ln -sf $FONT
-      done
-    )
-  fi
+  ## Create symlinks to system Libration fonts:
+  #if [ -d $PKG/usr/share/$PRGNAM/fonts/liberation ]; then
+  #  echo  "** Replacing Liberation fonts with symlinks..."
+  #  ( cd $PKG/usr/share/$PRGNAM/fonts/liberation/
+  #    for FONT in *.ttf *.otf ; do
+  #      if [ -f /usr/share/fonts/TTF/$FONT ]; then
+  #        rm -f $FONT
+  #        ln -sf /usr/share/fonts/TTF/$FONT
+  #      fi
+  #    done
+  #  )
+  #else
+  #  echo  "** Adding Liberation fonts as symlinks..."
+  #  mkdir -p $PKG/usr/share/$PRGNAM/fonts/liberation
+  #  ( cd $PKG/usr/share/$PRGNAM/fonts/liberation
+  #    for FONT in /usr/share/fonts/TTF/Liberation*.ttf ; do
+  #      ln -sf $FONT
+  #    done
+  #  )
+  #fi
 
   # All these files will be generated by update-mime-database:
   find $PKG/usr/share/mime -maxdepth 1 -type f | xargs rm -f