calibre: properly handle qt5 internal/external logic

1 files changed, 20 insertions, 23 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 9c0e22ee..9eb397e7 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -28,8 +28,10 @@
 # For:        calibre
 # Descr:      e-book library management application
 # URL:        http://calibre-ebook.com/
-# Needs:      podofo, qt5, qt5-webkit, unrar;
-#             And if your system already has python2.7, you will also need:
+# Needs:      podofo, unrar;
+#             If you did not add Qt5 to the package, you will also need:
+#             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-mechanize, python-netifaces, python-psutil
@@ -100,7 +102,8 @@
 # 3.23.0-2:   23/may/2018 by Eric Hameleers <alien@slackware.com>
 #             * Rebuilt for new poppler in -current.
 # 3.30.0-1:   24/aug/2018 by Eric Hameleers <alien@slackware.com>
-#             * Update.
+#             * Update.  Note that Calibre won't compile against Qt 5.11.x
+#               so for slackware-current internal Qt 5.9 libraries are added.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -190,7 +193,8 @@ BUILD_MAGICK=${BUILD_MAGICK:-NO}
 
 # Allow the package builder to override BUILD_QT:
 if [ -z "$BUILD_QT" ]; then
-  if pkg-config --exists "Qt5Core >= $REQUIRED_QT" ; then
+  if pkg-config --exists "Qt5Core >= $REQUIRED_QT" && pkg-config --exists "Qt5Core <= $INT_QT" ;
+  then
     BUILD_QT="NO"
   else
     # We need to build our own qt5:
@@ -1825,27 +1829,20 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 # Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
+# Add the external dependencies :
+cat $SRCDIR/slack-required > $PKG/install/slack-required
 if [ "$BUILD_PYTHONMODS" = "YES" ]; then
-  cat $SRCDIR/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" \
-    > $PKG/install/slack-required
-else
-  cat $SRCDIR/slack-required > $PKG/install/slack-required
+  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" \
+    > $PKG/install/slack-required.temp 
+  mv $PKG/install/slack-required.temp  $PKG/install/slack-required
+fi
+if [ "$BUILD_QT" = "YES" ]; then
+  cat $PKG/install/slack-required \
+    | grep -Ev "libxkbcommon|libinput|libwacom|qt5|qt5-webkit" \
+    > $PKG/install/slack-required.temp 
+  mv $PKG/install/slack-required.temp  $PKG/install/slack-required
 fi
-
-# 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|libwacom|qt5-webkit" \
-      > $PKG/install/slack-required.temp 
-      mv $PKG/install/slack-required.temp  $PKG/install/slack-required
-    ;;
-  *)
-    ;;
-esac
-
 
 # Build the package:
 cd $PKG