calibre: update to 3.46.0

1 files changed, 69 insertions, 4 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 6de11fa5..97fef541 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -114,6 +114,8 @@
 #             * Update.
 # 3.40.1-1:   09/mar/2019 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 3.46.0-1:   27/jul/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 .
@@ -123,7 +125,7 @@
 
 PRGNAM=calibre
 SRCNAM=calibre
-VERSION=${VERSION:-3.40.1}
+VERSION=${VERSION:-3.46.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
@@ -160,14 +162,16 @@ INT_PYTHON=2.7.16
 # and fails to compile netifaces with error:
 # netifaces.c error you need to add code for your platform
 INT_SETUPTOOLS=14.3
-INT_DNSPYTHON=1.14.0
+INT_BEAUTIFULSOUP=4.8.0
 INT_CSSPARSER=1.0.4
 INT_DATEUTIL=2.5.3
 INT_DBUSPYTHON=1.2.0
+INT_DNSPYTHON=1.14.0
 INT_DUKPY=0.3
 INT_FEEDPARSER=5.2.1
+INT_HTML2TEXT=2018.1.9
 INT_HTML5LIB=0.999999999
-INT_HTML5PARSER=0.4.1
+INT_HTML5PARSER=0.4.6
 INT_IMAGING=3.2.0
 INT_LXML=3.8.0
 INT_MARKDOWN=3.0.1
@@ -182,6 +186,7 @@ INT_PYQT5=5.9.2
 INT_REGEX=2018.07.11
 INT_SIP=4.19.8
 INT_SIX=1.10.0
+INT_SOUPSIEVE=1.9.2
 INT_SQLITE=3270200
 INT_UNRARDLL=0.1.3
 INT_WEBENC=0.5.1
@@ -331,6 +336,15 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   SOURCE[26]="$SRCDIR/sources/sqlite-amalgamation-${INT_SQLITE}.zip"
   SRCURL[26]="https://www.sqlite.org/2019/sqlite-amalgamation-${INT_SQLITE}.zip"
 
+  SOURCE[27]="$SRCDIR/sources/soupsieve-${INT_SOUPSIEVE}.tar.gz"
+  SRCURL[27]="https://pypi.io/packages/source/s/soupsieve/soupsieve-${INT_SOUPSIEVE}.tar.gz"
+
+  SOURCE[28]="$SRCDIR/sources/beautifulsoup4-${INT_BEAUTIFULSOUP}.tar.gz"
+  SRCURL[28]="https://pypi.io/packages/source/b/beautifulsoup4/beautifulsoup4-${INT_BEAUTIFULSOUP}.tar.gz"
+
+  SOURCE[29]="$SRCDIR/sources/html2text-${INT_HTML2TEXT}.tar.gz"
+  SRCURL[29]="https://pypi.io/packages/source/h/html2text/html2text-${INT_HTML2TEXT}.tar.gz"
+
   NEXT_ARRAYEL=${#SOURCE[@]}
 else
   NEXT_ARRAYEL=1
@@ -1445,6 +1459,48 @@ make_Markdown() {
 } # End make_Markdown
 
 
+make_soupsieve() {
+
+  local MOD="soupsieve"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/soupsieve-${INT_SOUPSIEVE}
+
+  # Compile and install
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
+
+} # End make_soupsieve
+
+
+make_beautifulsoup() {
+
+  local MOD="beautifulsoup"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/beautifulsoup4-${INT_BEAUTIFULSOUP}
+
+  # Compile and install
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
+
+} # End make_beautifulsoup
+
+
+make_html2text() {
+
+  local MOD="html2text"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/html2text-${INT_HTML2TEXT}
+
+  # Compile and install
+  python setup.py install --root=$PKG \
+    2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
+
+} # End make_html2text
+
+
 # --------------
 # Build calibre:
 # --------------
@@ -1785,6 +1841,15 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
     make_Markdown
     rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
+    make_soupsieve
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
+    make_beautifulsoup
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
+    make_html2text
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
   fi
 fi
 
@@ -1908,7 +1973,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-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" \
+    | grep -Ev "PyQt5|sip|dnspython|pycrypto|pysetuptools|python-apsw|dbus-python|python-beautifulsoup|python-css-parser|python-dateutil|python-dukpy|pyhton-html2text|python-html5-parser|python-html5lib|python-lxml|python-mechanize|python-msgpack|python-netifaces|python-psutil|python-pygments|python-regex|python-six|python-soupsieve|python-unrardll|python-webencodings" \
     > $PKG/install/slack-required.temp 
   mv $PKG/install/slack-required.temp  $PKG/install/slack-required
 fi