calibre: updated to 3.4.0, added webencodings, html5lib, html5-parser, unrardll to the internal module list, and added unrar as a new external dependency.

1 files changed, 139 insertions, 8 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 94221389..f1c0dd45 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -28,7 +28,7 @@
 # For:        calibre
 # Descr:      e-book library management application
 # URL:        http://calibre-ebook.com/
-# Needs:      icu4c, podofo, qt5;
+# Needs:      podofo, qt5, qt5-webkit, unrar;
 #             And if your system already has python2.7, you will also need:
 #             dnspython, pycrypto, pysetuptools, python-apsw,
 #             python-cssutils, python-dateutil, python-lxml,
@@ -131,6 +131,8 @@ INT_CSSUTILS=1.0.1
 INT_DATEUTIL=2.5.3
 INT_DBUSPYTHON=1.2.0
 INT_DUKPY=0.3
+INT_HTML5LIB=0.999999999
+INT_HTML5PARSER=0.4.1
 INT_IMAGING=3.2.0
 INT_LXML=3.8.0
 INT_MECHANIZE=0.3.3
@@ -138,12 +140,14 @@ INT_MSGPACK=0.4.8
 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_REGEX=2017.05.26
+INT_PYQT5=5.8.2
+INT_REGEX=2017.07.11
 INT_SIP=4.19.2
 INT_SIX=1.10.0
-INT_PYCRYPTO=2.6.1
-INT_PYQT5=5.8.2
+INT_UNRARDLL=0.1.3
+INT_WEBENC=0.5.1
 INT_APSW=3.13.0-r1
 
 # Where do we look for sources?
@@ -268,6 +272,18 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   SOURCE[19]="$SRCDIR/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"
+  SRCURL[20]="https://pypi.io/packages/source/w/webencodings/webencodings-${INT_WEBENC}.tar.gz"
+
+  SOURCE[21]="$SRCDIR/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"
+  SRCURL[22]="https://pypi.io/packages/source/h/html5-parser/html5-parser-${INT_HTML5PARSER}.tar.gz"
+
+  SOURCE[23]="$SRCDIR/unrardll-${INT_UNRARDLL}.tar.gz"
+  SRCURL[23]="https://pypi.io/packages/source/u/unrardll/unrardll-${INT_UNRARDLL}.tar.gz"
+
   NEXT_ARRAYEL=${#SOURCE[@]}
 else
   NEXT_ARRAYEL=1
@@ -590,7 +606,7 @@ make_mtp() {
 
   # Add documentation:
   mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD}
-  cp -a COPYING README* \
+  cp -a COPYING GPL* LICENSE* README* \
     $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD} || true
 
 } # End make_libmtp
@@ -1141,6 +1157,11 @@ make_msgpack() {
   python 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_msgpack
 
 
@@ -1159,6 +1180,11 @@ make_six() {
   python 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_six
 
 
@@ -1185,6 +1211,98 @@ make_dukpy() {
 } # End make_dukpy
 
 
+#
+# Build webencodings:
+#
+make_webenc() {
+
+  local MOD="webencodings"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/webencodings-${INT_WEBENC}
+
+  # Compile and install
+  export CFLAGS="$SLKCFLAGS"
+  python 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_webenc
+
+
+#
+# Build html5lib:
+#
+make_html5lib() {
+
+  local MOD="html5lib"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/html5lib-${INT_HTML5LIB}
+
+  # Compile and install
+  export CFLAGS="$SLKCFLAGS"
+  python 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_html5lib
+
+
+#
+# Build html5-parser:
+#
+make_html5parser() {
+
+  local MOD="html5-parser"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/html5-parser-${INT_HTML5PARSER}
+
+  # Compile and install
+  export CFLAGS="$SLKCFLAGS"
+  python 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_html5parser
+
+
+#
+# Build unrardll:
+#
+make_unrardll() {
+
+  local MOD="unrardll"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/unrardll-${INT_UNRARDLL}
+
+  # Compile and install
+  export CFLAGS="$SLKCFLAGS"
+  python 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_unrardll
+
+
 # --------------
 # Build calibre:
 # --------------
@@ -1490,6 +1608,18 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
     make_dukpy
     rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
+    make_webenc
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
+    make_html5lib
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
+    make_html5parser
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
+    make_unrardll
+    rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
   fi
 fi
 
@@ -1602,17 +1732,18 @@ mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   cat $SRCDIR/slack-required \
-    | grep -Ev "dnspython|pycrypto|pysetuptools|python-apsw|dbus-python|python-cssutils|python-dateutil|python-lxml|python-mechanize|python-netifaces|python-psutil|python-pygments" \
+    | 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|" \
     > $PKG/install/slack-required
 else
   cat $SRCDIR/slack-required > $PKG/install/slack-required
 fi
 
-# libxkbcommon, libinput, qt5-webkit are only required by Qt 5.6 and higher.
+# libxkbcommon, libinput, libwacom, qt5-webkit are only required by
+# Qt 5.6 and higher.
 case "$SLACKVER" in
   13.*|14.0|14.1)
     cat $PKG/install/slack-required \
-      | grep -Ev "libxkbcommon|libinput|qt5-webkit" \
+      | grep -Ev "libxkbcommon|libinput|libwacom|qt5-webkit" \
       > $PKG/install/slack-required.temp 
       mv $PKG/install/slack-required.temp  $PKG/install/slack-required
     ;;