calibre: update to 6.14.1

1 files changed, 28 insertions, 11 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 76cfa4b3..80fb37d7 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -237,6 +237,8 @@ INT_ZEROCONF=0.37.0
 
 # Software that's an internal dependency to the package:
 INT_HUNSPELL=1.7.0
+INT_HYPHENATION=master # VERSION is in ./setup/hyphenation.py
+INT_MATHJAX=3.1.4      # VERSION is in ./setup/mathjax.py
 INT_OPTIPNG=0.7.7
 INT_PODOFO=0.9.7
 INT_POPPLER=21.12.0
@@ -492,6 +494,14 @@ SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/hyphen-${INT_HYPHEN}.tar.gz"
 SRCURL[$NEXT_ARRAYEL]="https://downloads.sourceforge.net/hunspell/hyphen-${INT_HYPHEN}.tar.gz"
 NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
 
+SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/dictionaries-${INT_HYPHENATION}.tar.gz"
+SRCURL[$NEXT_ARRAYEL]="https://github.com/LibreOffice/dictionaries/archive/${INT_HYPHENATION}.tar.gz"
+NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
+
+SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/mathjax-${INT_MATHJAX}.tar.gz"
+SRCURL[$NEXT_ARRAYEL]="https://github.com/mathjax/MathJax/archive/${INT_MATHJAX}.tar.gz"
+NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
+
 SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/mozilla-ca-certs.pem"
 SRCURL[$NEXT_ARRAYEL]="https://curl.se/ca/cacert.pem"
 NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
@@ -615,8 +625,10 @@ if [ "$P1" != "--oldbuild" ]; then
   if [ $NEXT_ARRAYEL -gt 1 ]; then
   for (( i = 1; i < ${#SOURCE[*]}; i++ )) ; do
     echo "-- Also extracting dependency source $(basename ${SOURCE[$i]})..."
-    if unzip -l ${SOURCE[$i]} 1>/dev/null 2>&1 ; then
+    if $(file ${SOURCE[$i]} | grep -qi ": zip") ; then
       unzip -q ${SOURCE[$i]}
+    elif $(file ${SOURCE[$i]} | grep -qiw "text") ; then
+      true
     else
       tar -xf ${SOURCE[$i]}
     fi
@@ -2331,11 +2343,11 @@ make_calibre () {
   python3 setup.py translations \
     2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
   LANG='en_US.UTF-8' \
-  python3 setup.py liberation_fonts --system-liberation_fonts \
+  python3 setup.py resources \
+    --path-to-hyphenation=$(pwd)/../dictionaries-${INT_HYPHENATION} \
+    --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 mathjax \
+    --path-to-mathjax=$(pwd)/../MathJax-${INT_MATHJAX} \
     2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
   LANG='en_US.UTF-8' \
   python3 setup.py rapydscript \
@@ -2343,12 +2355,17 @@ make_calibre () {
   LANG='en_US.UTF-8' \
   python3 setup.py gui \
     2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-  LANG='en_US.UTF-8' \
-  python3 setup.py resources \
-    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
-  LANG='en_US.UTF-8' \
-  python3 setup.py recent_uas \
-    2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+  if [ ! -f $SRCDIR/sources/user-agent-data.json ]; then
+    # Generate the UserAgent-strings file by collecting online data:
+    LANG='en_US.UTF-8' \
+    python3 setup.py recent_uas \
+      2>&1 | tee -a $OUTPUT/make-${PRGNAM}.log
+    # For later re-use:
+    cp -a resources/user-agent-data.json $OUTPUT/
+  else
+    install -m0644 $SRCDIR/sources/user-agent-data.json \
+      resources/user-agent-data.json
+  fi
 
   # Create the directories the xdg-utils expects to be present:
   mkdir -p $PKG/usr/share/{applications,icons/hicolor,mime/packages}