qbittorrent: updated to 3.3.1. Still using Qt4 (default is now Qt5)

1 files changed, 13 insertions, 9 deletions

diff --git a/qbittorrent/build/qbittorrent.SlackBuild b/qbittorrent/build/qbittorrent.SlackBuild
index d3424d5d..59364f82 100755
--- a/qbittorrent/build/qbittorrent.SlackBuild
+++ b/qbittorrent/build/qbittorrent.SlackBuild
@@ -103,6 +103,9 @@
 #             * Update.
 # 3.2.5-1:    23/nov/2015 by Eric Hameleers <alien@slackware.com>
 #             * Update.
+# 3.3.1-1:    28/dec/2015 by Eric Hameleers <alien@slackware.com>
+#             * Update. Embedded GeoIP database no longer needed, the program
+#               will download a new GeoIP2 database monthly.
 # 
 # Run 'sh qbittorrent.SlackBuild' to build a Slackware package.
 # The package (.tgz) and .txt file as well as build logs are created in /tmp .
@@ -113,13 +116,16 @@
 # Set initial variables:
 
 PRGNAM=qbittorrent
-VERSION=${VERSION:-3.2.5}
+VERSION=${VERSION:-3.3.1}
 BUILD=${BUILD:-1}
 NUMJOBS=${NUMJOBS:" -j4 "}
 TAG=${TAG:-alien}
 
 DOCS="AUTHORS CODING_GUIDELINES.md COPYING Changelog INSTALL NEWS README* TODO" 
 
+# Luckily Qt4 is still supported but no longer the default:
+SLOPTS="--with-qt4"
+
 # Where do we look for sources?
 SRCDIR=$(cd $(dirname $0); pwd)
 
@@ -131,9 +137,6 @@ OUTPUT=${OUTPUT:-/tmp}
 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 --- ##
 ##
@@ -228,14 +231,15 @@ echo "Extracting the source archive(s) for $PRGNAM..."
 tar -xvf ${SOURCE[0]}
 cd ${PRGNAM}-${VERSION}
 
-# GeoIP database will be embedded in the binary:
-gunzip -cd ${SOURCE[1]} > src/gui/geoip/GeoIP.dat
+# GeoIP database will be downloaded once a month since v3.3.0.
 
-# On Slackware 13, you need to install python27 package in parallel to the
-# too-old python 2.6 or else you won't be able to use the search engine:
 if [ $(cat /etc/slackware-version |cut -f2 -d' ' |cut -f1 -d.) -eq 13 ]; then
+  # On Slackware 13, you need to install python27 package in parallel to the
+  # too-old python 2.6 or else you won't be able to use the search engine:
   cat $SRCDIR/patches/qbittorrent_slack13_python27.diff |patch -p1 --verbose \
     2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+  # The old gcc-4.5 used '-std=c++0x' which was later dubbed 'std=c++11':
+  sed -i -e 's/std=c++11/std=c++0x/' $(grep -lr "std=c++11" .)
 fi
 
 chown -R root:root .
@@ -259,9 +263,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --localstatedir=/var \
   --sysconfdir=/etc \
-  --with-geoip-database-embedded \
   --program-prefix= \
   --program-suffix= \
+  ${SLOPTS} \
   --build=$TARGET \
   2>&1 | tee $OUTPUT/configure-${PRGNAM}.log