qbittorrent: updated to 3.2.0.

1 files changed, 40 insertions, 25 deletions

diff --git a/qbittorrent/build/qbittorrent.SlackBuild b/qbittorrent/build/qbittorrent.SlackBuild
index e071cb1b..3aecfe73 100755
--- a/qbittorrent/build/qbittorrent.SlackBuild
+++ b/qbittorrent/build/qbittorrent.SlackBuild
@@ -94,6 +94,8 @@
 #             * Update.
 # 3.1.12-1:   07/mar/2015 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 3.2.0-1:    30/may/2015 by Eric Hameleers <alien@slackware.com>
+#             * Major update. Embed the GeoIP database into the binary.
 # 
 # Run 'sh qbittorrent.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -104,12 +106,12 @@
 # Set initial variables:
 
 PRGNAM=qbittorrent
-VERSION=${VERSION:-3.1.12}
+VERSION=${VERSION:-3.2.0}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
-DOCS="AUTHORS Changelog NEWS TODO COPYING INSTALL README*"
+DOCS="AUTHORS CODING_GUIDELINES.md COPYING Changelog INSTALL NEWS README* TODO" 
 
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
@@ -119,8 +121,11 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz"
-SRCURL="http://downloads.sourceforge.net/sourceforge/${PRGNAM}/${PRGNAM}-${VERSION}.tar.xz"
+SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tar.xz"
+SRCURL[0]="http://downloads.sourceforge.net/sourceforge/${PRGNAM}/${PRGNAM}-${VERSION}.tar.xz"
+
+SOURCE[1]="$SRCDIR/GeoIP.dat.gz"
+SRCURL[1]="http://geolite.maxmind.com/download/geoip/database/GeoLiteCountry/GeoIP.dat.gz"
 
 ##
 ## --- with a little luck, you won't have to edit below this point --- ##
@@ -179,24 +184,26 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
                           # remove old log files
 
 # Source file availability:
-if ! [ -f ${SOURCE} ]; then
-  echo "Source '$(basename ${SOURCE})' not available yet..."
-  # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
-  [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)"
-  if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi
-  if ! [ "x${SRCURL}" == "x" ]; then
-    echo "Will download file to $(dirname $SOURCE)"
-    wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true
-    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
-      echo "Downloading '$(basename ${SOURCE})' failed... aborting the build."
-      mv -f "${SOURCE}" "${SOURCE}".FAIL
+for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
+  if ! [ -f ${SOURCE[$i]} ]; then
+    echo "Source '$(basename ${SOURCE[$i]})' not available yet..."
+    # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
+    [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/$(basename ${SOURCE[$i]})"
+    if [ -f ${SOURCE[$i]} ]; then echo "Ah, found it!"; continue; fi
+    if ! [ "x${SRCURL[$i]}" == "x" ]; then
+      echo "Will download file to $(dirname $SOURCE[$i])"
+      wget -nv -T 20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
+      if [ $? -ne 0 -o ! -s "${SOURCE[$i]}" ]; then
+        echo "Fail to download '$(basename ${SOURCE[$i]})'. Aborting the build."
+        mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL
+        exit 1
+      fi
+    else
+      echo "File '$(basename ${SOURCE[$i]})' not available. Aborting the build."
       exit 1
     fi
-  else
-    echo "File '$(basename ${SOURCE})' not available... aborting the build."
-    exit 1
   fi
-fi
+done
 
 if [ "$P1" == "--download" ]; then
   echo "Download complete."
@@ -211,12 +218,11 @@ echo "++"
 
 cd $TMP/tmp-$PRGNAM
 echo "Extracting the source archive(s) for $PRGNAM..."
-tar -xvf ${SOURCE}
+tar -xvf ${SOURCE[0]}
 cd ${PRGNAM}-${VERSION}
 
-## Make it compile with qt-4.7 (fixed just after 3.1.4):
-#cat $SRCDIR/qbittorrent_qt47.patch | patch -p1 --verbose \
-#  2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+# GeoIP database will be embedded in the binary:
+gunzip -cd ${SOURCE[1]} > src/gui/geoip/GeoIP.dat
 
 chown -R root:root .
 chmod -R u+w,go+r-w,a+X-s .
@@ -234,10 +240,19 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --qtdir=/usr/lib${LIBDIRSUFFIX}/qt4
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --with-geoip-database-embedded \
+  --program-prefix= \
+  --program-suffix= \
+  --build=$TARGET \
+  2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 
 make $NUMJOBS 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
-make INSTALL_ROOT=$PKG install  2>&1 | tee $OUTPUT/install-${PRGNAM}.log
+make INSTALL_ROOT=$PKG install 2>&1 | tee $OUTPUT/install-${PRGNAM}.log
 
 # Add this to the doinst.sh:
 mkdir -p $PKG/install