From 05472b63d2939850d01fb8fa9200252aa804adc6 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Sun, 4 Dec 2016 10:21:04 +0000 Subject: [PATCH] Updates - see issue #21 --- Apps/digikam/digikam.SlackBuild | 2 +- Apps/dolphin/dolphin.SlackBuild | 2 +- Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild | 2 +- .../gtk3-tqt-engine.SlackBuild | 2 +- Apps/k9copy/k9copy.SlackBuild | 2 +- Apps/kbookreader/kbookreader.SlackBuild | 2 +- Apps/kile/kile.SlackBuild | 2 +- Apps/knemo/knemo.SlackBuild | 2 +- Apps/knights/knights.SlackBuild | 2 +- Apps/kshutdown/kshutdown.SlackBuild | 2 +- ...n-docs.tar.xz => ksquirrel-en-docs.tar.xz} | Bin Apps/ksquirrel/ksquirrel.SlackBuild | 4 +-- Apps/potracegui/potracegui.SlackBuild | 2 +- .../tde-style-lipstik.SlackBuild | 2 +- .../tde-style-qtcurve.SlackBuild | 2 +- Apps/tdeamarok/tdeamarok.SlackBuild | 2 +- .../tdegwenview-i18n.SlackBuild | 2 +- Apps/tdegwenview/tdegwenview.SlackBuild | 2 +- Apps/tdeio-locate/tdeio-locate.SlackBuild | 2 +- Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild | 2 +- Apps/tdek3b/tdek3b.SlackBuild | 4 +-- .../twin-style-crystal.SlackBuild | 2 +- BUILD-TDE.sh | 27 ++++++++++++++---- CHANGELOG | 1 + Core/tde-i18n/tde-i18n.SlackBuild | 2 +- Core/tdeaddons/tdeaddons.SlackBuild | 2 +- Core/tdeartwork/tdeartwork.SlackBuild | 2 +- Core/tdebase/tdebase.SlackBuild | 2 +- Core/tdegames/tdegames.SlackBuild | 2 +- Core/tdegraphics/tdegraphics.SlackBuild | 2 +- Core/tdelibs/slack-desc | 2 +- Core/tdelibs/tdelibs.SlackBuild | 2 +- Core/tdemultimedia/tdemultimedia.SlackBuild | 2 +- Core/tdenetwork/tdenetwork.SlackBuild | 2 +- Core/tdenetwork/tdenetwork.SlackBuild-cmake | 2 +- Core/tdepim/tdepim.SlackBuild | 4 +-- Core/tdesdk/tdesdk.SlackBuild | 2 +- Core/tdetoys/tdetoys.SlackBuild | 2 +- Core/tdeutils/tdeutils.SlackBuild | 2 +- Core/tdevelop/tdevelop.SlackBuild | 2 +- Core/tdewebdev/tdewebdev.SlackBuild | 2 +- Deps/arts/arts.SlackBuild | 2 +- Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild | 2 +- Deps/dbus-tqt/dbus-tqt.SlackBuild | 2 +- Deps/libart_lgpl/libart_lgpl.SlackBuild | 2 +- Deps/libcaldav/libcaldav.SlackBuild | 3 +- Deps/tqca-tls/tqca-tls.SlackBuild | 2 +- Deps/tqt3/tqt3.SlackBuild | 2 +- Deps/tqtinterface/tqtinterface.SlackBuild | 2 +- Libs/kipi-plugins/kipi-plugins.SlackBuild | 2 +- Libs/libksquirrel/libksquirrel.SlackBuild | 2 +- Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild | 2 +- Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild | 2 +- Libs/tdelibkipi/tdelibkipi.SlackBuild | 2 +- Misc/libmp4v2/libmp4v2.SlackBuild | 2 +- src/README | 4 +-- 56 files changed, 81 insertions(+), 62 deletions(-) rename Apps/ksquirrel/{ksquirrel-R14.0.3-en-docs.tar.xz => ksquirrel-en-docs.tar.xz} (100%) diff --git a/Apps/digikam/digikam.SlackBuild b/Apps/digikam/digikam.SlackBuild index 0a1cf09..5037e9e 100755 --- a/Apps/digikam/digikam.SlackBuild +++ b/Apps/digikam/digikam.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=digikam -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index 6edeccd..b9e0055 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=dolphin -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild index 3c570ee..de46a13 100755 --- a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild +++ b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=gtk-qt-engine -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild index 5c77dca..24085af 100755 --- a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild +++ b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=gtk3-tqt-engine -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild index e04eefb..2ea2ab5 100755 --- a/Apps/k9copy/k9copy.SlackBuild +++ b/Apps/k9copy/k9copy.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=k9copy -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index e79c024..e2984b3 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=kbookreader -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index d9b0a27..2d38c55 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=kile -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index a404b71..e312436 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=knemo -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index aeacd86..272c362 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=knights -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index 07c77a8..e04d2e9 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=kshutdown -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/ksquirrel/ksquirrel-R14.0.3-en-docs.tar.xz b/Apps/ksquirrel/ksquirrel-en-docs.tar.xz similarity index 100% rename from Apps/ksquirrel/ksquirrel-R14.0.3-en-docs.tar.xz rename to Apps/ksquirrel/ksquirrel-en-docs.tar.xz diff --git a/Apps/ksquirrel/ksquirrel.SlackBuild b/Apps/ksquirrel/ksquirrel.SlackBuild index 9d565d9..890508a 100755 --- a/Apps/ksquirrel/ksquirrel.SlackBuild +++ b/Apps/ksquirrel/ksquirrel.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=ksquirrel -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -68,7 +68,7 @@ cd ${PRGNAM} DOCS=$(for file in AUTHORS* ChangeLog* COPYING* FAQ* INSTALL* KNOWNBUGS* LICEN?E* NEWS* *README* TODO* *.lsm;do [[ -s $file ]] && ls -1 $file;done ) || true # add English help documentation -tar xf $SRCDIR/ksquirrel-R14.0.3-en-docs.tar.xz +tar xf $SRCDIR/ksquirrel-en-docs.tar.xz cp doc/ru/*png doc/en # set support for additional language(s) as per I18N variable diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index d08567b..861ba4e 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=potracegui -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild index c87460a..b6b55b7 100755 --- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild +++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tde-style-lipstik -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild index 7ec5530..483898b 100755 --- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild +++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tde-style-qtcurve -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/tdeamarok/tdeamarok.SlackBuild b/Apps/tdeamarok/tdeamarok.SlackBuild index 81956e5..0944af9 100755 --- a/Apps/tdeamarok/tdeamarok.SlackBuild +++ b/Apps/tdeamarok/tdeamarok.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=tdeamarok PRGNAM=amarok -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild index 8b7cd9e..09b3d54 100755 --- a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild +++ b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=tdegwenview-i18n PRGNAM=gwenview-i18n -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/tdegwenview/tdegwenview.SlackBuild b/Apps/tdegwenview/tdegwenview.SlackBuild index d6db8fc..7dcca1f 100755 --- a/Apps/tdegwenview/tdegwenview.SlackBuild +++ b/Apps/tdegwenview/tdegwenview.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=tdegwenview PRGNAM=gwenview -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild index b07dd63..8e409f8 100755 --- a/Apps/tdeio-locate/tdeio-locate.SlackBuild +++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdeio-locate -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild index 8b906eb..5c86882 100755 --- a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild +++ b/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=tdek3b-i18n PRGNAM=k3b-i18n -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Apps/tdek3b/tdek3b.SlackBuild b/Apps/tdek3b/tdek3b.SlackBuild index 6f7c1b7..23fe46b 100755 --- a/Apps/tdek3b/tdek3b.SlackBuild +++ b/Apps/tdek3b/tdek3b.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=tdek3b PRGNAM=k3b -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -40,7 +40,7 @@ echo " # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -tdek3b: tdek3b (The CD Creator, TDE R14.0.3 version) +tdek3b: tdek3b (The CD Creator, TDE $TDEVERSION version) tdek3b: tdek3b: K3b makes writing cds under Linux easy. It has an easy to use tdek3b: interface and supports CD burning (including on-the-fly), copying, diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild index 2831626..3768175 100755 --- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild +++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=twin-style-crystal -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 6573e75..bd7c398 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -7,7 +7,7 @@ fi dialog --no-shadow --colors --title " Introduction " --msgbox \ "\n - This is the set up script for TDE R14.0.3 SlackBuilds on Slackware 14.2 for setting user preferences and options. + This is the set up script for TDE SlackBuilds on Slackware 14.2 for setting user preferences and options. \n\n Source archives can be stored locally or downloaded during the build from a selected TDE mirror site. \n\n @@ -77,6 +77,15 @@ ROOT=$(pwd) run_dialog() { +rm -f $TMPVARS/TDEVERSION +dialog --nocancel --no-shadow --colors --title " TDE Version " --inputbox \ +"\n +Set the version of TDE to be built. +\n\n" \ +10 75 R14.0.4 \ +2> $TMPVARS/TDEVERSION + + rm -f $TMPVARS/INSTALL_TDE dialog --nocancel --no-shadow --colors --title " TDE Installation Directory " --inputbox \ "\n @@ -222,7 +231,6 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Deps/dbus-1-tqt" "\Zb\Zr\Z4R\Zn D-Bus bindings" ${SELECT:-off} "\Zb\Z6 \Zn" \ "Deps/libart_lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" ${SELECT:-off} "\Zb\Z6 \Zn" \ "Deps/tqca-tls" "\Zb\Zr\Z4R\Zn Plugin to provide SSL/TLS capability" ${SELECT:-off} "\Zb\Z6 \Zn" \ -"Deps/libcaldav" "\Zb\Zr\Z4R\Zn Calendaring Extensions to WebDAV" ${SELECT:-off} "\Zb\Z6 \Zn" \ "Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" ${SELECT:-off} "\Zb\Z6 \Zn" \ "Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" ${SELECT:-off} "\Zb\Z6 \Zn" \ "Core/tdeutils" "Collection of utilities including ark" off "\Zb\Z6 \Zn" \ @@ -231,6 +239,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Core/tdegraphics" "Misc graphics apps" off "\Zb\Z6 \Zn" \ "Core/tdeaddons" "Additional plugins and scripts" off "\Zb\Z6 \Zn" \ "Core/tdegames" "Games for TDE - atlantik, kasteroids, katomic, etc." off "\Zb\Z6 \Zn" \ +"Deps/libcaldav" "Calendaring Extensions to WebDAV" off "\Zb\Z6 Optional dependency for korganizer [tdepim] \Zn" \ "Core/tdepim" "Personal Information Management" off "\Zb\Z6 \Zn" \ "Core/tdesdk" "Tools used by TDE developers" off "\Zb\Z6 Requires tdepim \Zn" \ "Core/tdevelop" "TDE development programs" off "\Zb\Z6 Requires tdesdk \Zn" \ @@ -280,8 +289,15 @@ sed -i -e 's|$| |' -e 's|"||g' $TMPVARS/TDEbuilds [[ ! -e $TMPVARS/TDEbuilds ]] && run_dialog +## These are changes to the default SlackBuild where an optional dependency is selected +# If libcaldav is installed, or if building libcaldav for korganizer, +# change option in tdepim.SlackBuild to "ON" +[[ $(ls /var/log/packages/libcaldav*) || $(grep libcaldav $TMPVARS/TDEbuilds) ]] && \ +export LCALDAV="ON" + + # option to change to stop the build when it fails -if [[ $(cat $TMPVARS/build-new) == no ]] ; then +if [[ $(cat $TMPVARS/build-new) == no ]] 2> /dev/null ; then if [[ $(cat $TMPVARS/EXIT_FAIL) == "" ]] ; then if [[ $(cat $TMPVARS/KEEP_BUILD) == no ]] ; then dialog --defaultno --yes-label "Continue" --no-label "Stop" --no-shadow --colors --title " Action on failure - 2 " --yesno \ @@ -311,6 +327,7 @@ echo ###################### # there should be no need to make any changes below +export TDEVERSION=$(cat $TMPVARS/TDEVERSION) export INSTALL_TDE=$(cat $TMPVARS/INSTALL_TDE) export TDE_MIRROR=$(cat $TMPVARS/TDE_MIRROR) export NUMJOBS=$(cat $TMPVARS/NUMJOBS) @@ -375,8 +392,8 @@ do # tde-i18n package installation is handled in tde-i18n.SlackBuild because if more than one i18n package is being built, only the last one will be installed by upgradepkg # Note to self: this alteration appears to fix the problem (Erroing and refusing to compile) BUT makes the script recomnpile it if you run the # script with re-use even though it is installed -if [[ $INST == 1 ]] && [[ ${package} != tde-i18n ]]; then upgradepkg --install-new --reinstall $TMP/${package}-${version}-*-${build}*.txz -if [[ $(ls /var/log/packages/${package}-*${version}-*-${build}*) ]]; then +if [[ $INST == 1 ]] && [[ ${package} != tde-i18n ]]; then upgradepkg --install-new --reinstall $TMP/${package}-$(eval echo $version)-*-${build}*.txz +if [[ $(ls /var/log/packages/${package}-*$(eval echo $version)-*-${build}*) ]]; then sed -i "s|$dir ||" $TMPVARS/TDEbuilds else echo " diff --git a/CHANGELOG b/CHANGELOG index a853fb9..5e8e633 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,2 +1,3 @@ 12/29/2015 Removed Avahi and krb5 as deps 08/01/2016 Overhaul to entire build process using a dialog script - Thanks Ray-V +2016-12-04 Issue 21 - Added TDEVERSION variable. Changed libcaldav to optional dependency. Updated mp4v2 URL. diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index fc4a6d7..b1f6264 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tde-i18n -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} SlackDesc() diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild index c13d27e..68bb87a 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdeaddons -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild index e72b30a..f0e715f 100755 --- a/Core/tdeartwork/tdeartwork.SlackBuild +++ b/Core/tdeartwork/tdeartwork.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdeartwork -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 7049c12..c9c6232 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -25,7 +25,7 @@ # Thanks to Slackware 12.2 SlackBuild for kdebase PRGNAM=tdebase -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild index 6d9643e..8d66081 100755 --- a/Core/tdegames/tdegames.SlackBuild +++ b/Core/tdegames/tdegames.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdegames -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index 2f7068b..72b6237 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdegraphics -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdelibs/slack-desc b/Core/tdelibs/slack-desc index 789a2c9..ccdcac9 100755 --- a/Core/tdelibs/slack-desc +++ b/Core/tdelibs/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| tdelibs: tdelibs (TDE libraries) tdelibs: -tdelibs: This is version R14.0.3 of the Trinity Desktop Environment [TDE] +tdelibs: These are the Trinity Desktop Environment [TDE] tdelibs: libraries. This package includes libraries that are central tdelibs: to the development and execution of a KDE program, as well tdelibs: as internationalization files for these libraries, misc HTML diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index 4bdf264..b12cb2f 100755 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdelibs -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index 7efdbf1..b8ba9a9 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdemultimedia -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-2} TAG=${TAG:-_tde} diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index a3cd416..750680a 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdenetwork -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdenetwork/tdenetwork.SlackBuild-cmake b/Core/tdenetwork/tdenetwork.SlackBuild-cmake index bb01b11..f8ecad2 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild-cmake +++ b/Core/tdenetwork/tdenetwork.SlackBuild-cmake @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdenetwork -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild index 01058de..5779b85 100755 --- a/Core/tdepim/tdepim.SlackBuild +++ b/Core/tdepim/tdepim.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdepim -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -55,7 +55,7 @@ cd build-${PRGNAM} -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_GNOKII="OFF" \ - -DWITH_CALDAV="OFF" \ + -DWITH_CALDAV=${LCALDAV:-"OFF"} \ -DWITH_CARDDAV="OFF" \ -DBUILD_ALL="ON" \ -Wno-dev \ diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild index a79ad74..0867e15 100755 --- a/Core/tdesdk/tdesdk.SlackBuild +++ b/Core/tdesdk/tdesdk.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdesdk -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdetoys/tdetoys.SlackBuild b/Core/tdetoys/tdetoys.SlackBuild index 1157069..262e50f 100755 --- a/Core/tdetoys/tdetoys.SlackBuild +++ b/Core/tdetoys/tdetoys.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdetoys -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index 31fa7f2..cc04c82 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdeutils -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdevelop/tdevelop.SlackBuild b/Core/tdevelop/tdevelop.SlackBuild index 27ad138..5182daa 100755 --- a/Core/tdevelop/tdevelop.SlackBuild +++ b/Core/tdevelop/tdevelop.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdevelop -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index 0750cdc..9ef7c85 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tdewebdev -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Deps/arts/arts.SlackBuild b/Deps/arts/arts.SlackBuild index 40f9510..62009ce 100755 --- a/Deps/arts/arts.SlackBuild +++ b/Deps/arts/arts.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=arts -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild index a7a869e..0939794 100755 --- a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild +++ b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=dbus-1-tqt -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Deps/dbus-tqt/dbus-tqt.SlackBuild b/Deps/dbus-tqt/dbus-tqt.SlackBuild index 36516ed..11e347f 100755 --- a/Deps/dbus-tqt/dbus-tqt.SlackBuild +++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=dbus-tqt -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Deps/libart_lgpl/libart_lgpl.SlackBuild b/Deps/libart_lgpl/libart_lgpl.SlackBuild index 46a82c9..975a003 100755 --- a/Deps/libart_lgpl/libart_lgpl.SlackBuild +++ b/Deps/libart_lgpl/libart_lgpl.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=libart-lgpl -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} PKGNAME=libart_lgpl diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index af9f276..822ff8c 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=libcaldav -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -47,6 +47,7 @@ CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ CXXFLAGS="${SLKCFLAGS}" \ ./autogen.sh \ --prefix=${INSTALL_TDE} \ + --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ --sysconfdir="/etc/trinity" \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ diff --git a/Deps/tqca-tls/tqca-tls.SlackBuild b/Deps/tqca-tls/tqca-tls.SlackBuild index 64e2c42..64c4872 100755 --- a/Deps/tqca-tls/tqca-tls.SlackBuild +++ b/Deps/tqca-tls/tqca-tls.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tqca-tls -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} DOCS="COPYING README" diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild index aa2773f..ff6306b 100755 --- a/Deps/tqt3/tqt3.SlackBuild +++ b/Deps/tqt3/tqt3.SlackBuild @@ -25,7 +25,7 @@ # Much help from the 12.2 SlackBuild script of qt3. And from SBo qt3 script PRGNAM=tqt3 -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Deps/tqtinterface/tqtinterface.SlackBuild b/Deps/tqtinterface/tqtinterface.SlackBuild index 3dc8a3b..52f8855 100755 --- a/Deps/tqtinterface/tqtinterface.SlackBuild +++ b/Deps/tqtinterface/tqtinterface.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=tqtinterface -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Libs/kipi-plugins/kipi-plugins.SlackBuild b/Libs/kipi-plugins/kipi-plugins.SlackBuild index 792fcd6..43ba8ea 100755 --- a/Libs/kipi-plugins/kipi-plugins.SlackBuild +++ b/Libs/kipi-plugins/kipi-plugins.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=kipi-plugins -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Libs/libksquirrel/libksquirrel.SlackBuild b/Libs/libksquirrel/libksquirrel.SlackBuild index 53c09f0..e7aedf0 100755 --- a/Libs/libksquirrel/libksquirrel.SlackBuild +++ b/Libs/libksquirrel/libksquirrel.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PRGNAM=libksquirrel -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild index fe94d2f..a710df0 100755 --- a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild +++ b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=tdelibkdcraw PRGNAM=libkdcraw -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild index c7a96da..69498b0 100755 --- a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild +++ b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild @@ -23,7 +23,7 @@ # SUCH DAMAGE. PKGNAM=tdelibkexiv2 PRGNAM=libkexiv2 -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Libs/tdelibkipi/tdelibkipi.SlackBuild b/Libs/tdelibkipi/tdelibkipi.SlackBuild index b80e224..c6bb4b9 100755 --- a/Libs/tdelibkipi/tdelibkipi.SlackBuild +++ b/Libs/tdelibkipi/tdelibkipi.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=tdelibkipi PRGNAM=libkipi -VERSION=${VERSION:-R14.0.3} +VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} diff --git a/Misc/libmp4v2/libmp4v2.SlackBuild b/Misc/libmp4v2/libmp4v2.SlackBuild index 9649e48..a3d507d 100755 --- a/Misc/libmp4v2/libmp4v2.SlackBuild +++ b/Misc/libmp4v2/libmp4v2.SlackBuild @@ -30,7 +30,7 @@ TAG=${TAG:-} DOCS="COPYING README*" -SRCURL="http://mp4v2.googlecode.com/files/${PRGNAM}-${VERSION}.tar.bz2" +SRCURL="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PRGNAM}/${PRGNAM}-${VERSION}.tar.bz2" source ../../get-source.sh cd $TMP/tmp-$PRGNAM diff --git a/src/README b/src/README index 3a014c1..378548b 100644 --- a/src/README +++ b/src/README @@ -1,4 +1,4 @@ If you place the source code for TDE here, the scripts will use them instead of downloading them individually -For Version R14.0.3: -http://tde-mirror.yosemite.net/trinity/releases/R14.0.3/downloads.html +For Version R14.0.x: +http://tde-mirror.yosemite.net/trinity/releases/R14.0.x/downloads.html