calibre: update to 3.40.1

1 files changed, 63 insertions, 7 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index fbb74ff6..6de11fa5 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -112,6 +112,8 @@
 #             * Update.
 # 3.38.1-1:   19/jan/2019 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 3.40.1-1:   09/mar/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 .
@@ -121,7 +123,7 @@
 
 PRGNAM=calibre
 SRCNAM=calibre
-VERSION=${VERSION:-3.38.1}
+VERSION=${VERSION:-3.40.1}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
@@ -149,7 +151,7 @@ REQUIRED_PYTHON="2.7"
 REQUIRED_PYTHON_MIN="15"
 
 # Only used in case we need to build our own python:
-INT_PYTHON=2.7.15
+INT_PYTHON=2.7.16
 
 # Only used in case we need to build our own python modules:
 #INT_SETUPTOOLS=23.1.0
@@ -163,25 +165,27 @@ INT_CSSPARSER=1.0.4
 INT_DATEUTIL=2.5.3
 INT_DBUSPYTHON=1.2.0
 INT_DUKPY=0.3
+INT_FEEDPARSER=5.2.1
 INT_HTML5LIB=0.999999999
 INT_HTML5PARSER=0.4.1
 INT_IMAGING=3.2.0
 INT_LXML=3.8.0
+INT_MARKDOWN=3.0.1
 INT_MECHANIZE=0.3.3
 INT_MSGPACK=0.5.6
 INT_NETIFACES=0.10.6
 INT_OPTIPNG=0.7.5
 INT_PSUTIL=4.3.0
 INT_PYCRYPTO=2.6.1
-INT_PYGMENTS=2.1.3
+INT_PYGMENTS=2.3.1
 INT_PYQT5=5.9.2
 INT_REGEX=2018.07.11
 INT_SIP=4.19.8
 INT_SIX=1.10.0
-INT_SQLITE=3260000
+INT_SQLITE=3270200
 INT_UNRARDLL=0.1.3
 INT_WEBENC=0.5.1
-INT_APSW=3.26.0-r1
+INT_APSW=3.27.2-r1
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -318,8 +322,14 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   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/sources/sqlite-amalgamation-${INT_SQLITE}.zip"
-  SRCURL[24]="https://www.sqlite.org/2018/sqlite-amalgamation-${INT_SQLITE}.zip"
+  SOURCE[24]="$SRCDIR/sources/feedparser-${INT_FEEDPARSER}.tar.gz"
+  SRCURL[24]="https://pypi.io/packages/source/f/feedparser/feedparser-${INT_FEEDPARSER}.tar.gz"
+
+  SOURCE[25]="$SRCDIR/sources/Markdown-${INT_MARKDOWN}.tar.gz"
+  SRCURL[25]="https://pypi.io/packages/source/M/Markdown/Markdown-${INT_MARKDOWN}.tar.gz"
+
+  SOURCE[26]="$SRCDIR/sources/sqlite-amalgamation-${INT_SQLITE}.zip"
+  SRCURL[26]="https://www.sqlite.org/2019/sqlite-amalgamation-${INT_SQLITE}.zip"
 
   NEXT_ARRAYEL=${#SOURCE[@]}
 else
@@ -1395,6 +1405,46 @@ make_unrardll() {
 } # End make_unrardll
 
 
+make_feedparser() {
+
+  local MOD="feedparser"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/feedparser-${INT_FEEDPARSER}
+
+  # Compile and install
+  export CFLAGS="$SLKCFLAGS"
+  python2 setup.py install --root=$PKG --optimize=1 \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
+
+  # Add documentation:
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD}
+  cp -a COPYING GPL* LICENSE* README* \
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD} || true
+
+} # End make_feedparser
+
+
+make_Markdown() {
+
+  local MOD="Markdown"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/Markdown-${INT_MARKDOWN}
+
+  # Compile and install
+  export CFLAGS="$SLKCFLAGS"
+  python2 setup.py install --root=$PKG --optimize=1 \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
+
+  # Add documentation:
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD}
+  cp -a COPYING GPL* LICENSE* README* \
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD} || true
+
+} # End make_Markdown
+
+
 # --------------
 # Build calibre:
 # --------------
@@ -1729,6 +1779,12 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
     make_unrardll
     rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
+    make_feedparser
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
+    make_Markdown
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
   fi
 fi