calibre: updated to 2.50.1

1 files changed, 45 insertions, 7 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 9360036a..5eb6c701 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 # $Id$
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015  Eric Hameleers, Eindhoven, NL
+# Copyright 2010, 2011, 2012, 2013, 2014, 2015, 2016  Eric Hameleers, Eindhoven, NL
 # All rights reserved.
 #
 #   Permission to use, copy, modify, and distribute this software for
@@ -28,7 +28,7 @@
 # For:        calibre
 # Descr:      e-book library management application
 # URL:        http://calibre-ebook.com/
-# Needs:      icu4c, podofo;
+# Needs:      icu4c, podofo, qt5;
 #             And if your system already has python2.7, you will also need:
 #             dnspython, pycrypto, pysetuptools, python-apsw,
 #             python-cssutils, python-dateutil, python-lxml,
@@ -63,6 +63,8 @@
 #             * Update.
 # 2.45.0-1:   02/dec/2015 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 2.50.1-1:   01/feb/2016 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 .
@@ -71,7 +73,7 @@
 # -----------------------------------------------------------------------------
 
 PRGNAM=calibre
-VERSION=${VERSION:-2.45.0}
+VERSION=${VERSION:-2.50.1}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:-" -j4 "}
 TAG=${TAG:-alien}
@@ -110,6 +112,7 @@ INT_IMAGING=2.8.1
 INT_LXML=3.2.1
 INT_MECHANIZE=0.2.5
 INT_NETIFACES=0.8
+INT_OPTIPNG=0.7.5
 INT_PSUTIL=0.6.1
 INT_PYGMENTS=2.0.2
 INT_SIP=4.16.7
@@ -267,6 +270,10 @@ if [ "$BUILD_MAGICK" = "YES" ]; then
   NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
 fi
 
+SOURCE[$NEXT_ARRAYEL]="$SRCDIR/optipng-${INT_OPTIPNG}.tar.gz"
+SRCURL[$NEXT_ARRAYEL]="http://prdownloads.sourceforge.net/optipng/optipng-${INT_OPTIPNG}.tar.gz"
+NEXT_ARRAYEL=$(( ${NEXT_ARRAYEL} + 1 ))
+
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
 ##
@@ -1021,6 +1028,31 @@ make_psutil() {
 
 } # End make_psutil
 
+#
+# Build optipng:
+#
+make_optipng() {
+
+  local MOD="optipng"
+  echo -e "\n**  $MOD  **\n"
+
+  cd $TMP/tmp-$PRGNAM/optipng-${INT_OPTIPNG}
+
+  ./configure -prefix=/usr \
+    2>&1 | tee $OUTPUT/configure-${PRGNAM}_${MOD}.log
+
+  make -C src 2>&1 | tee $OUTPUT/make-${PRGNAM}_${MOD}.log
+  mkdir -p $PKG/usr/bin
+  install -v -m0755 src/optipng/optipng $PKG/usr/bin/optipng-calibre \
+    2>&1 | tee -a $OUTPUT/make-${PRGNAM}_${MOD}.log
+
+  # Add documentation:
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD}
+  cp -a AUTHORS.txt LICENSE.txt README.tx* \
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/${MOD} || true
+
+} # End make_optipng
+
 
 # --------------
 # Build calibre:
@@ -1088,6 +1120,9 @@ make_calibre () {
   cat $SRCDIR/patches/calibre_freetype.patch | patch -p1 --verbose \
     2>&1 | tee -a $OUTPUT/patch-${PRGNAM}.log
 
+  # We carry a private version of optipng:
+  sed -i -e "s/optipng/&-calibre/g" $(grep -rl optipng {icons,src,setup/installer/linux})
+
   OVERRIDE_LDFLAGS="$LDFLAGS $SLKLDFLAGS" \
   OVERRIDE_CFLAGS="$CFLAGS $SLKCFLAGS" \
   python setup.py build \
@@ -1325,10 +1360,13 @@ if [ "$BUILD_PYTHON" = "YES" -o "$BUILD_PYTHONMODS" = "YES" -o "$BUILD_QT" = "YE
   fi
 fi
 
-#if [ "$BUILD_QT" = "YES" -o "$BUILD_MTP" = "YES" ]; then
-  # We need to point calibre's compilation at our custom headers:
-  export CFLAGS="-I/usr/lib${LIBDIRSUFFIX}/calibre/include"
-#fi
+# Not part of Slackware:
+make_optipng
+rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
+
+# We need to point calibre's compilation at our custom headers:
+export CFLAGS="-I/usr/lib${LIBDIRSUFFIX}/calibre/include"
 
 # The main course - compile calibre:
 make_calibre