From e4f1c0334718fe5422b11915d6b7bd76b871919b Mon Sep 17 00:00:00 2001
From: Thorn Inurcide <thorn@darkstar.forever>
Date: Thu, 20 Jul 2017 02:27:45 -0500
Subject: [PATCH] updates to avoid stepping on KDE4s toes

---
 .../tdefilelight.SlackBuild}                  |  3 +-
 .../tdektorrent.SlackBuild}                   | 34 ++++++++++---------
 BUILD-TDE.sh                                  |  4 +--
 3 files changed, 22 insertions(+), 19 deletions(-)
 rename Apps/{filelight/filelight.SlackBuild => tdefilelight/tdefilelight.SlackBuild} (98%)
 rename Apps/{ktorrent/ktorrent.SlackBuild => tdektorrent/tdektorrent.SlackBuild} (97%)

diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/tdefilelight/tdefilelight.SlackBuild
similarity index 98%
rename from Apps/filelight/filelight.SlackBuild
rename to Apps/tdefilelight/tdefilelight.SlackBuild
index 4e62fb6..f7ce151 100644
--- a/Apps/filelight/filelight.SlackBuild
+++ b/Apps/tdefilelight/tdefilelight.SlackBuild
@@ -23,6 +23,7 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
+PKGNAM=tdefilelight
 PRGNAM=filelight
 VERSION=${VERSION:-$TDEVERSION}
 BUILD=${BUILD:-1}
@@ -78,6 +79,7 @@ strip_fn
 
 mkdir_install_fn
 
+PRGNAM=$PKGNAM
 echo "
 # HOW TO EDIT THIS FILE:
 # The 'handy ruler' below makes it easier to edit a package description.  Line
@@ -100,5 +102,4 @@ $PRGNAM:
 $PRGNAM: 
 " > $PKG/install/slack-desc
 
-
 makepkg_fn
diff --git a/Apps/ktorrent/ktorrent.SlackBuild b/Apps/tdektorrent/tdektorrent.SlackBuild
similarity index 97%
rename from Apps/ktorrent/ktorrent.SlackBuild
rename to Apps/tdektorrent/tdektorrent.SlackBuild
index 02860de..60f14d9 100644
--- a/Apps/ktorrent/ktorrent.SlackBuild
+++ b/Apps/tdektorrent/tdektorrent.SlackBuild
@@ -23,6 +23,7 @@
 #   OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 #   SUCH DAMAGE.
 
+PKGNAM=tdektorrent
 PRGNAM=ktorrent
 VERSION=${VERSION:-$TDEVERSION}
 BUILD=${BUILD:-1}
@@ -62,6 +63,22 @@ strip_fn
 
 mkdir_install_fn
 
+cat <<EOINS >> $PKG/install/doinst.sh
+# Update the desktop database:
+if [ -x usr/bin/update-desktop-database ]; then
+  chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1
+fi
+
+# Update hicolor theme cache:
+if [ -d usr/share/icons/hicolor ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null
+  fi
+fi
+
+EOINS
+
+PRGNAM=$PKGNAM
 echo "
 # HOW TO EDIT THIS FILE:
 # The 'handy ruler' below makes it easier to edit a package description.  Line
@@ -72,7 +89,7 @@ echo "
        |-----handy-ruler------------------------------------------------------|
 $PRGNAM: $PRGNAM (A TDE BitTorrent client)
 $PRGNAM:
-$PRGNAM: A bitTorrent client for TDE
+$PRGNAM: A BitTorrent client for TDE
 $PRGNAM:
 $PRGNAM: 
 $PRGNAM: 
@@ -84,19 +101,4 @@ $PRGNAM:
 $PRGNAM: Home: https://www.trinitydesktop.org/index.php
 " > $PKG/install/slack-desc
 
-cat <<EOINS >> $PKG/install/doinst.sh
-# Update the desktop database:
-if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1
-fi
-
-# Update hicolor theme cache:
-if [ -d usr/share/icons/hicolor ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null
-  fi
-fi
-
-EOINS
-
 makepkg_fn
diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh
index aefe2bd..aa39ffd 100755
--- a/BUILD-TDE.sh
+++ b/BUILD-TDE.sh
@@ -347,7 +347,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
 " Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Runtime option for Amarok \Zn" \
 "Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi.  \Zn" \
 "Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6 A d3lphin.desktop file is included - see dolphin.SlackBuild.  \Zn" \
-"Apps/filelight" "Graphical diskspace display" off "\Zb\Z6 Runtime requirement x/xdpyinfo \Zn" \
+"Apps/tdefilelight" "Graphical diskspace display" off "\Zb\Z6 Runtime requirement x/xdpyinfo \Zn" \
 "Apps/gtk-qt-engine" "A GTK+2 theme engine" off "\Zb\Z6   \Zn" \
 "Apps/gtk3-tqt-engine" "A GTK+3 theme engine" off "\Zb\Z6   \Zn" \
 "Apps/tdegwenview" "An image viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi.  \Zn" \
@@ -369,7 +369,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
 "Apps/kshutdown" "Shutdown utility for TDE" off "\Zb\Z6   \Zn" \
 "Apps/ksquirrel" "An image viewer with OpenGL and KIPI support." off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi libksquirrel. \Zn" \
 "Apps/kvpnc" "TDE frontend for various vpn clients" off "\Zb\Z6 Miscellaneous documentation will be in $(cat $TMPVARS/INSTALL_TDE)/doc/kvpnc-$(cat $TMPVARS/TDEVERSION)  \Zn" \
-"Apps/ktorrent" "A BitTorrent client for TDE" off "\Zb\Z6   \Zn" \
+"Apps/tdektorrent" "A BitTorrent client for TDE" off "\Zb\Z6   \Zn" \
 "Apps/kaffeine" "Media player for TDE" off "\Zb\Z6   \Zn" \
 "Apps/rosegarden" "Audio sequencer and musical notation editor" off "\Zb\Z6 Requires jack-audio-connection-kit liblo and dssi for proper funtionality \Zn" \
 "Apps/kbfx" "Alternate menu for TDE" off "\Zb\Z6   \Zn" \