diff --git a/Apps/digikam/digikam.SlackBuild b/Apps/digikam/digikam.SlackBuild index c14ae30..4108e80 100755 --- a/Apps/digikam/digikam.SlackBuild +++ b/Apps/digikam/digikam.SlackBuild @@ -85,7 +85,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index 0132695..60143a8 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -99,7 +99,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ .. diff --git a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild index 70bf73e..649cee6 100755 --- a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild +++ b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild @@ -55,7 +55,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -Wno-dev \ .. diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild index 6f2979b..8b18453 100755 --- a/Apps/k9copy/k9copy.SlackBuild +++ b/Apps/k9copy/k9copy.SlackBuild @@ -54,7 +54,7 @@ CC="gcc" \ CXX="g++" \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure \ diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild index 01e7a1a..ed573d4 100644 --- a/Apps/kaffeine/kaffeine.SlackBuild +++ b/Apps/kaffeine/kaffeine.SlackBuild @@ -69,7 +69,7 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure \ diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild index 3602ee3..8ef2a55 100755 --- a/Apps/kbfx/kbfx.SlackBuild +++ b/Apps/kbfx/kbfx.SlackBuild @@ -54,7 +54,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_ALL="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ diff --git a/Apps/kdbg/kdbg.SlackBuild b/Apps/kdbg/kdbg.SlackBuild index fd68115..1cdb13e 100755 --- a/Apps/kdbg/kdbg.SlackBuild +++ b/Apps/kdbg/kdbg.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure \ diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index 74d1b19..264c9a8 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -67,7 +67,7 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index 9ac58f5..b773c97 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -74,7 +74,7 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild index aaa8de3..a17ab13 100644 --- a/Apps/knetstats/knetstats.SlackBuild +++ b/Apps/knetstats/knetstats.SlackBuild @@ -53,7 +53,7 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index 2606485..be6126e 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -63,7 +63,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild index 3d251ff..04921bf 100755 --- a/Apps/koffice/koffice.SlackBuild +++ b/Apps/koffice/koffice.SlackBuild @@ -120,7 +120,7 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure diff --git a/Apps/krusader/krusader.SlackBuild b/Apps/krusader/krusader.SlackBuild index d69e9ea..258f7cd 100755 --- a/Apps/krusader/krusader.SlackBuild +++ b/Apps/krusader/krusader.SlackBuild @@ -80,7 +80,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-debug \ --build=$ARCH-slackware-linux diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index 3664b15..7412690 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -49,7 +49,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Apps/ksquirrel/ksquirrel.SlackBuild b/Apps/ksquirrel/ksquirrel.SlackBuild index 6da1e9a..565954c 100755 --- a/Apps/ksquirrel/ksquirrel.SlackBuild +++ b/Apps/ksquirrel/ksquirrel.SlackBuild @@ -62,7 +62,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index 9aea4ad..1c7942b 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-debug \ --build=$ARCH-slackware-linux diff --git a/Apps/piklab/piklab.SlackBuild b/Apps/piklab/piklab.SlackBuild index 0ed2de4..2221af3 100755 --- a/Apps/piklab/piklab.SlackBuild +++ b/Apps/piklab/piklab.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-debug \ --build=$ARCH-slackware-linux diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index 8eaa59c..c20d630 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -50,7 +50,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Apps/rosegarden/rosegarden.SlackBuild b/Apps/rosegarden/rosegarden.SlackBuild index 7376550..ae25431 100644 --- a/Apps/rosegarden/rosegarden.SlackBuild +++ b/Apps/rosegarden/rosegarden.SlackBuild @@ -52,7 +52,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DBUILD_ALL="ON" \ -DWANT_DEBUG="OFF" \ diff --git a/Apps/soundkonverter/soundkonverter.SlackBuild b/Apps/soundkonverter/soundkonverter.SlackBuild index 434be51..9894916 100755 --- a/Apps/soundkonverter/soundkonverter.SlackBuild +++ b/Apps/soundkonverter/soundkonverter.SlackBuild @@ -55,7 +55,7 @@ CC="gcc" \ CXX="g++" \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild index e9b3bc9..9f7149b 100755 --- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild +++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild index ea925e8..3ecdccf 100755 --- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild +++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild @@ -47,7 +47,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DBUILD_ALL="ON" \ .. diff --git a/Apps/tdeamarok/tdeamarok.SlackBuild b/Apps/tdeamarok/tdeamarok.SlackBuild index 0f06dfb..cfe3708 100755 --- a/Apps/tdeamarok/tdeamarok.SlackBuild +++ b/Apps/tdeamarok/tdeamarok.SlackBuild @@ -86,7 +86,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DWITH_MP4V2=${LMP4V2:-"OFF"} \ -DWITH_LIBVISUAL="ON" \ diff --git a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild index f0aed79..d165dc2 100755 --- a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild +++ b/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild @@ -70,7 +70,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Apps/tdegwenview/tdegwenview.SlackBuild b/Apps/tdegwenview/tdegwenview.SlackBuild index 30f9363..491a86b 100755 --- a/Apps/tdegwenview/tdegwenview.SlackBuild +++ b/Apps/tdegwenview/tdegwenview.SlackBuild @@ -49,7 +49,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild index 6b47d7a..ff200dc 100755 --- a/Apps/tdeio-locate/tdeio-locate.SlackBuild +++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild @@ -47,7 +47,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DBUILD_ALL="ON" \ .. diff --git a/Apps/tdek3b/tdek3b.SlackBuild b/Apps/tdek3b/tdek3b.SlackBuild index 100a6ec..aa61f46 100755 --- a/Apps/tdek3b/tdek3b.SlackBuild +++ b/Apps/tdek3b/tdek3b.SlackBuild @@ -120,7 +120,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_LIBDVDREAD="ON" \ -DWITH_MUSICBRAINZ=${MUSICBRAINZ:-"OFF"} \ diff --git a/Apps/tdektorrent/tdektorrent.SlackBuild b/Apps/tdektorrent/tdektorrent.SlackBuild index 60f14d9..addc81a 100644 --- a/Apps/tdektorrent/tdektorrent.SlackBuild +++ b/Apps/tdektorrent/tdektorrent.SlackBuild @@ -49,7 +49,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-torrent-mimetype \ diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild index 5e59bc1..fa40d44 100755 --- a/Apps/tdmtheme/tdmtheme.SlackBuild +++ b/Apps/tdmtheme/tdmtheme.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure \ diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild index 8a8069e..9ad746c 100755 --- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild +++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Apps/yakuake/yakuake.SlackBuild b/Apps/yakuake/yakuake.SlackBuild index 87b2745..6c7625f 100755 --- a/Apps/yakuake/yakuake.SlackBuild +++ b/Apps/yakuake/yakuake.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure \ diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 8239ef4..d915bc3 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -8,7 +8,6 @@ if [ ! -d $TMPVARS ]; then mkdir -p $TMPVARS fi -rm $TMPVARS/got-this-far ## testing ## remove marker for git admin/cmake to update or clone only once per run of this script rm -f $TMPVARS/admin-cmake-done @@ -111,6 +110,21 @@ Any other option will have to be edited into BUILD-TDE.sh 2> $TMPVARS/INSTALL_TDE +rm -f $TMPVARS/SYS_CNF_DIR +dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE System Configuration " --menu \ +" +Select the directory that the TDE System Configuration files should be installed in. + +Selecting '/etc/tde' will also set TDEHOME=~/.tde and TDEROOTHOME=/root/.tde, +otherwise the defaults of TDEHOME=~/.trinity and TDEROOTHOME=/root/.trinity will apply. + +" \ +18 75 2 \ +"/etc/trinity" "" \ +"/etc/tde" "" \ +2> $TMPVARS/SYS_CNF_DIR + + rm -f $TMPVARS/COMPILER dialog --cr-wrap --nocancel --no-shadow --colors --title " Compiler " --menu \ " @@ -528,7 +542,7 @@ sed -i 's|Apps/koffice|Misc/libpng &|' $TMPVARS/TDEbuilds ## this dialog will only run if any of the selected packages has a README rm -f $TMPVARS/READMEs ## generate list of READMEs .. -RM_LIST=$(find . -name "README" | grep -v tdebase | grep -o "[ACDLM][a-z]*/[-_0-z]*") +RM_LIST=$(find [ACDLM][a-z]* -name "README" | grep -v tdebase) for package in $(cat $TMPVARS/TDEbuilds) do [[ $RM_LIST == *$package* ]] && { @@ -605,6 +619,7 @@ fi;fi;fi export TDEVERSION=$(cat $TMPVARS/TDEVERSION) export INSTALL_TDE=$(cat $TMPVARS/INSTALL_TDE) +export SYS_CNF_DIR=$(cat $TMPVARS/SYS_CNF_DIR) export COMPILER=$(cat $TMPVARS/COMPILER) [[ $COMPILER == gcc ]] && export COMPILER_CXX="g++" || export COMPILER_CXX="clang++" export SET_march=$(cat $TMPVARS/SET_MARCH) @@ -671,6 +686,7 @@ Setup is complete - these are the build options: New build list \Zb\Z6$NEW_BUILD\Zn TDE version \Zb\Z6$TDEVERSION\Zn TDE installation directory \Zb\Z6$INSTALL_TDE\Zn +TDE system configuration directory \Zb\Z6$SYS_CNF_DIR\Zn Compiler \Zb\Z6$COMPILER\Zn gcc cpu optimization \Zb\Z6$SET_march\Zn Number of parallel jobs \Zb\Z6$(echo $NUMJOBS|sed 's|-j||')\Zn diff --git a/CHANGELOG b/CHANGELOG index 4935cb0..dbbccea 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,3 +19,5 @@ in the SlackBuilds. 2017-07-13 Issue 40 - koffice.SB, build 3. Fixed karbon build failure caused by configure options used for Sl14.2 ImageMagick build. 07/18/2017 Added avahi-tqt as an optional dep for users with avahi on their system already + +No longer maintained diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index b4b085e..8b3b0ce 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -54,6 +54,7 @@ cd $PRGNAM } || { mkdir -p $PRGNAM # need -p for git builds if more than one lang cd $PRGNAM +echo -e " copying $PRGNAM-$lang source files to build area ... \n" cp -a $BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang . cp -a $BUILD_TDE_ROOT/src/cgit/{admin,cmake} tde-i18n-$lang/ } @@ -70,7 +71,7 @@ cd $PRGNAM-$lang/build -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DBUILD_ALL="ON" \ @@ -99,7 +100,7 @@ echo " # 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------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| $PRGNAM-$lang: $PRGNAM-$lang: $PRGNAM-$lang $PRGNAM-$lang: diff --git a/Core/tdeaccessibility/tdeaccessibility.SlackBuild b/Core/tdeaccessibility/tdeaccessibility.SlackBuild index 7f963a1..6ab34f5 100755 --- a/Core/tdeaccessibility/tdeaccessibility.SlackBuild +++ b/Core/tdeaccessibility/tdeaccessibility.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure \ diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild index 496f7a5..1994cb7 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -122,7 +122,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_ALL_OPTIONS="ON" \ diff --git a/Core/tdeadmin/tdeadmin.SlackBuild b/Core/tdeadmin/tdeadmin.SlackBuild index 5257ec5..a01b876 100755 --- a/Core/tdeadmin/tdeadmin.SlackBuild +++ b/Core/tdeadmin/tdeadmin.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure \ diff --git a/Core/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild index c140ea9..bd7dce6 100755 --- a/Core/tdeartwork/tdeartwork.SlackBuild +++ b/Core/tdeartwork/tdeartwork.SlackBuild @@ -46,7 +46,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DWITH_ARTS="ON" \ diff --git a/Core/tdebase/config/Xsession b/Core/tdebase/config/Xsession index ca1886f..72aadb9 100755 --- a/Core/tdebase/config/Xsession +++ b/Core/tdebase/config/Xsession @@ -78,7 +78,7 @@ case $session in exec $HOME/.xsession ;; default) - exec $INSTALL_TDE/bin/starttde + exec {INSTALL_TDE}/bin/starttde ;; *) eval exec "$session" diff --git a/Core/tdebase/doinst.sh b/Core/tdebase/doinst.sh index 2b992f6..4df8d35 100755 --- a/Core/tdebase/doinst.sh +++ b/Core/tdebase/doinst.sh @@ -1,14 +1,14 @@ # Save old config files: if [ ! -L etc/X11/tdm ]; then if [ -d etc/X11/tdm ]; then - mkdir -p etc/trinity/tdm - cp -a etc/X11/tdm/* etc/trinity/tdm - rm -rf etc/X11/tdm - ( cd etc/X11 ; ln -sf /etc/trinity/tdm tdm ) + mkdir -p .{SYS_CNF_DIR}/tdm + cp -a etc/X11/tdm/* .{SYS_CNF_DIR}/tdm + rm -rf etc/X11/tdm + ( cd etc/X11 ; ln -sf ../..{SYS_CNF_DIR}/tdm tdm ) + elif [ ! -e etc/X11/tdm ]; then + mkdir -p etc/X11 + ( cd etc/X11 ; ln -sf ../..{SYS_CNF_DIR}/tdm tdm ) fi -elif [ ! -e etc/X11/tdm ]; then - mkdir -p etc/X11 - ( cd etc/X11 ; ln -sf /etc/trinity/tdm tdm ) fi @@ -23,45 +23,37 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } -config etc/trinity/tdm/tdmrc.new -config etc/trinity/tdm/backgroundrc.new +config .{SYS_CNF_DIR}/tdm/tdmrc.new +config .{SYS_CNF_DIR}/tdm/backgroundrc.new # 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 +$(which update-desktop-database) {INSTALL_TDE}/share/applications # Update the mime database: -if [ -x usr/bin/update-mime-database ]; then - chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1 -fi +$(which update-mime-database) /usr/share/mime + +# Update hicolor theme cache: +$(which gtk-update-icon-cache) -f -t {INSTALL_TDE}/share/icons/hicolor # update PATH -# upgradepkg runs this twice, so even though $TQTDIR/bin will be +# upgradepkg runs this twice, so even though {TQTDIR}/bin will be # a new PATH, it needs to be tested for the second run -if ! grep $INSTALL_TDE/bin /etc/profile +if ! grep {INSTALL_TDE}/bin /etc/profile then -echo "PATH=\$PATH:$INSTALL_TDE/bin:$TQTDIR/bin" >> /etc/profile +echo "PATH=\$PATH:{INSTALL_TDE}/bin:{TQTDIR}/bin" >> /etc/profile else -if ! grep $TQTDIR/bin /etc/profile +if ! grep {TQTDIR}/bin /etc/profile then -echo "PATH=\$PATH:$TQTDIR/bin" >> /etc/profile +echo "PATH=\$PATH:{TQTDIR}/bin" >> /etc/profile fi fi # update MANPATH -if ! grep $INSTALL_TDE/man /etc/profile +if ! grep {INSTALL_TDE}/man /etc/profile then -echo "export MANPATH=\$MANPATH:$INSTALL_TDE/man" >> /etc/profile +echo "export MANPATH=\$MANPATH:{INSTALL_TDE}/man" >> /etc/profile fi diff --git a/Core/tdebase/profile.d/tde.csh b/Core/tdebase/profile.d/tde.csh index cd3eee3..2cccaa5 100755 --- a/Core/tdebase/profile.d/tde.csh +++ b/Core/tdebase/profile.d/tde.csh @@ -1,10 +1,10 @@ #!/bin/csh # TDE additions: if ( ! $?TDEDIR ) then - setenv TDEDIR $INSTALL_TDE + setenv TDEDIR {INSTALL_TDE} endif if ( $?XDG_CONFIG_DIRS ) then - setenv XDG_CONFIG_DIRS $XDG_CONFIG_DIRS:/etc/trinity/xdg + setenv XDG_CONFIG_DIRS $XDG_CONFIG_DIRS:{SYS_CNF_DIR}/xdg else - setenv XDG_CONFIG_DIRS /etc/xdg:/etc/trinity/xdg + setenv XDG_CONFIG_DIRS /etc/xdg:{SYS_CNF_DIR}/xdg endif diff --git a/Core/tdebase/profile.d/tde.sh b/Core/tdebase/profile.d/tde.sh index 3063881..e58998e 100755 --- a/Core/tdebase/profile.d/tde.sh +++ b/Core/tdebase/profile.d/tde.sh @@ -1,10 +1,10 @@ #!/bin/sh # TDE additions: -TDEDIR=$INSTALL_TDE +TDEDIR={INSTALL_TDE} export TDEDIR if [ ! "$XDG_CONFIG_DIRS" = "" ]; then - XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:/etc/trinity/xdg + XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:{SYS_CNF_DIR}/xdg else - XDG_CONFIG_DIRS=/etc/xdg:/etc/trinity/xdg + XDG_CONFIG_DIRS=/etc/xdg:{SYS_CNF_DIR}/xdg fi export XDG_CONFIG_DIRS diff --git a/Core/tdebase/rc.4.local b/Core/tdebase/rc.4.local index dc971c4..2090f12 100644 --- a/Core/tdebase/rc.4.local +++ b/Core/tdebase/rc.4.local @@ -1,9 +1,9 @@ #! /bin/sh # Start TDM: -if [ -x $INSTALL_TDE/bin/tdm ]; then +if [ -x {INSTALL_TDE}/bin/tdm ]; then echo "Using TDM (Trinity Login Manager)." echo # log_cleanup "/var/log/tdm.log" - exec $INSTALL_TDE/bin/tdm -nodaemon -error /var/log/tdm.log + exec {INSTALL_TDE}/bin/tdm -nodaemon -error /var/log/tdm.log fi diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 2feb3f8..0680658 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -34,12 +34,15 @@ source ../../get-source.sh getsource_fn untar_fn + listdocs_fn ## patch for gcc7 twin/client.cpp:2978:38: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] sed -i 's|data != None|data != 0|' twin/client.cpp ## part 1/2 of setting konqueror filemanagement default view mode sed -i "s|konq_iconview|$VIEWMODE|" konqueror/profile_filemanagement.desktop +## allow for configuration files directory != /etc/trinity +sed -i "s|/etc/trinity/|$SYS_CNF_DIR/|" tdm/kfrontend/gentdmconf.c || true chown_fn @@ -54,7 +57,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_OPENEXR="ON" \ @@ -89,25 +92,25 @@ strip_fn # Add xinitrc: mkdir -p $PKG/etc/X11/xinit -sed "s|\$INSTALL_TDE|$INSTALL_TDE|g" < $SRCDIR/xinitrc.tde > $PKG/etc/X11/xinit/xinitrc.tde +sed "s|{INSTALL_TDE}|$INSTALL_TDE|g" < $SRCDIR/xinitrc.tde > $PKG/etc/X11/xinit/xinitrc.tde chmod 755 $PKG/etc/X11/xinit/xinitrc.tde (cd $PKG/etc/X11/xinit/ ln -sf xinitrc.tde xinitrc) mkdir -p $PKG/etc/profile.d -sed "s|\$INSTALL_TDE|$INSTALL_TDE|g" < $SRCDIR/profile.d/tde.sh > $PKG/etc/profile.d/tde.sh -sed "s|\$INSTALL_TDE|$INSTALL_TDE|g" < $SRCDIR/profile.d/tde.csh > $PKG/etc/profile.d/tde.csh +sed "s|{SYS_CNF_DIR}|$SYS_CNF_DIR|;s|{INSTALL_TDE}|$INSTALL_TDE|" < $SRCDIR/profile.d/tde.sh > $PKG/etc/profile.d/tde.sh +sed "s|{SYS_CNF_DIR}|$SYS_CNF_DIR|;s|{INSTALL_TDE}|$INSTALL_TDE|" < $SRCDIR/profile.d/tde.csh > $PKG/etc/profile.d/tde.csh chmod 755 $PKG/etc/profile.d/tde.{,c}sh # Add some configuration files / scripts needed by TDE. -mkdir -p $PKG/etc/trinity -mv $PKG$INSTALL_TDE/share/config/tdm $PKG/etc/trinity/tdm -( cd $PKG$INSTALL_TDE/share/config ; ln -sf /etc/trinity/tdm tdm ) +mkdir -p $PKG$SYS_CNF_DIR +mv $PKG$INSTALL_TDE/share/config/tdm $PKG$SYS_CNF_DIR/tdm +( cd $PKG$INSTALL_TDE/share/config ; ln -sf $SYS_CNF_DIR/tdm tdm ) # Add rc.4.local to give TDM priority over rc.4 X11 session manager options # Assumes that rc.4.new from sysvinit-scripts still has the rc.4.local option mkdir $PKG/etc/rc.d -sed "s|\$INSTALL_TDE|$INSTALL_TDE|" < $SRCDIR/rc.4.local > $PKG/etc/rc.d/rc.4.local +sed "s|{INSTALL_TDE}|$INSTALL_TDE|" < $SRCDIR/rc.4.local > $PKG/etc/rc.d/rc.4.local chmod 755 $PKG/etc/rc.d/rc.4.local # Set sane permissions for the include files. @@ -115,24 +118,20 @@ if [ -d $PKG$INSTALL_TDE/include ]; then find $PKG$INSTALL_TDE/include -type f -exec chmod 0644 {} \; fi -# Ensure correct login manager session file is available. -mkdir -p $PKG/usr/share/apps/tdm/sessions -cp $PKG$INSTALL_TDE/share/apps/tdm/sessions/tde.desktop $PKG/usr/share/apps/tdm/sessions/ || true - # Setup config files for TDM: -$PKG$INSTALL_TDE/bin/gentdmconf --no-old --no-old-scripts --no-backup --in $PKG/etc/trinity/tdm +$PKG$INSTALL_TDE/bin/gentdmconf --no-old --no-old-scripts --no-backup --in $PKG$SYS_CNF_DIR/tdm ## set correct paths for config files -sed -i 's|/opt/trinity/share/config/tdm/|/etc/trinity/tdm/|' $PKG/etc/trinity/tdm/tdmrc +sed -i "s|$INSTALL_TDE/share/config/tdm/|$SYS_CNF_DIR/tdm/|" $PKG$SYS_CNF_DIR/tdm/tdmrc # Allow root to login -sed 's|AllowRootLogin=false|AllowRootLogin=true|' $PKG/etc/trinity/tdm/tdmrc > $PKG/etc/trinity/tdm/tdmrc.new +sed 's|AllowRootLogin=false|AllowRootLogin=true|' $PKG$SYS_CNF_DIR/tdm/tdmrc > $PKG$SYS_CNF_DIR/tdm/tdmrc.new ## Remove tdmrc which has AllowRootLogin=false set and would be used for a new installation ## The installed tdmrc will be created by doinst.sh from tdmrc.new if it doesn't exist -rm $PKG/etc/trinity/tdm/tdmrc -mv $PKG/etc/trinity/tdm/Xsession $PKG/etc/trinity/tdm/Xsession.orig -cat $SRCDIR/config/Xsession | sed "s|\$INSTALL_TDE|$INSTALL_TDE|" > $PKG/etc/trinity/tdm/Xsession -mv $PKG/etc/trinity/tdm/backgroundrc $PKG/etc/trinity/tdm/backgroundrc.new -if [[ -r $PKG$INSTALL_TDE/etc/trinity/tdm/README ]]; then - sed -i "s|$TMP/package-tdebase/etc/trinity/tdm|/etc/trinity/tdm|" $PKG$INSTALL_TDE/etc/trinity/tdm/README +rm $PKG$SYS_CNF_DIR/tdm/tdmrc +mv $PKG$SYS_CNF_DIR/tdm/Xsession $PKG$SYS_CNF_DIR/tdm/Xsession.orig +cat $SRCDIR/config/Xsession | sed "s|{INSTALL_TDE}|$INSTALL_TDE|" > $PKG$SYS_CNF_DIR/tdm/Xsession +mv $PKG$SYS_CNF_DIR/tdm/backgroundrc $PKG$SYS_CNF_DIR/tdm/backgroundrc.new +if [[ -r $PKG$SYS_CNF_DIR/tdm/README ]]; then + sed -i "s|$TMP_BUILD/package-tdebase$SYS_CNF_DIR/tdm|$SYS_CNF_DIR/tdm|" $PKG$SYS_CNF_DIR/tdm/README fi mkdir_install_fn @@ -159,7 +158,7 @@ $PRGNAM: $PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc -sed -e "s|\$INSTALL_TDE|$INSTALL_TDE|g" -e "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/doinst.sh > $PKG/install/doinst.sh +sed "s|{SYS_CNF_DIR}|$SYS_CNF_DIR|;s|{INSTALL_TDE}|$INSTALL_TDE|;s|{TQTDIR}|$TQTDIR|" < $SRCDIR/doinst.sh > $PKG/install/doinst.sh [[ $RUNLEVEL == 4 ]] && { echo " ## set default runlevel to 4 for tdm @@ -168,10 +167,19 @@ sed -i 's|id:[1-5]|id:4|' etc/inittab } ## part 2/2 of setting konqueror filemanagement default view mode ## add [MainView Settings] ViewMode to konquerorrc -echo " -mkdir -p .\$HOME/.trinity/share/config/ +[[ $SYS_CNF_DIR == /etc/tde ]] && TSUFF=tde +echo "mkdir -p .\$HOME/.${TSUFF:-trinity}/share/config/ echo '[MainView Settings] -ViewMode=$VIEWMODE' > .\$HOME/.trinity/share/config/konquerorrc +ViewMode=$VIEWMODE' >> .\$HOME/.${TSUFF:-trinity}/share/config/konquerorrc " >> $PKG/install/doinst.sh +## set TDEHOME and TDEROOTHOME variables - defaults ~/.trinity and /root/.trinity +[[ $SYS_CNF_DIR == /etc/tde ]] && { +echo "# upgradepkg runs installpkg twice, so firstly remove any previous TDE*HOME entries +sed -i '/TDE.*HOME/d' /etc/profile +echo 'export TDEHOME=~/.tde' >> /etc/profile +echo 'export TDEROOTHOME=/root/.tde' >> /etc/profile +" >> $PKG/install/doinst.sh +} + makepkg_fn diff --git a/Core/tdebase/xinitrc.tde b/Core/tdebase/xinitrc.tde index 362f776..19705f5 100755 --- a/Core/tdebase/xinitrc.tde +++ b/Core/tdebase/xinitrc.tde @@ -22,8 +22,8 @@ if [ -f $usermodmap ]; then fi if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - exec ck-launch-session dbus-launch --exit-with-session $INSTALL_TDE/bin/starttde + exec ck-launch-session dbus-launch --exit-with-session {INSTALL_TDE}/bin/starttde else - exec dbus-launch --exit-with-session $INSTALL_TDE/bin/starttde + exec dbus-launch --exit-with-session {INSTALL_TDE}/bin/starttde fi diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild index be3a5d0..0c324d1 100755 --- a/Core/tdegames/tdegames.SlackBuild +++ b/Core/tdegames/tdegames.SlackBuild @@ -45,7 +45,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DWITH_ARTS="ON" \ -DBUILD_ATLANTIK="ON" \ diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index c6e1fc4..66e2496 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -47,7 +47,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DWITH_T1LIB="OFF" \ diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index fcf9373..11797ef 100644 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -80,7 +80,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DCMAKE_SKIP_RPATH="OFF" \ diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index efa00d3..fd092e4 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -69,7 +69,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DBUILD_ALL="ON" \ .. @@ -87,7 +87,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --disable-debug \ diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index 85b60be..16ac510 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -73,7 +73,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_ARTS="ON" \ -DWITH_JINGLE="ON" \ diff --git a/Core/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild index 4a3f367..3b41775 100755 --- a/Core/tdepim/tdepim.SlackBuild +++ b/Core/tdepim/tdepim.SlackBuild @@ -57,7 +57,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DWITH_ALL_OPTIONS="ON" \ -DWITH_GNOKII="OFF" \ diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild index ac2b4f3..e82a923 100755 --- a/Core/tdesdk/tdesdk.SlackBuild +++ b/Core/tdesdk/tdesdk.SlackBuild @@ -47,7 +47,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DWITH_DBSEARCHENGINE="ON" \ -DWITH_KCAL="ON" \ diff --git a/Core/tdetoys/tdetoys.SlackBuild b/Core/tdetoys/tdetoys.SlackBuild index bcaec60..c156624 100755 --- a/Core/tdetoys/tdetoys.SlackBuild +++ b/Core/tdetoys/tdetoys.SlackBuild @@ -47,7 +47,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DBUILD_ALL="ON" \ -Wno-dev \ diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index 463d1e9..c7cf69e 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -118,7 +118,7 @@ cd_builddir_fn -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_DPMS="ON" \ diff --git a/Core/tdevelop/tdevelop.SlackBuild b/Core/tdevelop/tdevelop.SlackBuild index 3f5db9b..7f34c71 100755 --- a/Core/tdevelop/tdevelop.SlackBuild +++ b/Core/tdevelop/tdevelop.SlackBuild @@ -47,7 +47,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ -DWITH_BUILDTOOL_ALL="ON" \ -DWITH_LANGUAGE_ALL="ON" \ diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index d3c0909..88c5430 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -47,7 +47,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Deps/avahi-tqt/avahi-tqt.SlackBuild b/Deps/avahi-tqt/avahi-tqt.SlackBuild index 8c66985..f037de6 100755 --- a/Deps/avahi-tqt/avahi-tqt.SlackBuild +++ b/Deps/avahi-tqt/avahi-tqt.SlackBuild @@ -48,7 +48,7 @@ CXX=${COMPILER_CXX} \ ./autogen.sh \ --prefix=${INSTALL_TDE} \ --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --docdir=${INSTALL_TDE}/doc/$PRGNAM-$VERSION \ --with-distro=slackware \ diff --git a/Deps/dbus-tqt/dbus-tqt.SlackBuild b/Deps/dbus-tqt/dbus-tqt.SlackBuild index f8e70cd..21ec24a 100755 --- a/Deps/dbus-tqt/dbus-tqt.SlackBuild +++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild @@ -47,7 +47,7 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR="/etc/trinity" \ + -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ .. make_fn diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index 4c20cfb..15eb10f 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -47,7 +47,7 @@ CXX=${COMPILER_CXX} \ ./autogen.sh \ --prefix=${INSTALL_TDE} \ --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Deps/libcarddav/libcarddav.SlackBuild b/Deps/libcarddav/libcarddav.SlackBuild index 75a33c1..f32b000 100755 --- a/Deps/libcarddav/libcarddav.SlackBuild +++ b/Deps/libcarddav/libcarddav.SlackBuild @@ -47,7 +47,7 @@ CXX=${COMPILER_CXX} \ ./autogen.sh \ --prefix=${INSTALL_TDE} \ --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Libs/kipi-plugins/kipi-plugins.SlackBuild b/Libs/kipi-plugins/kipi-plugins.SlackBuild index 0f63b36..4c5b08e 100755 --- a/Libs/kipi-plugins/kipi-plugins.SlackBuild +++ b/Libs/kipi-plugins/kipi-plugins.SlackBuild @@ -56,7 +56,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Libs/libksquirrel/libksquirrel.SlackBuild b/Libs/libksquirrel/libksquirrel.SlackBuild index 7bdaab9..afee91b 100755 --- a/Libs/libksquirrel/libksquirrel.SlackBuild +++ b/Libs/libksquirrel/libksquirrel.SlackBuild @@ -48,7 +48,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ./configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild index 46863f8..d44804d 100755 --- a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild +++ b/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild @@ -54,7 +54,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild index 5982b08..228b8e5 100755 --- a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild +++ b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild @@ -49,7 +49,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/Libs/tdelibkipi/tdelibkipi.SlackBuild b/Libs/tdelibkipi/tdelibkipi.SlackBuild index d3db745..3680055 100755 --- a/Libs/tdelibkipi/tdelibkipi.SlackBuild +++ b/Libs/tdelibkipi/tdelibkipi.SlackBuild @@ -54,7 +54,7 @@ CC=${COMPILER} \ CXX=${COMPILER_CXX} \ ../configure \ --prefix=${INSTALL_TDE} \ - --sysconfdir="/etc/trinity" \ + --sysconfdir=$SYS_CNF_DIR \ --mandir=${INSTALL_TDE}/man \ --disable-rpath \ --enable-closure diff --git a/README-git b/README-git index 62ed537..8dbfb3c 100644 --- a/README-git +++ b/README-git @@ -27,14 +27,12 @@ For the build, these repositories are copied to the build area where the R14.0.4 This has resulted in most of the modifications being in the main scripts, BUILD-TDE.sh and get-source.sh [in getsource_fn and untar_fn]. tde-i18n.SlackBuild had to be modified because it doesn't use untar_fn. Some other *.SlackBuild modifications are work-arounds to accommodate the patching already included in the git sources. -As this is in beta stage, I've left in the markers I use in get-source.sh to give a better idea of where the build fails. However, all packages in the BUILD-TDE.sh " TDE Packages Selection " have now been tested and build using gcc - except kdbusnotification: +All packages in the BUILD-TDE.sh " TDE Packages Selection " have now been tested and build using gcc - except for kdbusnotification: In file included from daemon.moc.cpp:9:0: ../../../src/daemon/daemon.h:25:42: error: expected initializer before ‘:’ token class TDEUI_EXPORT NotificationContainer : public TDEPassivePopupStackContainer - ^ - -which I haven't been able to fix. + ^ [*] I'm sure that checking timestamps with wget did work when I set it up, but it doesn't now as the server doesn't seem to be delivering that information. The consequence is that if tde-i18n-$lang is a part of the build after its initial download, it will be downloaded again. As the latest update was a year ago, once built, there will probably be no need to do so again and so tde-i18n for a particular language will probably only be run once. On that basis I don't see this being a significant issue. diff --git a/get-source.sh b/get-source.sh index dbbfe50..80b745c 100755 --- a/get-source.sh +++ b/get-source.sh @@ -20,10 +20,8 @@ # OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. - echo yes1 >> $TMPVARS/got-this-far getsource_fn () { - echo yes2 >> $TMPVARS/got-this-far #!/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 @@ -55,8 +53,7 @@ PKG=$TMP_BUILD/package-$PRGNAM OUTPUT=/tmp # remove any previous builds if option chosen -[[ $KEEP_BUILD != "yes" ]] && rm -rf $TMP_BUILD/{tmp,package}* - +[[ $KEEP_BUILD != "yes" ]] && echo -e "\n removing previous build data ..\n" && rm -rf $TMP_BUILD/{tmp,package}* # Create working directories: mkdir -p $OUTPUT mkdir -p $TMP_BUILD/tmp-$PRGNAM @@ -67,25 +64,15 @@ rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd) - echo "SRCDIR: $SRCDIR" >> $TMPVARS/got-this-far - echo yes3 >> $TMPVARS/got-this-far - - ## if R14.0.4 or misc, do this: - [[ $TDEVERSION == R14.0.4 || $TDEMIR_SUBDIR == misc ]] && \ { - echo yes4 >> $TMPVARS/got-this-far [[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} ]] && rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} 2>/dev/null || true - echo yes5 >> $TMPVARS/got-this-far ln -sf $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} $SRCDIR - echo yes6 >> $TMPVARS/got-this-far SOURCE=$SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.bz2"} - echo "SOURCE: $SOURCE" >> $TMPVARS/got-this-far # SRCURL for non-TDE archives, set in the SB, will override the Trinity default *tar.bz2 URL SRCURL=${SRCURL:-"http://$TDE_MIRROR/releases/$VERSION$TDEMIR_SUBDIR/$PRGNAM-$VERSION.tar.bz2"} - echo "SRCURL: $SRCURL" >> $TMPVARS/got-this-far # Source file availability: if ! [ -f $SOURCE ]; then echo "Source '$(basename $SOURCE)' not available yet..." @@ -107,7 +94,6 @@ if ! [ -f $SOURCE ]; then ${EXIT_FAIL:-":"} fi fi - echo yes7 >> $TMPVARS/got-this-far if [ "$P1" == "--download" ]; then echo "Download complete." exit 0 @@ -117,11 +103,8 @@ fi { ## if not creating/updating git, nothing to do in this function for git builds ## otherwise, now not R14.0.4 or misc, and we are creating/updating git, so [1] start with admin/cmake: - [[ $(cat $TMPVARS/CGIT) == yes ]] && { - cd $BUILD_TDE_ROOT/src/cgit - echo yes8 >> $TMPVARS/got-this-far [[ ! -e $TMPVARS/admin-cmake-done ]] && { ## if admin and cmake exist, update them @@ -145,9 +128,7 @@ touch $TMPVARS/admin-cmake-done } ## if not tde-i18n, [2] update or clone PRGNAM - [[ $PRGNAM != tde-i18n ]] && { - echo yes9 >> $TMPVARS/got-this-far ## get latest commits if the local repository for PRGNAM exists [[ -d $PRGNAM ]] && \ @@ -157,7 +138,6 @@ git checkout -- * git pull) ## if the local repository for PRGNAM doesn't exist, clone it .. [[ ! -d $PRGNAM ]] && \ - echo "yes10 $PWD clone $PRGNAM" >> $TMPVARS/got-this-far && \ git clone https://mirror.git.trinitydesktop.org/cgit/$PRGNAM ## if arts/tdelibs, need libltdl @@ -172,7 +152,6 @@ git pull) git clone https://mirror.git.trinitydesktop.org/cgit/libltdl } - ## if tdenetwork, need libtdevnc [[ " tdenetwork " == *$PRGNAM* ]] && { [[ -d libtdevnc ]] && \ @@ -187,7 +166,6 @@ git clone https://mirror.git.trinitydesktop.org/cgit/libtdevnc true # stop the following i18n download (attempts) if this routine fails and i18n not required } || \ - { ## still creating/updating git, so [3] for tde-i18n-$lang: @@ -195,9 +173,7 @@ true # stop the following i18n download (attempts) if this routine fails and i18 ## - same for both creating and updating for lang in $I18N do - echo "yes11 $PWD" >> $TMPVARS/got-this-far cd tdei18n - echo "yes12 $PWD" >> $TMPVARS/got-this-far wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/tde-i18n-$lang/ ##will download the tde-i18n-$lang files to: ##$BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang/* @@ -208,13 +184,11 @@ done } - echo yes13 >> $TMPVARS/got-this-far # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: { [[ $ARCH == x86_64 ]] && SLKCFLAGS="-O2 -fPIC ${SET_march:-}" \ SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX -L/usr/lib64"; } \ || { SLKCFLAGS="-O2 ${SET_march:-}" \ SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX"; } - echo yes14 >> $TMPVARS/got-this-far # Exit the script on errors: set -e trap 'echo "$0 FAILED at line $LINENO" | tee $OUTPUT/error-$PRGNAM.log' ERR @@ -232,24 +206,20 @@ 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" +echo -e " unpacking $(basename $SOURCE) ... \n" 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: +echo -e " copying $PRGNAM source files to build area ... \n" (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 +[[ " arts tdelibs " == *$PRGNAM* ]] && cp -a --parents libltdl/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ || true +[[ " tdenetwork " == *$PRGNAM* ]] && cp -a --parents libtdevnc/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ || true) } && 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