network/transmission: Restore Qt client.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 13 insertions, 41 deletions

diff --git a/network/transmission/README b/network/transmission/README
index 6b73e94c74d5..cbfcb736cc63 100644
--- a/network/transmission/README
+++ b/network/transmission/README
@@ -1,20 +1,15 @@
 transmission (bittorrent client)
 
 Transmission is a lightweight open source BitTorrent client, providing
-useful functionality without feature bloat. It consists of a daemon, a
-GTK+ client, and CLI client [*].
+useful functionality without feature bloat. It consists of a daemon
+and GTK+, Qt, and CLI clients.
 
-By default, all 3 components are built. Specific parts can be disabled
+By default, all 4 components are built. Specific parts can be disabled
 by setting one or more environment variables:
 
 GTK=no
+QT=no
 CLI=no
 DAEMON=no
 
-At least one component must be enabled (so all 3 set to "no" won't work).
-
-[*] If you're wondering about the Qt client that was in the previous
-    version of transmission: It's no longer possible to build on
-    Slackware 14.2 as of transmission-3.0.0, due to outdated g++ and
-    libstdc++. If you don't mind using an older version of transmission
-    (2.94), you can install transmission-qt4 to get a Qt GUI.
+At least one component must be enabled (all 4 set to "no" won't work).
diff --git a/network/transmission/slack-desc b/network/transmission/slack-desc
index b6a5284dc1ac..5ab683a1b913 100644
--- a/network/transmission/slack-desc
+++ b/network/transmission/slack-desc
@@ -10,7 +10,7 @@ transmission: transmission (bittorrent client)
 transmission:
 transmission: Transmission is a lightweight open source BitTorrent client,
 transmission: providing useful functionality without feature bloat.
-transmission: It consists of a daemon, a GTK+, Qt and CLI client.
+transmission: It consists of a daemon and GTK+, Qt, and CLI clients.
 transmission:
 transmission: This package built with options:
 transmission: @opts@
diff --git a/network/transmission/transmission.SlackBuild b/network/transmission/transmission.SlackBuild
index 0d4e80716c79..2aa1b05cc3a1 100644
--- a/network/transmission/transmission.SlackBuild
+++ b/network/transmission/transmission.SlackBuild
@@ -24,6 +24,7 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20210926 bkw: BUILD=2, restore Qt5 build. 15.0 not yet released, but "soon".
 # 20200525 bkw: update for v3.00.
 #               Drop Qt GUI and QT=yes, due to 14.2's old gcc/libstdc++.
 #               It will come back when 15.0 releases.
@@ -42,7 +43,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=transmission
 VERSION=${VERSION:-3.00}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -54,9 +55,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -84,32 +82,17 @@ fi
 
 set -e
 
-# 20200525 bkw: I had to drop the Qt client, let's make sure the user
-# knows that.
-if [ "${QT:-no}" != "no" ]; then
-  cat <<EOF 1>&2
-
-**********************************************************************
-The Qt GUI in this version of transmission can't be built on Slackware
-14.2. If you don't mind using an older version of transmission, you
-can install transmission-qt4 to get a Qt GUI.
-**********************************************************************
-
-EOF
-  exit 1
-fi
-
 GTK="${GTK:-yes}"
-#QT="${QT:-yes}"
+QT="${QT:-yes}"
 CLI="${CLI:-yes}"
 DAEMON="${DAEMON:-yes}"
 
-if [ "$GTK" != "yes" -a "$CLI" != "yes" -a "$DAEMON" != "yes" ]; then
+if [ "$GTK" != "yes" -a "$CLI" != "yes" -a "$DAEMON" != "yes" -a "$QT" != "yes" ]; then
   cat <<EOF 1>&2
 
 ******************************************************************
 Can't build transmission with everything disabled, at least one of
-GTK CLI DAEMON must be 'yes'.
+GTK CLI QT DAEMON must be 'yes'.
 ******************************************************************
 
 EOF
@@ -161,12 +144,7 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install-strip DESTDIR=$PKG
 
-if false; then
-# As of 3.0.0, transmission-qt can't be built on Slackware 14.2.
-# Needs a newer g++ and libstdc++ than we have.
-# Left here for reference when 15.0 comes out.
-#if [ "$QT" = "yes" ]; then
-
+if [ "$QT" = "yes" ]; then
   # build the Qt client (transmission-qt) unless disabled
   # Fix hard-coded path of man file of Qt client
   sed -i "s|share/man/|man/|" qt/qtr.pro
@@ -197,8 +175,7 @@ cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-#sed "s,@opts@,GTK=$GTK QT=$QT CLI=$CLI DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc
-sed "s,@opts@,GTK=$GTK CLI=$CLI DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc
+sed "s,@opts@,GTK=$GTK QT=$QT CLI=$CLI QT=$QT DAEMON=$DAEMON," $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG