calibre: update to 3.38.0

1 files changed, 53 insertions, 49 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index c45188f9..7e6e7aa0 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -33,7 +33,7 @@
 #             qt5, qt5-webkit, PyQt5;
 #             If you did not add python2.7 to the package, you will also need:
 #             dnspython, pycrypto, pysetuptools, python-apsw,
-#             python-cssutils, python-dateutil, python-lxml,
+#             python-css-parser, python-dateutil, python-lxml,
 #             python-mechanize, python-netifaces, python-psutil
 # Changelog:  
 # 0.7.20-1:   25/Sep/2010 by Eric Hameleers <alien@slackware.com>
@@ -106,6 +106,10 @@
 #               so for slackware-current internal Qt 5.9 libraries are added.
 # 3.32.0-1:   30/sep/2018 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 3.33.1-1:   21/oct/2018 by Eric Hameleers <alien@slackware.com>
+#             * Update due to icu4c update in -current.
+# 3.38.0-1:   18/jan/2019 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 .
@@ -115,7 +119,7 @@
 
 PRGNAM=calibre
 SRCNAM=calibre
-VERSION=${VERSION:-3.32.0}
+VERSION=${VERSION:-3.38.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
@@ -140,7 +144,7 @@ INT_MTP=1.1.14
 INT_MAGICK=6.9.9-42
 
 REQUIRED_PYTHON="2.7"
-REQUIRED_PYTHON_MIN="12"
+REQUIRED_PYTHON_MIN="15"
 
 # Only used in case we need to build our own python:
 INT_PYTHON=2.7.15
@@ -153,7 +157,7 @@ INT_PYTHON=2.7.15
 # netifaces.c error you need to add code for your platform
 INT_SETUPTOOLS=14.3
 INT_DNSPYTHON=1.14.0
-INT_CSSUTILS=1.0.1
+INT_CSSPARSER=1.0.4
 INT_DATEUTIL=2.5.3
 INT_DBUSPYTHON=1.2.0
 INT_DUKPY=0.3
@@ -172,10 +176,10 @@ INT_PYQT5=5.9.2
 INT_REGEX=2018.07.11
 INT_SIP=4.19.8
 INT_SIX=1.10.0
-INT_SQLITE=3250200
+INT_SQLITE=3260000
 INT_UNRARDLL=0.1.3
 INT_WEBENC=0.5.1
-INT_APSW=3.23.1-r1
+INT_APSW=3.26.0-r1
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -186,8 +190,8 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE[0]="$SRCDIR/${SRCNAM}-${VERSION}.tar.xz"
-SRCURL[0]="http://download.calibre-ebook.com/${VERSION}/${SRCNAM}-${VERSION}.tar.xz"
+SOURCE[0]="$SRCDIR/sources/${SRCNAM}-${VERSION}.tar.xz"
+SRCURL[0]="https://download.calibre-ebook.com/${VERSION}/${SRCNAM}-${VERSION}.tar.xz"
 
 # Allow the package builder to override BUILD_MAGICK:
 # By default we do not compile an internal version but enabling this
@@ -239,80 +243,80 @@ fi
 if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   echo ">> Compiling python modules <<"
 
-  SOURCE[1]="$SRCDIR/setuptools-${INT_SETUPTOOLS}.tar.gz"
+  SOURCE[1]="$SRCDIR/sources/setuptools-${INT_SETUPTOOLS}.tar.gz"
   # URL for the newer setuptools:
   #SRCURL[1]="https://github.com/pypa/setuptools/archive/v${INT_SETUPTOOLS}.tar.gz"
   # URL for the older setuptools:
   SRCURL[1]="http://pypi.python.org/packages/source/s/setuptools/setuptools-${INT_SETUPTOOLS}.tar.gz"
 
-  SOURCE[2]="$SRCDIR/Pygments-${INT_PYGMENTS}.tar.gz"
+  SOURCE[2]="$SRCDIR/sources/Pygments-${INT_PYGMENTS}.tar.gz"
   SRCURL[2]="https://pypi.python.org/packages/source/P/Pygments/Pygments-${INT_PYGMENTS}.tar.gz"
 
-  SOURCE[3]="$SRCDIR/dnspython-${INT_DNSPYTHON}.tar.gz"
+  SOURCE[3]="$SRCDIR/sources/dnspython-${INT_DNSPYTHON}.tar.gz"
   SRCURL[3]="http://www.dnspython.org/kits/${INT_DNSPYTHON}/dnspython-${INT_DNSPYTHON}.tar.gz"
 
-  SOURCE[4]="$SRCDIR/cssutils-${INT_CSSUTILS}.tar.gz"
-  SRCURL[4]="http://pypi.python.org/packages/source/c/cssutils/cssutils-${INT_CSSUTILS}.tar.gz"
+  SOURCE[4]="$SRCDIR/sources/css-parser-${INT_CSSPARSER}.tar.gz"
+  SRCURL[4]="https://pypi.python.org/packages/source/c/css-parser/css-parser-${INT_CSSPARSER}.tar.gz"
 
-  SOURCE[5]="$SRCDIR/python-dateutil-${INT_DATEUTIL}.tar.gz"
+  SOURCE[5]="$SRCDIR/sources/python-dateutil-${INT_DATEUTIL}.tar.gz"
   SRCURL[5]="https://github.com/dateutil/dateutil/releases/download/${INT_DATEUTIL}/python-dateutil-${INT_DATEUTIL}.tar.gz"
 
-  SOURCE[6]="$SRCDIR/Pillow-${INT_IMAGING}.tar.gz"
+  SOURCE[6]="$SRCDIR/sources/Pillow-${INT_IMAGING}.tar.gz"
   SRCURL[6]="https://github.com/python-pillow/Pillow/archive/${INT_IMAGING}.tar.gz"
 
-  SOURCE[7]="$SRCDIR/lxml-${INT_LXML}.tgz"
+  SOURCE[7]="$SRCDIR/sources/lxml-${INT_LXML}.tgz"
   SRCURL[7]="http://lxml.de/files/lxml-${INT_LXML}.tgz"
 
-  SOURCE[8]="$SRCDIR/mechanize-${INT_MECHANIZE}.tar.gz"
+  SOURCE[8]="$SRCDIR/sources/mechanize-${INT_MECHANIZE}.tar.gz"
   SRCURL[8]="https://github.com/python-mechanize/mechanize/archive/v${INT_MECHANIZE}.tar.gz"
 
-  SOURCE[9]="$SRCDIR/PyQt5_gpl-${INT_PYQT5}.tar.gz"
+  SOURCE[9]="$SRCDIR/sources/PyQt5_gpl-${INT_PYQT5}.tar.gz"
   SRCURL[9]="http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-${INT_PYQT5}/PyQt5_gpl-${INT_PYQT5}.tar.gz"
 
-  SOURCE[10]="$SRCDIR/sip-${INT_SIP}.tar.gz"
+  SOURCE[10]="$SRCDIR/sources/sip-${INT_SIP}.tar.gz"
   SRCURL[10]="http://sourceforge.net/projects/pyqt/files/sip/sip-${INT_SIP}/sip-${INT_SIP}.tar.gz"
 
-  SOURCE[11]="$SRCDIR/dbus-python-${INT_DBUSPYTHON}.tar.gz"
+  SOURCE[11]="$SRCDIR/sources/dbus-python-${INT_DBUSPYTHON}.tar.gz"
   SRCURL[11]="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${INT_DBUSPYTHON}.tar.gz"
 
-  SOURCE[12]="$SRCDIR/pycrypto-${INT_PYCRYPTO}.tar.gz"
+  SOURCE[12]="$SRCDIR/sources/pycrypto-${INT_PYCRYPTO}.tar.gz"
   SRCURL[12]="http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-${INT_PYCRYPTO}.tar.gz"
 
-  SOURCE[13]="$SRCDIR/netifaces-${INT_NETIFACES}.tar.gz"
+  SOURCE[13]="$SRCDIR/sources/netifaces-${INT_NETIFACES}.tar.gz"
   SRCURL[13]="https://pypi.io/packages/source/n/netifaces/netifaces-${INT_NETIFACES}.tar.gz"
 
-  SOURCE[14]="$SRCDIR/psutil-${INT_PSUTIL}.tar.gz"
+  SOURCE[14]="$SRCDIR/sources/psutil-${INT_PSUTIL}.tar.gz"
   SRCURL[14]="https://github.com/giampaolo/psutil/archive/release-${INT_PSUTIL}.tar.gz"
 
-  SOURCE[15]="$SRCDIR/apsw-${INT_APSW}.zip"
-  # Needs a newwer sqlite: than ships with Slackware 14.1:
-  SRCURL[15]="https://github.com/rogerbinns/apsw/archive/${INT_APSW}.zip"
+  SOURCE[15]="$SRCDIR/sources/apsw-${INT_APSW}.zip"
+  # Needs a newwer sqlite than ships with Slackware 14.1:
+  SRCURL[15]="https://github.com/rogerbinns/apsw/releases/download/${INT_APSW}/apsw-${INT_APSW}.zip"
 
-  SOURCE[16]="$SRCDIR/regex-${INT_REGEX}.tar.gz"
+  SOURCE[16]="$SRCDIR/sources/regex-${INT_REGEX}.tar.gz"
   SRCURL[16]="https://pypi.io/packages/source/r/regex/regex-${INT_REGEX}.tar.gz"
 
-  SOURCE[17]="$SRCDIR/msgpack-python-${INT_MSGPACK}.tar.gz"
+  SOURCE[17]="$SRCDIR/sources/msgpack-python-${INT_MSGPACK}.tar.gz"
   SRCURL[17]="https://pypi.io/packages/source/m/msgpack-python/msgpack-python-${INT_MSGPACK}.tar.gz"
 
-  SOURCE[18]="$SRCDIR/six-${INT_SIX}.tar.gz"
+  SOURCE[18]="$SRCDIR/sources/six-${INT_SIX}.tar.gz"
   SRCURL[18]="https://pypi.io/packages/source/s/six/six-${INT_SIX}.tar.gz"
 
-  SOURCE[19]="$SRCDIR/dukpy-${INT_DUKPY}.tar.gz"
+  SOURCE[19]="$SRCDIR/sources/dukpy-${INT_DUKPY}.tar.gz"
   SRCURL[19]="https://github.com/kovidgoyal/dukpy/archive/v${INT_DUKPY}.tar.gz"
 
-  SOURCE[20]="$SRCDIR/webencodings-${INT_WEBENC}.tar.gz"
+  SOURCE[20]="$SRCDIR/sources/webencodings-${INT_WEBENC}.tar.gz"
   SRCURL[20]="https://pypi.io/packages/source/w/webencodings/webencodings-${INT_WEBENC}.tar.gz"
 
-  SOURCE[21]="$SRCDIR/html5lib-${INT_HTML5LIB}.tar.gz"
+  SOURCE[21]="$SRCDIR/sources/html5lib-${INT_HTML5LIB}.tar.gz"
   SRCURL[21]="https://pypi.io/packages/source/h/html5lib/html5lib-${INT_HTML5LIB}.tar.gz"
 
-  SOURCE[22]="$SRCDIR/html5-parser-${INT_HTML5PARSER}.tar.gz"
+  SOURCE[22]="$SRCDIR/sources/html5-parser-${INT_HTML5PARSER}.tar.gz"
   SRCURL[22]="https://pypi.io/packages/source/h/html5-parser/html5-parser-${INT_HTML5PARSER}.tar.gz"
 
-  SOURCE[23]="$SRCDIR/unrardll-${INT_UNRARDLL}.tar.gz"
+  SOURCE[23]="$SRCDIR/sources/unrardll-${INT_UNRARDLL}.tar.gz"
   SRCURL[23]="https://pypi.io/packages/source/u/unrardll/unrardll-${INT_UNRARDLL}.tar.gz"
 
-  SOURCE[24]="$SRCDIR/sqlite-amalgamation-${INT_SQLITE}.zip"
+  SOURCE[24]="$SRCDIR/sources/sqlite-amalgamation-${INT_SQLITE}.zip"
   SRCURL[24]="https://www.sqlite.org/2018/sqlite-amalgamation-${INT_SQLITE}.zip"
 
   NEXT_ARRAYEL=${#SOURCE[@]}
@@ -323,7 +327,7 @@ fi
 if [ "$BUILD_PYTHON" = "YES" ]; then
   echo ">> Compiling python interpreter <<"
 
-  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/Python-${INT_PYTHON}.tar.xz"
+  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/Python-${INT_PYTHON}.tar.xz"
   SRCURL[$NEXT_ARRAYEL]="http://python.org/ftp/python/${INT_PYTHON}/Python-${INT_PYTHON}.tar.xz"
 
   NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
@@ -332,7 +336,7 @@ fi
 if [ "$BUILD_MTP" = "YES" ]; then
   echo ">> Compiling libmtp <<"
 
-  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/libmtp-${INT_MTP}.tar.gz"
+  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/libmtp-${INT_MTP}.tar.gz"
   SRCURL[$NEXT_ARRAYEL]="http://sourceforge.net/projects/libmtp/files/libmtp/${INT_MTP}/libmtp-${INT_MTP}.tar.gz/download"
 
   NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
@@ -341,12 +345,12 @@ fi
 if [ "$BUILD_QT" = "YES" ]; then
   echo ">> Compiling Qt  <<"
 
-  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/qt-everywhere-opensource-src-${INT_QT}.tar.xz"
+  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/qt-everywhere-opensource-src-${INT_QT}.tar.xz"
   SRCURL[$NEXT_ARRAYEL]="http://download.qt.io/official_releases/qt/$(echo ${INT_QT}|cut -d. -f1,2)/${INT_QT}/single/qt-everywhere-opensource-src-${INT_QT}.tar.xz"
 
   NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
 
-  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/qtwebkit-opensource-src-${INT_QTWEBKIT}.tar.xz"
+  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/qtwebkit-opensource-src-${INT_QTWEBKIT}.tar.xz"
   SRCURL[$NEXT_ARRAYEL]="http://download.qt.io/official_releases/qt/$(echo ${INT_QTWEBKIT}|cut -d. -f1,2)/${INT_QTWEBKIT}/submodules/qtwebkit-opensource-src-${INT_QTWEBKIT}.tar.xz"
 
   NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
@@ -355,13 +359,13 @@ fi
 if [ "$BUILD_MAGICK" = "YES" ]; then
   echo ">> Compiling Magick  <<"
 
-  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/ImageMagick-${INT_MAGICK}.tar.xz"
+  SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/ImageMagick-${INT_MAGICK}.tar.xz"
   SRCURL[$NEXT_ARRAYEL]="http://www.imagemagick.org/download/releases/ImageMagick-${INT_MAGICK}.tar.xz"
 
   NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
 fi
 
-SOURCE[$NEXT_ARRAYEL]="$SRCDIR/optipng-${INT_OPTIPNG}.tar.gz"
+SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/optipng-${INT_OPTIPNG}.tar.gz"
 SRCURL[$NEXT_ARRAYEL]="http://prdownloads.sourceforge.net/optipng/optipng-${INT_OPTIPNG}.tar.gz"
 NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
 
@@ -841,14 +845,14 @@ make_dnspython() {
 } # End make_dnspython
 
 #
-# Build cssutils:
+# Build css-parser:
 #
-make_cssutils() {
+make_cssparser() {
 
-  local MOD="cssutils"
+  local MOD="cssparser"
   echo -e "\n**  $MOD  **\n"
 
-  cd $TMP/tmp-$PRGNAM/cssutils-${INT_CSSUTILS}
+  cd $TMP/tmp-$PRGNAM/css-parser-${INT_CSSPARSER}
 
   # The source is infested with DOS files:
   sed -i -e 's/\r//' $( find . -type f -exec file "{}" ";" | \
@@ -864,7 +868,7 @@ make_cssutils() {
   cp -a COPYING* *.txt \
     $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD} || true
 
-} # End make_cssutils
+} # End make_cssparser
 
 #
 # Build dateutil:
@@ -1663,7 +1667,7 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
     make_dnspython
     rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
-    make_cssutils
+    make_cssparser
     rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
     make_dateutil
@@ -1846,7 +1850,7 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 cat $SRCDIR/slack-required > $PKG/install/slack-required
 if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   cat $PKG/install/slack-required \
-    | grep -Ev "PyQt5|sip|dnspython|pycrypto|pysetuptools|python-apsw|dbus-python|python-cssutils|python-dateutil|python-dukpy|python-html5-parser|python-html5lib|python-lxml|python-mechanize|python-msgpack|python-netifaces|python-psutil|python-pygments|python-regex|python-six|python-unrardll|python-webencodings" \
+    | grep -Ev "PyQt5|sip|dnspython|pycrypto|pysetuptools|python-apsw|dbus-python|python-css-parser|python-dateutil|python-dukpy|python-html5-parser|python-html5lib|python-lxml|python-mechanize|python-msgpack|python-netifaces|python-psutil|python-pygments|python-regex|python-six|python-unrardll|python-webencodings" \
     > $PKG/install/slack-required.temp 
   mv $PKG/install/slack-required.temp  $PKG/install/slack-required
 fi