This version creates a working package on Slackware 13.37

1 files changed, 29 insertions, 4 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 74e30a5d..2395ca1f 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -206,6 +206,11 @@
 #             * New release.
 # 0.9.13-1:   04/jan/2013 by Eric Hameleers <alien@slackware.com>
 #             * New release. Updated the internal PyQt and SIP libraries.
+#               for Slackware 13.37, compile internal versions of Qt 4.8.x
+#               and libmtp 1.1.x.
+#               The internal copy of Qt 4.8 libraries have the 'private
+#               headers' installed, so that calibre's "qt_hack" works on
+#               Slackware 13.37.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -550,6 +555,12 @@ make_qt() {
     include/Qt{Core,Declarative,Gui,Script}/private \
     src/{corelib,declarative,gui,script}/*/*_p.h \
     ${PKG}/usr/lib${LIBDIRSUFFIX}/calibre/
+
+  # Add documentation:
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/qt
+  cp -a GPL_EXCEPTION*.TXT LICENSE* README* \
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/qt || true
+
 }
 
 #
@@ -583,6 +594,11 @@ make_mtp() {
 
   # No need for this in the calibre package:
   rm -rf $PKG/lib
+
+  # Add documentation:
+  mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/libmtp
+  cp -a COPYING README* \
+    $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/libmtp || true
 }
 
 #
@@ -912,8 +928,10 @@ make_pyqt() {
   make install DESTDIR=$PKG \
     2>&1 | tee -a $OUTPUT/make-${PRGNAM}_pyqt.log
 
-  # ... but remove ugly bits that threaten to overwrite a system file:
-  rm -r $PKG/usr/lib${LIBDIRSUFFIX}/qt
+  if [ "${BUILD_QT}" = "NO" ]; then
+    # Remove ugly bits that threaten to overwrite a system file:
+    rm -r $PKG/usr/lib${LIBDIRSUFFIX}/qt
+  fi
 
   # Add documentation:
   mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/calibre/doc/internaldeps/pyqt
@@ -1045,8 +1063,9 @@ make_calibre () {
       2>&1 | tee -a $OUTPUT/patch-$PRGNAM.log
   fi
 
-  # See if we picked up any linker flags for python:
+  # See if we picked up any compiler or linker flags for python:
   LDFLAGS=${LDFLAGS:-""}
+  CFLAGS=${CFLAGS:-""}
 
   # Place where we have to install stuff:
   PYTHONLIB=$( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()" )
@@ -1066,7 +1085,7 @@ make_calibre () {
   sed -i -e 's/\r//' src/calibre/web/feeds/recipes/*
 
   OVERRIDE_LDFLAGS="$LDFLAGS $SLKLDFLAGS" \
-  OVERRIDE_CFLAGS="$SLKCFLAGS" \
+  OVERRIDE_CFLAGS="$CFLAGS $SLKCFLAGS" \
   python setup.py build \
     2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
@@ -1148,6 +1167,7 @@ if [ "$BUILD_PYTHON" = "YES" -o "$BUILD_QT" = "YES" -o "$BUILD_MTP" = "YES" ]; t
     # Ensure that our non-standard python2.7 is found and used:
     export PATH="/usr/lib${LIBDIRSUFFIX}/calibre:/usr/lib${LIBDIRSUFFIX}/calibre/bin:$PATH"
     export PKG_CONFIG_PATH="/usr/lib${LIBDIRSUFFIX}/calibre/lib/pkgconfig:$PKG_CONFIG_PATH"
+    export CFLAGS="-I/usr/lib${LIBDIRSUFFIX}/calibre/include"
     export LDFLAGS="-Wl,-rpath /usr/lib${LIBDIRSUFFIX}/calibre/lib -L/usr/lib${LIBDIRSUFFIX}/calibre/lib"
 
   fi
@@ -1328,6 +1348,11 @@ cat $SRCDIR/$(basename $0) > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION
 find $PKG/usr/doc -type f -exec chmod 644 {} \;
 
+if [ "$BUILD_PYTHON" = "YES" ]; then
+  # If we built our own Qt then this can be removed from the package:
+  rm -rf $PKG/usr/lib${LIBDIRSUFFIX}/calibre/{demos,doc,examples,tests}
+fi
+
 # 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