From 6ac3ef2abee42b80cb3cf565405ef06c16b97887 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Sun, 3 Jun 2018 20:28:04 +0100 Subject: [PATCH] Corrected untar_fn for R14.0.4 build Added Apps/knetstats --- Apps/knetstats/knetstats.SlackBuild | 91 +++++++++++++++++++++++++++++ BUILD-TDE.sh | 1 + get-source.sh | 34 ++++++----- 3 files changed, 111 insertions(+), 15 deletions(-) create mode 100644 Apps/knetstats/knetstats.SlackBuild diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild new file mode 100644 index 0000000..aaa8de3 --- /dev/null +++ b/Apps/knetstats/knetstats.SlackBuild @@ -0,0 +1,91 @@ +#!/bin/sh +# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST +# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, Netherlands +# Copyright 2015-2017 Thorn Inurcide +# Copyright 2015-2017 tde-slackbuilds project on GitHub +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +PRGNAM=knetstats +VERSION=${VERSION:-$TDEVERSION} +BUILD=${BUILD:-1} +TAG=${TAG:-_tde} + +source ../../get-source.sh +getsource_fn + +untar_fn + +# set support for additional language(s) as per I18N variable +# but only for languages available with this package +langs="";for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang";done +sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am + +ltoolupdate_fn + +listdocs_fn + +chown_fn + +cd_builddir_fn + +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ +../configure \ + --prefix=$INSTALL_TDE \ + --sysconfdir="/etc/trinity" \ + --mandir=$INSTALL_TDE/man \ + --disable-rpath \ + --enable-closure + +make_fn + +installdocs_fn + +strip_fn + +mkdir_install_fn + +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +knetstats: knetstats is a simple TDE network monitor that shows rx/tx LEDs for +knetstats: any network interface on a system tray icon. +knetstats: +knetstats: +knetstats: +knetstats: +knetstats: With language support for: +knetstats: en$langs +knetstats: +knetstats: +knetstats: +" > $PKG/install/slack-desc + +makepkg_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index b40cf8f..8239ef4 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -409,6 +409,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Apps/kdbusnotification" "A DBUS notification to TDE interface" off "\Zb\Z6 \Zn" \ "Apps/kile" "A TEX and LATEX source editor and shell" off "\Zb\Z6 \Zn" \ "Apps/knemo" "The TDE Network Monitor" off "\Zb\Z6 \Zn" \ +"Apps/knetstats" "A network monitor that shows rx/tx LEDs" off "\Zb\Z6 \Zn" \ "Apps/knights" "A graphical chess interface" off "\Zb\Z6 \Zn" \ "Apps/knmap" "A graphical nmap interface" off "\Zb\Z6 Might need tdesudo \Zn" \ " Misc/GraphicsMagick" "Swiss army knife of image processing" off "\Zb\Z6 Buildtime option for chalk[krita] in koffice \Zn" \ diff --git a/get-source.sh b/get-source.sh index 59295a5..dbbfe50 100755 --- a/get-source.sh +++ b/get-source.sh @@ -231,10 +231,25 @@ untar_fn () { cd $TMP_BUILD/tmp-$PRGNAM [[ $TDEVERSION == R14.0.4 || $TDEMIR_SUBDIR == misc ]] && { +## unpack R14 or misc echo -e "\n unpacking $(basename $SOURCE) ... \n" -tar -xf $SOURCE - +tar -xf $SOURCE +[[ $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) || true + echo "yes15 $PWD" >> $TMPVARS/got-this-far +} || { +## copy git repo but don't copy .git directory: +(cd $BUILD_TDE_ROOT/src/cgit + echo "yes16 $PWD" >> $TMPVARS/got-this-far +cp -a --parents $PRGNAM/* $TMP_BUILD/tmp-$PRGNAM/ +cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ +[[ " arts tdelibs " == *$PRGNAM* ]] && cp -a --parents libltdl/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ +[[ " tdenetwork " == *$PRGNAM* ]] && cp -a --parents libtdevnc/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/) + echo yes17 >> $TMPVARS/got-this-far +} && cd $PRGNAM 2>/dev/null || cd $PRGNAM-$VERSION + echo yes18 >> $TMPVARS/got-this-far +[[ $TDEVERSION == R14.0.4 ]] && { ## patch to allow automake 1.16.x + echo yes19 >> $TMPVARS/got-this-far [[ -s admin/cvs.sh ]] && echo $' --- admin/cvs.sh +++ admin/cvs.sh @@ -244,19 +259,8 @@ tar -xf $SOURCE ' | while read line do patch -p0 -done || true -} || { -## don't copy .git directory: -(cd $BUILD_TDE_ROOT/src/cgit - echo "yes15 $PWD" >> $TMPVARS/got-this-far -cp -a --parents $PRGNAM/* $TMP_BUILD/tmp-$PRGNAM/ -cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ -[[ " arts tdelibs " == *$PRGNAM* ]] && cp -a --parents libltdl/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ -[[ " tdenetwork " == *$PRGNAM* ]] && cp -a --parents libtdevnc/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/) - echo yes16 >> $TMPVARS/got-this-far -} && { -[[ $TDEVERSION == R14.0.4 && $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) || true -} && cd $PRGNAM 2>/dev/null || cd $PRGNAM-$VERSION +done +} || true # avoid exit 1 if patch n/a } listdocs_fn ()