calibre: update to 4.7.0

1 files changed, 55 insertions, 28 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 5c7d43a1..638a8708 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -125,6 +125,8 @@
 #             * Update.
 # 4.2.0-1:    19/oct/2019 by Eric Hameleers <alien@slackware.com>
 #             * New major release 4.x. No more qt-webkit.
+# 4.7.0-1:    30/dec/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 .
@@ -134,7 +136,7 @@
 
 PRGNAM=calibre
 SRCNAM=calibre
-VERSION=${VERSION:-4.2.0}
+VERSION=${VERSION:-4.7.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
@@ -144,10 +146,10 @@ DOCS="LICENSE* Changelog* COPYRIGHT README*"
 PYTHON=$(python2 -c 'import sys; print (sys.version.split( )[0])')
 SLACKVER=${SLACKVER:-$(cat /etc/slackware-version |cut -d' ' -f2)}
 
-REQUIRED_QT="5.13.0"
+REQUIRED_QT="5.13.1"
 
 # Only used in case we need to build our own Qt:
-INT_QT=5.13.1
+INT_QT=5.13.2
 
 REQUIRED_MTP="1.1.16"
 
@@ -169,7 +171,7 @@ INT_PYTHON=2.7.17
 # dist.py:267: UserWarning: Unknown distribution option: 'zip_safe'
 # and fails to compile netifaces with error:
 # netifaces.c error you need to add code for your platform
-INT_SETUPTOOLS=41.0.1
+INT_SETUPTOOLS=42.0.2
 # The rest of the internal Python deps:
 INT_APSW=3.27.2-r1
 INT_BEAUTIFULSOUP=4.8.0
@@ -183,7 +185,8 @@ INT_ENUM34=1.1.6
 INT_FEEDPARSER=5.2.1
 INT_HTML2TEXT=2018.1.9
 INT_HTML5LIB=1.0.1
-INT_HTML5PARSER=0.4.8
+INT_HTML5PARSER=0.4.9
+INT_HYPHEN=2.8.8
 INT_LXML=4.3.3
 INT_MARKDOWN=3.1
 INT_MECHANIZE=0.4.3
@@ -193,10 +196,10 @@ INT_PILLOW=6.2.0
 INT_PSUTIL=5.6.2
 INT_PYCRYPTO=2.6.1
 INT_PYGMENTS=2.3.1
-INT_PYQT5=5.13.1
-INT_PYQTWEBENG=5.13.1
+INT_PYQT5=5.13.2
+INT_PYQTWEBENG=5.13.2
 INT_REGEX=2019.04.14
-INT_SIP=4.19.19
+INT_SIP=4.19.20
 INT_SIX=1.12.0
 INT_SOUPSIEVE=1.9.1
 INT_SQLITE=3280000
@@ -300,8 +303,8 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   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/sources/PyQt5_gpl-${INT_PYQT5}.tar.gz"
-  SRCURL[9]="https://www.riverbankcomputing.com/static/Downloads/PyQt5/${INT_PYQT5}/PyQt5_gpl-${INT_PYQT5}.tar.gz"
+  SOURCE[9]="$SRCDIR/sources/PyQt5-${INT_PYQT5}.tar.gz"
+  SRCURL[9]="https://www.riverbankcomputing.com/static/Downloads/PyQt5/${INT_PYQT5}/PyQt5-${INT_PYQT5}.tar.gz"
 
   SOURCE[10]="$SRCDIR/sources/sip-${INT_SIP}.tar.gz"
   SRCURL[10]="https://www.riverbankcomputing.com/static/Downloads/sip/${INT_SIP}/sip-${INT_SIP}.tar.gz"
@@ -370,8 +373,8 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   SOURCE[31]="$SRCDIR/sources/chardet-${INT_CHARDET}.tar.gz"
   SRCURL[31]="https://pypi.io/packages/source/c/chardet/chardet-${INT_CHARDET}.tar.gz"
 
-  SOURCE[32]="$SRCDIR/sources/PyQtWebEngine_gpl-${INT_PYQTWEBENG}.tar.gz"
-  SRCURL[32]="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${INT_PYQTWEBENG}/PyQtWebEngine_gpl-${INT_PYQTWEBENG}.tar.gz"
+  SOURCE[32]="$SRCDIR/sources/PyQtWebEngine-${INT_PYQTWEBENG}.tar.gz"
+  SRCURL[32]="https://www.riverbankcomputing.com/static/Downloads/PyQtWebEngine/${INT_PYQTWEBENG}/PyQtWebEngine-${INT_PYQTWEBENG}.tar.gz"
 
   SOURCE[33]="$SRCDIR/sources/unrarsrc-${INT_UNRARSRC}.tar.gz"
   SRCURL[33]="http://www.rarlab.com/rar/unrarsrc-${INT_UNRARSRC}.tar.gz"
@@ -433,6 +436,10 @@ SOURCE[$NEXT_ARRAYEL]="$SRCDIR/sources/podofo-${INT_PODOFO}.tar.gz"
 SRCURL[$NEXT_ARRAYEL]="https://downloads.sourceforge.net/podofo/podofo-${INT_PODOFO}.tar.gz"
 NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
 
+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 ))
+
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
@@ -642,23 +649,9 @@ make_qt5() {
     # Fix path to mysql header
     cat $PATCHDIR/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
 
-    # Fix keyboard input in webengine:
-    cd qtbase
-      cat $PATCHDIR/qt5.qtbug-77364.patch | patch -p1 --verbose || exit 1
-    cd - 1>/dev/null
-
-    # Make qtwebengine compile against pulseaudio 13,
-    cd qtwebengine/src/3rdparty
-      cat $PATCHDIR/qt5.qtbug-77037.patch | patch -p1 --verbose || exit 1
-    cd - 1>/dev/null
-
     if ! pkg-config --exists libpulse 2>/dev/null ; then
       # Forcibly disable pulseaudio in qtwebengine:
       cat $PATCHDIR/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1
-      # Disable pulseaudio in Qt5:
-      PACONF="-no-pulseaudio"
-    else
-      PACONF=" "
     fi
 
     # Use our custom compiler and linker flags:
@@ -1144,7 +1137,7 @@ make_pyqt5() {
   PYTHON2VER=$(python2 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null)
   PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' 2>/dev/null )
 
-  cd $TMP/tmp-$PRGNAM/PyQt5_gpl-${INT_PYQT5}
+  cd $TMP/tmp-$PRGNAM/PyQt5-${INT_PYQT5}
 
   if [ "$P1" != "--oldbuild" ]; then
     # Remove code that is unneeded if Qt is not bundled and crashes on python2
@@ -1198,7 +1191,7 @@ make_pyqtwebengine() {
   local MOD="pyqtwebengine"
   echo -e "\n**  $MOD  **\n"
 
-  cd $TMP/tmp-$PRGNAM/PyQtWebEngine_gpl-${INT_PYQT5}
+  cd $TMP/tmp-$PRGNAM/PyQtWebEngine-${INT_PYQT5}
 
   if [ "${BUILD_QT}" = "NO" ]; then
     export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5
@@ -1423,6 +1416,37 @@ make_hunspell() {
 
 
 #
+# Build hyphen:
+#
+make_hyphen() {
+
+  local MOD="hyphen"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/hyphen-${INT_HYPHEN}
+
+  LDFLAGS="" \
+  LD_LIBRARY_PATH="/usr/lib${LIBDIRSUFFIX}/calibre/lib" \
+  ./configure \
+    --prefix=/usr/lib${LIBDIRSUFFIX}/calibre \
+    --enable-shared=yes \
+    --enable-static=no \
+    --build=$TARGET \
+    --host=$TARGET \
+    2>&1 | tee $OUTPUT/configure-${PRGNAM}_${MOD}.log
+
+  make 2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
+  make install DESTDIR=$PKG 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_${MOD}.log
+
+  # Add documentation:
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD}
+  cp -a AUTHORS COPYIN* ChangeLog INSTALL NEWS READM* THANKS TODO \
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD} || true
+
+} # End make_hyphen
+
+
+#
 # Build python-regex:
 #
 make_regex() {
@@ -1942,6 +1966,9 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   make_podofo
   rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
+  make_hyphen
+  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
   make_unrarsrc
   rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
   # End - not part of Slackware