Update to 0.8.6 with dbus-python added so that device interactions finally work

1 files changed, 45 insertions, 4 deletions

diff --git a/calibre/build/calibre.SlackBuild b/calibre/build/calibre.SlackBuild
index 1f539be0..e96b94f8 100755
--- a/calibre/build/calibre.SlackBuild
+++ b/calibre/build/calibre.SlackBuild
@@ -40,8 +40,9 @@
 # 0.8.3-1:    02/jun/2011 by Eric Hameleers <alien@slackware.com>
 #             * Update. Optionally, include the required python 2.7.x plus
 #               additional modules in the package.
-# 0.8.4-1:    05/jun/2011 by Eric Hameleers <alien@slackware.com>
-#             * Update.
+# 0.8.6-1:    17/jun/2011 by Eric Hameleers <alien@slackware.com>
+#             * Update. Added dbus-python to the internal python 2.7 libraries,
+#               this was required for device detection and manipulation.
 # 
 # Run 'sh calibre.SlackBuild' to build a Slackware package.
 # The package (.txz) and .txt file as well as build logs are created in /tmp .
@@ -52,7 +53,7 @@
 # Set initial variables:
 
 PRGNAM=calibre
-VERSION=${VERSION:-0.8.4}
+VERSION=${VERSION:-0.8.6}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
@@ -61,6 +62,8 @@ DOCS="LICENSE* Changelog* COPYRIGHT README*"
 
 PYTHON=$(python -c 'import sys; print sys.version[:3]')
 
+REQUIRED_PYTHON="2.7"
+
 # Only used in case we need to build our own python:
 INT_PYTHON=2.7.1
 INT_SETUPTOOLS=0.6c11
@@ -72,6 +75,7 @@ INT_IMAGING=1.1.7
 INT_LXML=2.3
 INT_MECHANIZE=0.2.5
 INT_SIP=4.12.3
+INT_DBUSPYTHON=0.84.0
 INT_PYQT=4.8.4
 
 # Where do we look for sources?
@@ -86,7 +90,7 @@ OUTPUT=${OUTPUT:-/tmp}
 SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
 SRCURL[0]="http://downloads.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
 
-if [ "$PYTHON" = "2.7" ]; then
+if [ "$PYTHON" = "$REQUIRED_PYTHON" ]; then
   BUILD_PYTHON="NO"
 else
   # We need to build our own python 2.7 plus supporting modules:
@@ -125,6 +129,9 @@ else
   SOURCE[11]="$SRCDIR/sip-${INT_SIP}.tar.gz"
   SRCURL[11]="http://www.riverbankcomputing.co.uk/static/Downloads/sip4/sip-${INT_SIP}.tar.gz"
 
+  SOURCE[12]="$SRCDIR/dbus-python-${INT_DBUSPYTHON}.tar.gz"
+  SRCURL[12]="http://dbus.freedesktop.org/releases/dbus-python/dbus-python-${INT_DBUSPYTHON}.tar.gz"
+
 fi
 
 ##
@@ -485,6 +492,37 @@ make_sip() {
 } # End make_sip
 
 #
+# Build dbus-python:
+#
+make_dbuspython() {
+
+  echo -e "\n**  dbus-python  **\n"
+
+  cd $TMP/tmp-$PRGNAM/dbus-python-${INT_DBUSPYTHON}
+
+  LDFLAGS="" \
+  LD_LIBRARY_PATH="/usr/lib${LIBDIRSUFFIX}/calibre/lib" \
+  PYTHON_INCLUDES="-I/usr/lib${LIBDIRSUFFIX}/calibre/include/python${REQUIRED_PYTHON}" \
+  PYTHON_LIBS="-L/usr/lib${LIBDIRSUFFIX}/calibre/lib -lpython${REQUIRED_PYTHON}" \
+  ./configure \
+    --prefix=/usr/lib${LIBDIRSUFFIX}/calibre \
+    --enable-shared=yes \
+    --enable-static=no \
+    --build=$ARCH-slackware-linux \
+    --host=$ARCH-slackware-linux \
+    2>&1 | tee $OUTPUT/configure-${PRGNAM}_dbuspython.log
+
+  make 2>&1 | tee $OUTPUT/make-${PRGNAM}_dbuspython.log
+  make install DESTDIR=$PKG 2>&1 | tee -a $OUTPUT/make-${PRGNAM}_dbuspython.log
+
+  # Add documentation:
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/dbus-python
+  cp -a AUTHORS COPYING* INSTALL NEWS README* \
+    $PKG/usr/doc/$PRGNAM-$VERSION/dbus-python || true
+
+}
+
+#
 # Build PyQt:
 #
 make_pyqt() {
@@ -644,6 +682,9 @@ if [ "$BUILD_PYTHON" = "YES" ]; then
   make_setuptools
   rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
 
+  make_dbuspython
+  rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/
+
   make_BeautifulSoup
   rsync -a $PKG/usr/lib${LIBDIRSUFFIX}/calibre/ /usr/lib${LIBDIRSUFFIX}/calibre/