calibre: update to 3.32.0

1 files changed, 18 insertions, 5 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 9eb397e7..c45188f9 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -104,6 +104,8 @@
 # 3.30.0-1:   24/aug/2018 by Eric Hameleers <alien@slackware.com>
 #             * Update.  Note that Calibre won't compile against Qt 5.11.x
 #               so for slackware-current internal Qt 5.9 libraries are added.
+# 3.32.0-1:   30/sep/2018 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 .
@@ -113,7 +115,7 @@
 
 PRGNAM=calibre
 SRCNAM=calibre
-VERSION=${VERSION:-3.30.0}
+VERSION=${VERSION:-3.32.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
 TAG=${TAG:-alien}
@@ -160,7 +162,7 @@ INT_HTML5PARSER=0.4.1
 INT_IMAGING=3.2.0
 INT_LXML=3.8.0
 INT_MECHANIZE=0.3.3
-INT_MSGPACK=0.4.8
+INT_MSGPACK=0.5.6
 INT_NETIFACES=0.10.6
 INT_OPTIPNG=0.7.5
 INT_PSUTIL=4.3.0
@@ -170,6 +172,7 @@ INT_PYQT5=5.9.2
 INT_REGEX=2018.07.11
 INT_SIP=4.19.8
 INT_SIX=1.10.0
+INT_SQLITE=3250200
 INT_UNRARDLL=0.1.3
 INT_WEBENC=0.5.1
 INT_APSW=3.23.1-r1
@@ -309,6 +312,9 @@ if [ "$BUILD_PYTHONMODS" = "YES" ]; then
   SOURCE[23]="$SRCDIR/unrardll-${INT_UNRARDLL}.tar.gz"
   SRCURL[23]="https://pypi.io/packages/source/u/unrardll/unrardll-${INT_UNRARDLL}.tar.gz"
 
+  SOURCE[24]="$SRCDIR/sqlite-amalgamation-${INT_SQLITE}.zip"
+  SRCURL[24]="https://www.sqlite.org/2018/sqlite-amalgamation-${INT_SQLITE}.zip"
+
   NEXT_ARRAYEL=${#SOURCE[@]}
 else
   NEXT_ARRAYEL=1
@@ -682,7 +688,7 @@ make_mtp() {
 
   # Add documentation:
   mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD}
-  cp -a COPYING* README* \
+  cp -a README* \
     $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD} || true
 
 } # End make_libmtp
@@ -1134,6 +1140,10 @@ make_apsw() {
 
   cd $TMP/tmp-$PRGNAM/apsw-${INT_APSW}
 
+  # Link in the SQLite amalgamation files to compile sqlite
+  # statically into the module:
+  ln -s ../sqlite-amalgamation-${INT_SQLITE} sqlite3
+
   # Compile and install
   export CFLAGS="$SLKCFLAGS"
   python2 setup.py install --root=$PKG \
@@ -1771,8 +1781,8 @@ if [ "$BUILD_PYTHON" = "YES" ]; then
 
   # Compiling bytecode makes Calibre startup much faster:
   set +e
-  /usr/lib${LIBDIRSUFFIX}/calibre/python2 -m compileall ${PKG}/usr/lib${LIBDIRSUFFIX}/calibre/
-  /usr/lib${LIBDIRSUFFIX}/calibre/python2 -OO -m compileall ${PKG}/usr/lib${LIBDIRSUFFIX}/calibre/
+  /usr/lib${LIBDIRSUFFIX}/calibre/python2 -m compileall -d '/' ${PKG}/usr/lib${LIBDIRSUFFIX}/calibre/
+  /usr/lib${LIBDIRSUFFIX}/calibre/python2 -OO -m compileall -d '/' ${PKG}/usr/lib${LIBDIRSUFFIX}/calibre/
   set -e
 
   # Now we can remove these from the filesystem:
@@ -1822,6 +1832,9 @@ if [ "$BUILD_QT" = "YES" ]; then
   rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/calibre/{demos,doc,examples,tests}
 fi
 
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 # Strip binaries (if any):
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true