calibre: updated to 2.37.0

1 files changed, 31 insertions, 33 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 1f6c0590..7032d68a 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -30,8 +30,8 @@
 # URL:        http://calibre-ebook.com/
 # Needs:      icu4c, podofo;
 #             And if your system already has python2.7, you will also need:
-#             BeautifulSoup, dnspython, pycrypto, pysetuptools, python-apsw,
-#             python-cssselect, python-cssutils, python-dateutil, python-lxml,
+#             dnspython, pycrypto, pysetuptools, python-apsw,
+#             python-cssutils, python-dateutil, python-lxml,
 #             python-mechanize, python-netifaces, python-psutil
 # Changelog:  
 # 0.7.20-1:   25/Sep/2010 by Eric Hameleers <alien@slackware.com>
@@ -52,6 +52,9 @@
 #             * Update.
 # 2.35.0-1:   14/aug/2015 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 2.37.0-1:   04/sep/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update. Removed BeautifulSoup as dependency. Minimal required
+#               version of Python becomes 2.7.9.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -60,7 +63,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=calibre
-VERSION=${VERSION:-2.35.0}
+VERSION=${VERSION:-2.37.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j4 "}
 TAG=${TAG:-alien}
@@ -73,7 +76,7 @@ SLACKVER=${SLACKVER:-$(cat /etc/slackware-version |cut -d' ' -f2)}
 REQUIRED_QT="5.3.2"
 
 # Only used in case we need to build our own Qt:
-INT_QT=5.4.1
+INT_QT=5.5.0
 
 REQUIRED_MTP="1.1.5"
 
@@ -84,14 +87,13 @@ INT_MTP=1.1.8
 INT_MAGICK=6.9.1-9
 
 REQUIRED_PYTHON="2.7"
-REQUIRED_PYTHON_MIN="1"
+REQUIRED_PYTHON_MIN="9"
 
 # Only used in case we need to build our own python:
 INT_PYTHON=2.7.9
 
 # Only used in case we need to build our own python modules:
 INT_SETUPTOOLS=14.3
-INT_BEAUTIFULSOUP=4.3.2
 INT_DNSPYTHON=1.9.4
 INT_CSSUTILS=0.9.9
 INT_DATEUTIL=1.5
@@ -172,8 +174,8 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   SOURCE[1]="$SRCDIR/setuptools-${INT_SETUPTOOLS}.tar.gz"
   SRCURL[1]="http://pypi.python.org/packages/source/s/setuptools/setuptools-${INT_SETUPTOOLS}.tar.gz"
 
-  SOURCE[2]="$SRCDIR/beautifulsoup4-${INT_BEAUTIFULSOUP}.tar.gz"
-  SRCURL[2]="http://www.crummy.com/software/BeautifulSoup/bs4/download/$(echo $INT_BEAUTIFULSOUP | cut -d. -f1,2)/beautifulsoup4-${INT_BEAUTIFULSOUP}.tar.gz"
+  SOURCE[2]="$SRCDIR/Pygments-${INT_PYGMENTS}.tar.gz"
+  SRCURL[2]="https://pypi.python.org/packages/source/P/Pygments/Pygments-${INT_PYGMENTS}.tar.gz"
 
   SOURCE[3]="$SRCDIR/dnspython-${INT_DNSPYTHON}.tar.gz"
   SRCURL[3]="http://www.dnspython.org/kits/${INT_DNSPYTHON}/dnspython-${INT_DNSPYTHON}.tar.gz"
@@ -216,9 +218,6 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   #SRCURL[15]="https://github.com/rogerbinns/apsw/releases/download/${INT_APSW}/apsw-${INT_APSW}.zip"
   SRCURL[15]="https://apsw.googlecode.com/files/apsw-${INT_APSW}.zip"
 
-  SOURCE[16]="$SRCDIR/Pygments-${INT_PYGMENTS}.tar.gz"
-  SRCURL[16]="https://pypi.python.org/packages/source/P/Pygments/Pygments-${INT_PYGMENTS}.tar.gz"
-
   NEXT_ARRAYEL=${#SOURCE[@]}
 else
   NEXT_ARRAYEL=1
@@ -413,6 +412,14 @@ make_qt5() {
   ln -s ../../../../../tools/perf \
    qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/
 
+  # Use -reduce-relocations only on i?86 and x86_64 architextures.
+  # https://bugreports.qt-project.org/browse/QTBUG-36129
+  if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
+    RELOCATIONS="-reduce-relocations"
+  else
+    RELOCATIONS=""
+  fi
+
   # Fix path to mysql header
   cat $PATCHDIR/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
 
@@ -452,7 +459,6 @@ make_qt5() {
     -optimized-qmake \
     -qpa xcb \
     -qt-harfbuzz \
-    -reduce-relocations \
     -verbose \
     -xcb \
     -nomake examples \
@@ -462,7 +468,7 @@ make_qt5() {
     -no-separate-debug-info \
     -no-strip \
     -no-use-gold-linker \
-    -no-separate-debug-info \
+    $RELOCATIONS \
     -no-pch
 
   # Sometimes a failure happens when parallelizing make.  Retry if make fails,
@@ -477,6 +483,17 @@ make_qt5() {
     src/{corelib,declarative,gui,script}/*/*_p.h \
     ${PKG}/usr/lib${LIBDIRSUFFIX}/calibre/
 
+  # Fix internal linking for Qt5WebKit.pc , thanks to Larry Hajali's SBo script:
+  sed -i \
+    -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit[^ ]* ||" \
+    -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit2[^ ]* ||" \
+    -e "s|-Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebCore[^ ]* ||" \
+    -e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/ANGLE[^ ]* ||" \
+    -e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \
+    -e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \
+    -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \
+    $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
+
   # Add documentation:
   mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD}
   cp -a GPL_EXCEPTION*.TXT LICENSE* README* \
@@ -642,22 +659,6 @@ make_setuptools() {
 } # End make_setuptools
 
 #
-# Build BeautifulSoup:
-#
-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
-
-#
 # Build dnspython:
 #
 make_dnspython() {
@@ -1256,9 +1257,6 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
     make_setuptools
     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_apsw || exit 1
     rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
@@ -1401,7 +1399,7 @@ mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
 if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   cat $SRCDIR/slack-required \
-    | grep -Ev "BeautifulSoup|dnspython|pycrypto|pysetuptools|python-apsw|dbus-python|python-cssutils|python-dateutil|python-lxml|python-mechanize|python-netifaces|python-psutil|python-pygments" \
+    | grep -Ev "dnspython|pycrypto|pysetuptools|python-apsw|dbus-python|python-cssutils|python-dateutil|python-lxml|python-mechanize|python-netifaces|python-psutil|python-pygments" \
     > $PKG/install/slack-required
 else
   cat $SRCDIR/slack-required > $PKG/install/slack-required