diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild index 0372987..571d53d 100644 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -40,8 +40,6 @@ sed -i 's|HAVE_INOTIFY )|HAVE_INOTIFY )\ncheck_include_file( mpfr.h HAVE_MPFR )| ## As libgmp is linked through libmpfr, do we really need libgmp here? sed -i 's|mpfr gmp|mpfr -lgmp|' src/CMakeLists.txt -listdocs_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 po/$Lang ]] && langs="$langs $Lang/$PRGNAM.po";done @@ -49,6 +47,8 @@ sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt langs=$(echo $langs|sed "s|/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn @@ -60,7 +60,7 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ \ .. make_fn @@ -71,6 +71,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/tdeamarok/tdeamarok.SlackBuild b/Apps/amarok/amarok.SlackBuild old mode 100755 new mode 100644 similarity index 96% rename from Apps/tdeamarok/tdeamarok.SlackBuild rename to Apps/amarok/amarok.SlackBuild index 59e270f..bde274c --- a/Apps/tdeamarok/tdeamarok.SlackBuild +++ b/Apps/amarok/amarok.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=amarok -PKGNAM=tde$PRGNAM +PKGNAM=$TDEPFX$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -44,16 +44,6 @@ sed 's|tagaac|tagspeex|g;s|aacfile.*$|taglib_speexfiletyperesolver.cpp speexfile sed -i -e 's|wav )|wav )\nadd_subdirectory( speex )|' \ -e 's|tagaac-static|tagaac-static tagspeex-static|' amarok/src/metadata/CMakeLists.txt -# If libmp4v2 is installed, use mp4 metadata sources in build, otherwise use m4a .. -[[ $(grep -E "mp4.h|mp4v2.h" /var/log/packages/*) ]] && LMP4V2="ON" || sed -i 's|tagmp4-static|tagm4a-static|' amarok/src/metadata/CMakeLists.txt - -# See if xine-lib package from Slackware is installed. (Need this to play music so hopefully it is.) -[[ $(grep -E "xine.h" /var/log/packages/*) ]] && XINE="ON" - -# If yauap is installed this can be used as an engine for music playback as well. -# Yauap does NOT handle the mp3 format. -[[ $(ls /var/log/packages/yauap-*) ]] && YAUAP="ON" - # fix includehints - see issue #16 echo $' --- amarok/src/Options1.ui @@ -186,11 +176,9 @@ done || true ## and then do the rest ... find . -name \*.ui -exec sed -i -e 's|includehint|include|g' '{}' + -listdocs_fn - ## remove help documentation build instruction from all [non-en] locales ... sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true - +# # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="" # the *.po file list @@ -212,10 +200,22 @@ sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt langs=$(echo $langs|sed "s|/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn +# If libmp4v2 is installed, use mp4 metadata sources in build, otherwise use m4a .. +[[ $(grep -E "mp4\.h|mp4v2\.h" /var/log/packages/*) ]] && LMP4V2="ON" || sed -i 's|tagmp4-static|tagm4a-static|' ../amarok/src/metadata/CMakeLists.txt + +# See if xine-lib package from Slackware is installed. (Need this to play music so hopefully it is.) +[[ -s /usr/include/xine.h ]] && XINE="ON" + +# If yauap is installed this can be used as an engine for music playback as well. +# Yauap does NOT handle the mp3 format. +[[ -s $(which yauap) ]] && YAUAP="ON" + cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ @@ -223,8 +223,6 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_MP4V2=${LMP4V2:-"OFF"} \ -DWITH_XINE=${XINE:-"OFF"} \ -DWITH_YAUAP=${YAUAP:-"OFF"} \ diff --git a/Apps/digikam/digikam.SlackBuild b/Apps/digikam/digikam.SlackBuild index 9dfd383..967e087 100755 --- a/Apps/digikam/digikam.SlackBuild +++ b/Apps/digikam/digikam.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_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 po/$Lang ]] && langs="$langs $Lang";done @@ -45,6 +43,8 @@ langdocdk="digikam";for Lang in $langs;do [[ -d doc/$Lang"_digikam" ]] && langdo langdocsf="showfoto";for Lang in $langs;do [[ -d doc/$Lang"_showfoto" ]] && langdocsf=$(echo $Lang"_showfoto" $langdocsf);done sed -i "s|SUBDIRS =.*$|SUBDIRS =. $langdocdk $langdocsf|" doc/Makefile.am +listdocs_fn + ltoolupdate_fn chown_fn @@ -58,7 +58,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -67,6 +66,8 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn @@ -83,6 +84,8 @@ ln -s digikam.mo showfoto.mo) done fi +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index e70f32e..038a645 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done @@ -43,6 +41,8 @@ sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn @@ -54,17 +54,18 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn diff --git a/Apps/tdefilelight/tdefilelight.SlackBuild b/Apps/filelight/filelight.SlackBuild similarity index 97% rename from Apps/tdefilelight/tdefilelight.SlackBuild rename to Apps/filelight/filelight.SlackBuild index 4239d64..efa8a81 100644 --- a/Apps/tdefilelight/tdefilelight.SlackBuild +++ b/Apps/filelight/filelight.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=filelight -PKGNAM=tde$PRGNAM +PKGNAM=$TDEPFX$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -34,11 +34,9 @@ getsource_fn untar_fn -listdocs_fn - ## remove help documentation build instruction from all [non-en] locales ... sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true - +# # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="" # the *.po file list @@ -59,6 +57,8 @@ sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt langs=$(echo $langs|sed "s|/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn @@ -70,6 +70,7 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. @@ -78,10 +79,14 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + PRGNAM=$PKGNAM echo " # HOW TO EDIT THIS FILE: diff --git a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild index 965ef3e..3b02631 100755 --- a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild +++ b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_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 po/$Lang ]] && langs="$langs $Lang/gtkqtengine.po";done @@ -43,6 +41,8 @@ langs=$(echo $langs|sed "s|/gtkqtengine.po||g") ## There is no BUILD_TRANSLATIONS option for this build ## [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn @@ -58,8 +58,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -Wno-dev \ .. diff --git a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild b/Apps/gwenview-i18n/gwenview-i18n.SlackBuild old mode 100755 new mode 100644 similarity index 95% rename from Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild rename to Apps/gwenview-i18n/gwenview-i18n.SlackBuild index 07e2399..f3ad4c4 --- a/Apps/tdegwenview-i18n/tdegwenview-i18n.SlackBuild +++ b/Apps/gwenview-i18n/gwenview-i18n.SlackBuild @@ -24,8 +24,8 @@ # SUCH DAMAGE. PRGNAM=gwenview-i18n -PKGNAM=tde$PRGNAM -[[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit +PKGNAM=$TDEPFX$PRGNAM +[[ $PRE_DOWNLOAD != yes ]] && [[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -50,9 +50,7 @@ fi ## remove help documentation build instruction from all locales ... sed -i '/BUILD_DOC/d' */CMakeLists.txt - -listdocs_fn - +# # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="" # the *.po file list @@ -71,6 +69,8 @@ done sed -i "s|\${po_files}|$langs|" CMakeLists.txt langs=$(echo $langs|sed "s|/messages/gwenview.po||g") # the locale codes +listdocs_fn + chown_fn cd_builddir_fn diff --git a/Apps/tdegwenview/tdegwenview.SlackBuild b/Apps/gwenview/gwenview.SlackBuild old mode 100755 new mode 100644 similarity index 98% rename from Apps/tdegwenview/tdegwenview.SlackBuild rename to Apps/gwenview/gwenview.SlackBuild index 9d6fb90..ab2d8c8 --- a/Apps/tdegwenview/tdegwenview.SlackBuild +++ b/Apps/gwenview/gwenview.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=gwenview -PKGNAM=tde$PRGNAM +PKGNAM=$TDEPFX$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -49,7 +49,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -58,10 +57,14 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + PRGNAM=$PKGNAM echo " # HOW TO EDIT THIS FILE: diff --git a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild b/Apps/k3b-i18n/k3b-i18n.SlackBuild old mode 100755 new mode 100644 similarity index 94% rename from Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild rename to Apps/k3b-i18n/k3b-i18n.SlackBuild index 0e8814c..30ac851 --- a/Apps/tdek3b-i18n/tdek3b-i18n.SlackBuild +++ b/Apps/k3b-i18n/k3b-i18n.SlackBuild @@ -24,8 +24,8 @@ # SUCH DAMAGE. PRGNAM=k3b-i18n -PKGNAM=tde$PRGNAM -[[ $I18N == "" ]] && echo -e "\nYou have tried to build $PRGNAM without selecting any language(s)\n" && exit +PKGNAM=$TDEPFX$PRGNAM +[[ $PRE_DOWNLOAD != yes ]] && [[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -37,11 +37,7 @@ untar_fn ## remove help documentation build instruction from all locales ... sed -i '/BUILD_DOC/d' */CMakeLists.txt - -listdocs_fn - -chown_fn - +# # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="" # the *.po file list @@ -61,6 +57,10 @@ ldocs="$ldocs $Lang" done sed -i "s|\${po_files}|$langs|" CMakeLists.txt +listdocs_fn + +chown_fn + cd_builddir_fn cmake \ diff --git a/Apps/tdek3b/tdek3b.SlackBuild b/Apps/k3b/k3b.SlackBuild old mode 100755 new mode 100644 similarity index 97% rename from Apps/tdek3b/tdek3b.SlackBuild rename to Apps/k3b/k3b.SlackBuild index 2a80e0e..476c75f --- a/Apps/tdek3b/tdek3b.SlackBuild +++ b/Apps/k3b/k3b.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=k3b -PKGNAM=tde$PRGNAM +PKGNAM=$TDEPFX$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -38,6 +38,8 @@ listdocs_fn chown_fn +cd_builddir_fn + # Check for ffmpeg: [[ -s /usr/include/libavcodec/avcodec.h ]] && FFMPEG="ON" # Check for lame: @@ -47,8 +49,6 @@ chown_fn # Check for musicbrainz: [[ -s /usr/include/musicbrainz/mb_c.h ]] && MUSICBRAINZ="ON" -cd_builddir_fn - cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ @@ -56,8 +56,6 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_LIBDVDREAD="ON" \ -DWITH_MUSICBRAINZ=${MUSICBRAINZ:-"OFF"} \ -DWITH_SYSTEM_LIBSAMPLERATE="ON" \ @@ -86,6 +84,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + PRGNAM=$PKGNAM echo " # HOW TO EDIT THIS FILE: diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild index 0fb100f..f47a8d4 100755 --- a/Apps/k9copy/k9copy.SlackBuild +++ b/Apps/k9copy/k9copy.SlackBuild @@ -33,14 +33,14 @@ getsource_fn untar_fn -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am langs=$(echo $langs | sed 's|.po||g') +listdocs_fn + ltoolupdate_fn chown_fn @@ -54,8 +54,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure \ --enable-k3bdevices # do not activate hal/dbus support (use k3bdevice instead) @@ -68,6 +66,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild index 678f5db..5c97254 100644 --- a/Apps/kaffeine/kaffeine.SlackBuild +++ b/Apps/kaffeine/kaffeine.SlackBuild @@ -33,14 +33,13 @@ getsource_fn untar_fn -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am langs=$(echo $langs | sed "s|.po||g") +listdocs_fn ltoolupdate_fn @@ -55,8 +54,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --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 2eb2f79..3519e1d 100755 --- a/Apps/kbfx/kbfx.SlackBuild +++ b/Apps/kbfx/kbfx.SlackBuild @@ -54,10 +54,8 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DUSE_STRIGI="OFF" \ -DUSE_MENUDRAKE="OFF" \ .. diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index 120f1ed..a50dd68 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done @@ -43,6 +41,8 @@ sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn @@ -56,7 +56,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DWITH_GCC_VISIBILITY="OFF" \ .. diff --git a/Apps/kdbg/kdbg.SlackBuild b/Apps/kdbg/kdbg.SlackBuild index e67983e..0ab89ba 100755 --- a/Apps/kdbg/kdbg.SlackBuild +++ b/Apps/kdbg/kdbg.SlackBuild @@ -57,8 +57,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure diff --git a/Apps/kdbusnotification/kdbusnotification.SlackBuild b/Apps/kdbusnotification/kdbusnotification.SlackBuild index 3a69045..7862b0e 100755 --- a/Apps/kdbusnotification/kdbusnotification.SlackBuild +++ b/Apps/kdbusnotification/kdbusnotification.SlackBuild @@ -50,15 +50,15 @@ cmake \ make_fn -installdocs_fn - -strip_fn - # Add desktop file mkdir -p $PKG/$INSTALL_TDE/share/applications (cd $PKG/$INSTALL_TDE/share/applications ln -s ../autostart/kdbusnotification-autostart.desktop .) +installdocs_fn + +strip_fn + mkdir_install_fn doinst_sh_fn diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index b09ca16..e760334 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -56,8 +56,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -69,6 +67,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/kkbswitch/kkbswitch.SlackBuild b/Apps/kkbswitch/kkbswitch.SlackBuild index 5fdf089..164d62f 100644 --- a/Apps/kkbswitch/kkbswitch.SlackBuild +++ b/Apps/kkbswitch/kkbswitch.SlackBuild @@ -58,8 +58,8 @@ cmake \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ - -DWITH_RU_UA_LAYOUT=${RU_UA:-OFF} \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -DWITH_RU_UA_LAYOUT=${RU_UA:-"OFF"} \ -DCMAKE_SKIP_RPATH="ON" \ .. @@ -67,10 +67,14 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index f1e3798..0907381 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -66,8 +66,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ - -DCMAKE_SKIP_RPATH=ON \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -DCMAKE_SKIP_RPATH="ON" \ .. make_fn @@ -78,6 +78,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild index ebbe44e..8b07747 100644 --- a/Apps/knetstats/knetstats.SlackBuild +++ b/Apps/knetstats/knetstats.SlackBuild @@ -54,18 +54,23 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ - -DCMAKE_SKIP_RPATH=ON \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -DCMAKE_SKIP_RPATH="ON" \ .. make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index 82593d2..326de10 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_fn - # there is a Spanish language file in the source, but it has no translations in it .. # the included es.po file is a Google translation - if you're happy to use it, # then to include it in the build, put it in the same directory as this SB script @@ -48,6 +46,8 @@ sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn @@ -59,18 +59,22 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild index 79c8623..c07e449 100644 --- a/Apps/knmap/knmap.SlackBuild +++ b/Apps/knmap/knmap.SlackBuild @@ -47,6 +47,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DCMAKE_SKIP_RPATH=ON \ .. @@ -54,10 +55,14 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/koffice-i18n/koffice-i18n.SlackBuild b/Apps/koffice-i18n/koffice-i18n.SlackBuild index b06cfa4..0a03008 100755 --- a/Apps/koffice-i18n/koffice-i18n.SlackBuild +++ b/Apps/koffice-i18n/koffice-i18n.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=koffice-i18n -[[ $I18N == "" ]] && echo -e "\nYou have tried to build $PRGNAM without selecting any language(s)\n" && exit +[[ $PRE_DOWNLOAD != yes ]] && [[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -38,18 +38,11 @@ untar_fn # but only for languages available with this package langdir="";for Lang in $I18N;do [[ -d koffice-i18n-$Lang ]] && langdir="${langdir}koffice-i18n-$Lang ";done -# update admin for installed version of libtool -cp /$(grep -h ltmain.sh /var/log/packages/libtool*) admin/ -cp /$(grep -h libtool.m4 /var/log/packages/libtool*) admin/libtool.m4.in -## configure complains about an 'Unknown `--is-lightweight' option' but including -## updated 'missing' doesn't seem to affect the resultant build -cp /$(grep -h missing /var/log/packages/libtool*) admin/ - for dir in $langdir do cd $dir -make -f admin/Makefile.common +ltoolupdate_fn chown_fn diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild index 1941e6e..8dd8d62 100755 --- a/Apps/koffice/koffice.SlackBuild +++ b/Apps/koffice/koffice.SlackBuild @@ -28,6 +28,8 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-4} TAG=${TAG:-_tde} +## ignore this if pre-downloading sources +[[ $PRE_DOWNLOAD != yes ]] && { ## build with libpng-1.4 - set in BUILD-TDE.sh - loading pngs in chalk/krita crashes with libpng16 LIBPNG_VERSION=$(grep VERSION:- ../../Misc/libpng/libpng.SlackBuild | grep -o [.0-9]*) [[ ${USE_PNG14:-} == yes ]] && \ @@ -37,6 +39,7 @@ LIBPNG_VERSION=$(grep VERSION:- ../../Misc/libpng/libpng.SlackBuild | grep -o [. exit } } || true +} source ../../get-source.sh getsource_fn @@ -93,8 +96,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --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 c237558..06d737a 100755 --- a/Apps/krusader/krusader.SlackBuild +++ b/Apps/krusader/krusader.SlackBuild @@ -65,8 +65,6 @@ do patch -p0 done -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done @@ -75,6 +73,8 @@ langs=$(echo $langs | sed 's|.po||g') # [[ $I18N != *ru* ]] && sed -i 's| ru||' doc/Makefile.am +listdocs_fn + ltoolupdate_fn chown_fn @@ -88,7 +88,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-debug \ --build=$ARCH-slackware-linux @@ -97,6 +96,8 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild index 5b6cded..cddc188 100755 --- a/Apps/kscope/kscope.SlackBuild +++ b/Apps/kscope/kscope.SlackBuild @@ -33,14 +33,14 @@ getsource_fn untar_fn -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am langs=$(echo $langs | sed 's|.po||g') +listdocs_fn + ltoolupdate_fn chown_fn @@ -63,6 +63,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild index b39f5ae..01c1f2a 100755 --- a/Apps/ksensors/ksensors.SlackBuild +++ b/Apps/ksensors/ksensors.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done @@ -43,6 +41,8 @@ sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn @@ -54,18 +54,22 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index a27982c..986b735 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done @@ -50,6 +48,8 @@ for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done ## ... and edit tde_auto_add_subdirectories GLOB: sed -i "s|} \* )|} $langdoc )|" cmake/modules/TDEMacros.cmake +listdocs_fn + chown_fn cd_builddir_fn @@ -61,18 +61,22 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/ksquirrel/ksquirrel.SlackBuild b/Apps/ksquirrel/ksquirrel.SlackBuild index 55f7903..4ddab18 100755 --- a/Apps/ksquirrel/ksquirrel.SlackBuild +++ b/Apps/ksquirrel/ksquirrel.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_fn - # add English help documentation tar xf $SRCDIR/ksquirrel-en-docs.tar.xz cp doc/ru/*png doc/en @@ -50,6 +48,8 @@ langs=$(echo $langs | sed 's|.po||g') ldocs="ru" [[ $I18N != *ru* ]] && sed -i "s| ru||" doc/Makefile.am && ldocs="" +listdocs_fn + ltoolupdate_fn chown_fn @@ -63,7 +63,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ./configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -72,10 +71,14 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/tdektorrent/tdektorrent.SlackBuild b/Apps/ktorrent/ktorrent.SlackBuild similarity index 97% rename from Apps/tdektorrent/tdektorrent.SlackBuild rename to Apps/ktorrent/ktorrent.SlackBuild index 9f6fdd0..a7899fd 100644 --- a/Apps/tdektorrent/tdektorrent.SlackBuild +++ b/Apps/ktorrent/ktorrent.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=ktorrent -PKGNAM=tde$PRGNAM +PKGNAM=$TDEPFX$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -34,13 +34,13 @@ getsource_fn untar_fn -listdocs_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 [[ -e translations/$Lang ]] && langs="$langs $Lang";done sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am +listdocs_fn + ltoolupdate_fn chown_fn @@ -54,8 +54,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-torrent-mimetype \ --enable-closure diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild index 20db507..a144f21 100755 --- a/Apps/kvpnc/kvpnc.SlackBuild +++ b/Apps/kvpnc/kvpnc.SlackBuild @@ -59,8 +59,8 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. make_fn @@ -71,10 +71,14 @@ do cp ../doc/$file $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/ 2>/dev/null || true done +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/piklab/piklab.SlackBuild b/Apps/piklab/piklab.SlackBuild index 5e4af3b..57d27ec 100755 --- a/Apps/piklab/piklab.SlackBuild +++ b/Apps/piklab/piklab.SlackBuild @@ -33,14 +33,14 @@ getsource_fn untar_fn -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am langs=$(echo $langs | sed 's|.po||g') +listdocs_fn + ltoolupdate_fn chown_fn @@ -54,7 +54,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-debug @@ -62,6 +61,8 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index cbd904c..eb9355f 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -35,8 +35,6 @@ untar_fn patch -p0 < $SRCDIR/reformat-message.patch -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done @@ -52,6 +50,8 @@ for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done ## ... and edit tde_auto_add_subdirectories GLOB: sed -i "s|} \* )|} $langdoc )|" cmake/modules/TDEMacros.cmake +listdocs_fn + chown_fn cd_builddir_fn @@ -63,18 +63,22 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DBUILD_DOC=ON \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Apps/potracegui/reformat-message.patch b/Apps/potracegui/reformat-message.patch index c35148a..205211b 100755 --- a/Apps/potracegui/reformat-message.patch +++ b/Apps/potracegui/reformat-message.patch @@ -11,10 +11,7 @@ return; --- po/potracegui.pot 2015-09-23 06:31:02.000000000 +0100 +++ po/potracegui.pot 2016-06-20 20:46:04.586821425 +0100 -@@ -209,13 +209,13 @@ - - #: mainwidget.cpp:896 - msgid "" +@@ -234,7 +234,7 @@ -"Sorry, but the image format which you are working with\n" -"is not recognized by TDE.\n" +"Sorry, but the image format which you are working\n" @@ -28,15 +25,9 @@ +"format (EPS and PGM should work well) and only\n" +"when you are satisfied with the result revert to\n" +"the format of your choice and save the result." - msgstr "" - - #: mainwidget.cpp:913 --- po/de.po 2015-09-23 06:31:02.000000000 +0100 +++ po/de.po 2016-06-20 20:46:13.183713949 +0100 -@@ -210,13 +210,13 @@ - - #: mainwidget.cpp:896 - msgid "" +@@ -239,7 +239,7 @@ -"Sorry, but the image format which you are working with\n" -"is not recognized by TDE.\n" +"Sorry, but the image format which you are working\n" @@ -50,6 +41,3 @@ +"format (EPS and PGM should work well) and only\n" +"when you are satisfied with the result revert to\n" +"the format of your choice and save the result." - msgstr "" - - #: mainwidget.cpp:913 diff --git a/Apps/rosegarden/rosegarden.SlackBuild b/Apps/rosegarden/rosegarden.SlackBuild index 38544de..1eb0cfb 100644 --- a/Apps/rosegarden/rosegarden.SlackBuild +++ b/Apps/rosegarden/rosegarden.SlackBuild @@ -33,19 +33,11 @@ getsource_fn untar_fn -listdocs_fn - -# Check for Jack Audio Connection Kit -[[ $(ls /var/log/packages/jack-audio-connection-kit-*) ]] && JACK="ON" - -# Check for DSSI aka "Dizzy" -[[ $(grep -E "dssi.h" /var/log/packages/*) ]] && DSSI="ON" - ## remove help documentation build instruction from all locales ... sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true ## ... and restore for 'en' echo "tde_create_handbook( LANG en DESTINATION $PRGNAM )" >> doc/en/CMakeLists.txt - +# # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="" # the *.po file list @@ -66,10 +58,18 @@ sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt langs=$(echo $langs|sed "s|/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn +# Check for Jack Audio Connection Kit +[[ $(ls /var/log/packages/jack-audio-connection-kit-*) ]] && JACK="ON" + +# Check for DSSI aka "Dizzy" +[[ $(grep -E "dssi.h" /var/log/packages/*) ]] && DSSI="ON" + cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ @@ -77,10 +77,8 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ -DWANT_SOUND="ON" \ -DWANT_DEBUG="OFF" \ -DWANT_FULLDBG="OFF" \ diff --git a/Apps/soundkonverter/soundkonverter.SlackBuild b/Apps/soundkonverter/soundkonverter.SlackBuild index 070c4bf..66d4f70 100755 --- a/Apps/soundkonverter/soundkonverter.SlackBuild +++ b/Apps/soundkonverter/soundkonverter.SlackBuild @@ -47,7 +47,6 @@ chown_fn cd_builddir_fn -# Fails with clang =[ LDFLAGS=$SLKLDFLAGS \ CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ CXXFLAGS=$SLKCFLAGS \ @@ -55,8 +54,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --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 823963d..235c9c6 100755 --- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild +++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild @@ -48,8 +48,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DCMAKE_SKIP_RPATH=ON \ -DBUILD_TRANSLATIONS="ON" \ -DWITH_GCC_VISIBILITY="OFF" \ diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild index c2393eb..5c3759c 100755 --- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild +++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild @@ -33,6 +33,14 @@ 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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done +## this GLOB overrides the one in po/CMakeLists.txt: +sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake +langs=$(echo $langs | sed "s|.po||g") +[[ $langs != "" ]] && TRANS=ON + listdocs_fn chown_fn @@ -48,10 +56,8 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_CONFIG_MODULE="ON" \ - -DBUILD_TRANSLATIONS="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. make_fn diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild index 78717e7..f6007d7 100755 --- a/Apps/tdeio-locate/tdeio-locate.SlackBuild +++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild @@ -55,8 +55,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild index 47abec4..9fca34e 100644 --- a/Apps/tdesudo/tdesudo.SlackBuild +++ b/Apps/tdesudo/tdesudo.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_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 [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done @@ -43,6 +41,8 @@ sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + chown_fn cd_builddir_fn @@ -54,13 +54,15 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ .. make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild index 954011b..31dfe75 100755 --- a/Apps/tdmtheme/tdmtheme.SlackBuild +++ b/Apps/tdmtheme/tdmtheme.SlackBuild @@ -39,7 +39,7 @@ chown_fn cd_builddir_fn -## all locales and html docs built by default +## all locales and html docs built by default, actually only en_US cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ @@ -51,7 +51,6 @@ cmake \ -DCMAKE_SKIP_RPATH=ON \ .. - make_fn installdocs_fn diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild index 422eee0..3d1dfb1 100755 --- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild +++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild @@ -48,8 +48,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --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 5d9e393..2c4895a 100755 --- a/Apps/yakuake/yakuake.SlackBuild +++ b/Apps/yakuake/yakuake.SlackBuild @@ -57,14 +57,16 @@ cmake \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_DOC="ON" \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ - -DCMAKE_SKIP_RPATH=ON \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -DCMAKE_SKIP_RPATH="ON" \ .. make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index b90cba0..89ec1cf 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -4,36 +4,44 @@ exec 2>/dev/null export TMPVARS=/tmp/build/vars -if [ ! -d $TMPVARS ]; then - mkdir -p $TMPVARS -fi +[[ ! -d $TMPVARS ]] && mkdir -p $TMPVARS ## remove marker for git admin/cmake to update or clone only once per run of this script rm -f $TMPVARS/admin-cmake-done +## remove any PRE_DOWNLOAD record to allow BUILD-TDE.sh to be run in Re-use mode after a pre-download +rm -f $TMPVARS/PRE_DOWNLOAD +## .. and if building 14.1.0, turn off cgit downloads +[[ $(cat $TMPVARS/CGIT) == yes ]] && echo \\Z0\\Zbno > $TMPVARS/CGIT + +## don't need this if this script has already been run +## test on $TMPVARS/TDEbuilds, whether or not it has content +[[ -e $TMPVARS/TDEbuilds ]] || { dialog --cr-wrap --no-shadow --colors --title " Introduction " --msgbox \ " - This is the set up script for TDE SlackBuilds on Slackware 14.2/current for setting user preferences and options. + Build selected TDE packages and non-TDE dependencies for Slackware 14.2/current. - Source archives must be placed in the 'src' directory or will be downloaded during the build from a geoIP located mirror site. + Source archives will be downloaded from a geoIP located mirror site and saved to the 'src' directory. - A package build list is created, and successfully built and installed packages are removed from that list as the build progresses. + A package build list is created, and successfully built packages are removed from that list as the build progresses. - US English is the default language and support for additional languages can be added. + US English is the default language and support for additional languages can be included in the packages. - There is an option to abort the build on the final setup screen - so just run through the options and familiarize yourself with them before an actual build. " \ -21 75 + The final screen gives a summary of the build setup, with an option to cancel." \ +20 75 +} rm -f $TMPVARS/build-new dialog --cr-wrap --yes-label "Re-use" --no-label "New" --defaultno --no-shadow --colors --title " TDE Build " --yesno \ " -Select \Zr\Z4\ZbNew\Zn if: - This is a new build - OR - Additional packages are being built -\Zr\Z4\ZbNew\Zn will delete any previous build list. +\Zr\Z4\ZbNew\Zn + Create a new build list. -Selecting <\Z1R\Zb\Z0e-use\Zn> avoids having to create the build list again when re-running the build for any SlackBuilds that failed." \ +\Z1R\Zb\Z0e-use\Zn + Use the existing build list when re-running the build + * for any SlackBuilds that failed - or + * after only downloading the sources" \ 13 75 [[ $? == 0 ]] && echo no > $TMPVARS/build-new [[ $? == 1 ]] && rm -f $TMPVARS/TDEbuilds @@ -104,8 +112,8 @@ Any other option will have to be edited into BUILD-TDE.sh " \ 15 75 3 \ -"/opt/trinity" "" \ "/opt/tde" "" \ +"/opt/trinity" "" \ "/usr" "" \ 2> $TMPVARS/INSTALL_TDE @@ -120,8 +128,8 @@ otherwise the defaults of TDEHOME=~/.trinity and TDEROOTHOME=/root/.trinity will " \ 18 75 2 \ -"/etc/trinity" "" \ "/etc/tde" "" \ +"/etc/trinity" "" \ 2> $TMPVARS/SYS_CNF_DIR @@ -229,7 +237,7 @@ dialog --cr-wrap --nocancel --no-shadow --colors --help-button --help-label "REA " This is the complete list of additional languages supported by TDE. - Other package sources may not have support for all these additional languages, but they will be included in the build for that package when the translations are included in its source. + A package source may not have support for all these additional languages, but any chosen will be included in the build for that package when its source includes the translation. If any other translation is included in the package source, it can be added here but won't be supported by TDE. Multiple selections may be made - space separated. @@ -270,36 +278,43 @@ done rm -f $TMPVARS/EXIT_FAIL -dialog --cr-wrap --defaultno --yes-label "Continue" --no-label "Stop" --no-shadow --colors --title " Action on failure " --yesno \ +dialog --cr-wrap --defaultno --yes-label "Stop" --no-label "Continue" --no-shadow --colors --title " Action on failure " --yesno \ " -Do you want the build to \Zr\Z4\ZbStop\Zn at a failure or <\Z1C\Zb\Z0ontinue\Zn> to the next SlackBuild? +Do you want the build to <\Z1S\Zb\Z0top\Zn> at a failure or \Zr\Z4\ZbContinue\Zn to the next SlackBuild? -Build logs are $TMP/'program'-*-build-log, and configure/cmake error logs will be in $TMP/build/tmp-'program'. +Build logs are \Zu$TMP/-*-build-log\ZU, +and configure[cmake] logs will be in +\Zu$TMP/build/tmp-//build-[/CMakeFiles]\ZU. A practical build method could be: - 1] build the \Zb\Zr\Z4R\Znequired packages with the \Zr\Z4\ZbStop\Zn option - if any SlackBuild fails, the temporary files for that build will be kept and the problem can be identified and the build restarted. -Any problems with the build environment will also become apparent here. + 1] build the \Zb\Zr\Z4R\Znequired packages with the <\Z1S\Zb\Z0top\Zn> option. + This script will then exit on a failure. When the problem has been + fixed, restart the build with the \Z3\ZbTDE build\Zn| option. - 2] then build other packages with the <\Z1C\Zb\Z0ontinue\Zn> option which deletes the temporary build files while the successful package builds are completing. -Any failures here are likely to be related to dependencies not found. + 2] then build other packages with the \Zr\Z4\ZbContinue\Zn option which allows + this script to continue to the end of the build list whether or + not any particular SlackBuild has failed. + \Zr\Z4\ZbContinue\Zn is probably the better choice if only downloading sources. - 3] re-run the build for the failed programs from [2] by re-using the build list and with the \Zr\Z4\ZbStop\Zn option ... + 3] re-run the build for the remaining programs with the + \Z3\ZbTDE build\Zn| option and select in the confirmation + screen. " \ -26 75 -[[ $? == 0 ]] && 2> $TMPVARS/EXIT_FAIL -[[ $? == 1 ]] && echo "exit 1" > $TMPVARS/EXIT_FAIL +27 75 +[[ $? == 0 ]] && echo "exit 1" > $TMPVARS/EXIT_FAIL +[[ $? == 1 ]] && 2> $TMPVARS/EXIT_FAIL rm -f $TMPVARS/KEEP_BUILD dialog --cr-wrap --no-shadow --colors --defaultno --title " Temporary Build Files " --yesno \ " -'tmp' & 'package' files from a previous package build are removed at the start of building the next package to keep the build area clear. +The default is to remove 'tmp' & 'package' files from a previous package build at the start of building the next package to keep the build area clear. If following the build method on the previous screen, the answer here should probably be \Zr\Z4\ZbNo\Zn. Keep \ZuALL\ZU the temporary files, including for successfully built packages?" \ -14 75 +15 75 [[ $? == 0 ]] && echo yes > $TMPVARS/KEEP_BUILD [[ $? == 1 ]] && echo no > $TMPVARS/KEEP_BUILD @@ -332,7 +347,7 @@ EXITVAL=$? [[ $EXITVAL == 1 ]] && 2> $TMPVARS/PREPEND [[ $EXITVAL == 2 ]] && dialog --cr-wrap --no-shadow --colors --ok-label "Return" --msgbox \ " -The default with the tqt3 build is to append the TDE lib paths to /etc/ld.so.conf. +The default with the tqt3 build is to append the TDE libs paths to /etc/ld.so.conf. This means that TDE libs will be at the end of the search path. If the package configuration sets up the search path without using the shell variables set up in this script, those TDE libs will not be used if a library of the same name exists - a conflict which could arise if another DE is installed. @@ -349,7 +364,7 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Packages Selectio " Required builds for a basic working TDE are marked \Zb\Zr\Z4R\Zn. -The packages selected form the build list and so dependencies are listed before the packages that need them. After the \Zb\Zr\Z4R\Znequired packages, the listing is grouped Core/Libs/Apps and then alphabetically within those groups, excluding tde prefixes added to package names, and the dependencies. +The packages selected form the build list and so dependencies are listed before the packages that need them. After the \Zb\Zr\Z4R\Znequired packages, the listing is grouped Core/Libs/Apps and then alphabetically within those groups. Look out for messages in the bottom line of the screen, especially relating to dependencies. @@ -387,26 +402,26 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Core/tdevelop" "TDE development programs" off "\Zb\Z6 Requires tdesdk \Zn" \ " Misc/tidy-html5" "Corrects and cleans up HTML and XML documents" off "\Zb\Z6 Runtime option for Quanta+ [tdewebdev] \Zn" \ "Core/tdewebdev" "Quanta Plus and other applications" off "\Zb\Z6 \Zn" \ -"Libs/tdelibkdcraw" "Decode RAW picture files" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel \Zn" \ -"Libs/tdelibkexiv2" "Library to manipulate picture metadata" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel. Needs l/exiv2... \Zn" \ -"Libs/tdelibkipi" "A common plugin structure" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel \Zn" \ -"Libs/kipi-plugins" "Additional functions for digiKam, ksquirrel and gwenview" off "\Zb\Z6 Required for digikam, tdegwenview and ksquirrel. Requires tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \ +"Libs/libkdcraw" "Decode RAW picture files" off "\Zb\Z6 Required for digikam, gwenview and ksquirrel \Zn" \ +"Libs/libkexiv2" "Library to manipulate picture metadata" off "\Zb\Z6 Required for digikam, gwenview and ksquirrel. Needs l/exiv2... \Zn" \ +"Libs/libkipi" "A common plugin structure" off "\Zb\Z6 Required for digikam, gwenview and ksquirrel \Zn" \ +"Libs/kipi-plugins" "Additional functions for digiKam, gwenview and ksquirrel" off "\Zb\Z6 Requires libkdcraw libkexiv2 libkipi. \Zn" \ " Misc/xmedcon" "A medical image conversion utility & library" off "\Zb\Z6 Buildtime option for libksquirrel \Zn" \ "Libs/libksquirrel" "A set of image codecs for KSquirrel" off "\Zb\Z6 Required for ksquirrel. Buildtime options include l/netpbm, t/transfig [fig2dev], Misc/xmedcon \Zn" \ "Apps/abakus" "PC calculator" off "\Zb\Z6 optional dependency l/mpfr which requires l/gmp \Zn" \ -" Misc/libmp4v2" "Create and modify mp4 files" off "\Zb\Z6 Buildtime option for Amarok \Zn" \ +" Misc/mp4v2" "Create and modify mp4 files" off "\Zb\Z6 Buildtime option for Amarok \Zn" \ " Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Runtime option for Amarok \Zn" \ -" Misc/yauap" "simple commandline audio player" off "\Zb\Z6 Provides an optional engine for Amarok \Zn" \ -"Apps/tdeamarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, libmp4v2, speex, moodbar \Zn" \ -"Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins tdelibkdcraw tdelibkexiv2 tdelibkipi. \Zn" \ +" Misc/yauap" "A simple commandline audio player" off "\Zb\Z6 Provides an optional engine for Amarok \Zn" \ +"Apps/amarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, mp4v2, speex, moodbar \Zn" \ +"Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins libkdcraw libkexiv2 libkipi. \Zn" \ "Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6 A d3lphin.desktop file is included - see dolphin.SlackBuild. \Zn" \ -"Apps/tdefilelight" "Graphical diskspace display" off "\Zb\Z6 Runtime requirement x/xdpyinfo \Zn" \ +"Apps/filelight" "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" \ -"Apps/tdegwenview-i18n" "Internationalization files for gwenview." off "\Zb\Z6 Provides \Zb\Z3Additional language support\Zb\Z6 for tdegwenview \Zn" \ -"Apps/tdek3b" "The CD Creator" off "\Zb\Z6 \Zn" \ -"Apps/tdek3b-i18n" "Internationalization files for tdek3b." off "\Zb\Z6 Provides \Zb\Z3Additional language support\Zb\Z6 for tdek3b \Zn" \ +"Apps/gwenview" "An image viewer" off "\Zb\Z6 Requires kipi-plugins libkdcraw libkexiv2 libkipi. \Zn" \ +"Apps/gwenview-i18n" "Internationalization files for gwenview." off "\Zb\Z6 Provides \Zb\Z3Additional language support\Zb\Z6 for gwenview \Zn" \ +"Apps/k3b" "The CD Creator" off "\Zb\Z6 \Zn" \ +"Apps/k3b-i18n" "Internationalization files for k3b." off "\Zb\Z6 Provides \Zb\Z3Additional language support\Zb\Z6 for k3b \Zn" \ "Apps/k9copy" "A DVD backup utility" off "\Zb\Z6 Requires [tde]k3b and ffmpeg \Zn" \ "Apps/kaffeine" "Media player for TDE" off "\Zb\Z6 \Zn" \ "Apps/kbfx" "Alternate menu for TDE" off "\Zb\Z6 \Zn" \ @@ -427,28 +442,28 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Apps/kscope" "A source-editing environment for C and C-style languages." off "\Zb\Z6 Runtime options cscope [d/cscope], ctags [ap/vim], dot [graphviz] \Zn" \ "Apps/ksensors" "A graphical interface for sensors" off "\Zb\Z6 Runtime requirement ap/lm_sensors \Zn" \ "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/tdektorrent" "A BitTorrent client for TDE" off "\Zb\Z6 \Zn" \ +"Apps/ksquirrel" "An image viewer with OpenGL and KIPI support." off "\Zb\Z6 Requires kipi-plugins libkdcraw libkexiv2 libkipi libksquirrel. \Zn" \ +"Apps/ktorrent" "A BitTorrent client for TDE" off "\Zb\Z6 \Zn" \ "Apps/kvkbd" "A virtual keyboard for TDE" off "\Zb\Z6 \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/piklab" "IDE for PIC microcontrollers" off "\Zb\Z6 \Zn" \ " Misc/potrace" "For tracing bitmaps to a vector graphics format" off "\Zb\Z6 Required for potracegui, optional for inkscape \Zn" \ "Apps/potracegui" "A GUI for potrace" off "\Zb\Z6 Requires potrace \Zn" \ "Apps/rosegarden" "Audio sequencer and musical notation editor" off "\Zb\Z6 Requires jack-audio-connection-kit liblo and dssi for proper functionality \Zn" \ -"Apps/soundkonverter" "frontend to various audio converters" off "\Zb\Z6 \Zn" \ -"Apps/tde-style-lipstik" "lipstik theme" off "\Zb\Z6 \Zn" \ +"Apps/soundkonverter" "Frontend to various audio converters" off "\Zb\Z6 \Zn" \ +"Apps/tde-style-lipstik" "Lipstik theme" off "\Zb\Z6 \Zn" \ "Apps/tde-style-qtcurve" "QtCurve theme" off "\Zb\Z6 \Zn" \ "Apps/tdeio-locate" "TDE frontend for the locate command" off "\Zb\Z6 \Zn" \ "Apps/tdesudo" "Graphical frontend for the sudo command" off "\Zb\Z6 \Zn" \ -"Apps/tdmtheme" "tdm theme editor module" off "\Zb\Z6 \Zn" \ -"Apps/twin-style-crystal" "twin theme" off "\Zb\Z6 \Zn" \ +"Apps/tdmtheme" "TDM theme editor module" off "\Zb\Z6 \Zn" \ +"Apps/twin-style-crystal" "Twin theme" off "\Zb\Z6 \Zn" \ "Apps/yakuake" "Quake-style terminal emulator" off "\Zb\Z6 \Zn" \ " Misc/lxml" "Python bindings for libxml2 and libxslt" off "\Zb\Z6 Required to use Inkscape online help \Zn" \ " Misc/inkscape" "SVG editor - an alternative to potrace, potracegui [and GraphicsMagick]." off "\Zb\Z6 Requires lxml if online help facility is required, potrace is a build-time option. \Zn" \ 2> $TMPVARS/TDEbuilds # successful builds are removed from the TDEbuilds list by '$dir ' so add a space to the last entry # and the " needs to be removed because the Misc entries are double-quoted -sed -i -e 's|$| |' -e 's|"||g' $TMPVARS/TDEbuilds +sed -i 's|$| |;s|" M|M|g;s|"||g' $TMPVARS/TDEbuilds ## only run this if tqt3 has been selected @@ -480,9 +495,9 @@ dialog --cr-wrap --no-shadow --yes-label "4" --no-label "3" --help-button --help " TDM is included in the tdebase build. -Choose whether to boot into the GUI and login with TDM - runlevel \Zb\Z64\Zn -or -boot into a terminal - runlevel \Zb\Z63\Zn - the Slackware default. +Select: +runlevel \Zb\Z64\Zn - to login with TDM and boot into the GUI +runlevel \Zb\Z63\Zn - to boot into a terminal - the Slackware default. This option can be overridden later by editing /etc/inittab. " \ @@ -534,6 +549,28 @@ sed -i 's|Apps/koffice|Misc/libpng &|' $TMPVARS/TDEbuilds } +## option to prefix some package names +FILE="" +for file in ktorrent k3b-i18n k3b gwenview-i18n gwenview filelight amarok libkipi libkexiv2 libkdcraw +do +[[ $(cat $TMPVARS/TDEbuilds) == *"$file "* ]] && FILE="$file $FILE" +done +# +rm -f $TMPVARS/TDEPFX +[[ $FILE ]] && { +dialog --aspect 7 --cr-wrap --yes-label "tde" --no-label "None" --defaultno --no-shadow --colors --title " tde prefix " --yesno \ +" +A 'tde' prefix can be added to some package names +[ \Zb\Z6$FILE\Zn] +to avoid confusion with identical packages which might be installed for KDE. + +" \ +0 0 +[[ $? == 0 ]] && echo tde > $TMPVARS/TDEPFX +[[ $? == 1 ]] && touch $TMPVARS/TDEPFX +} + + ## this dialog will only run if any of the selected packages has a README rm -f $TMPVARS/READMEs ## generate list of READMEs .. @@ -568,46 +605,71 @@ rm -f $TMPVARS/CGIT # place this here to facilitate testing for summary screen [[ $(grep -o [ACDLM][a-z]*/ $TMPVARS/TDEbuilds | sort | head -n1) != Misc/ ]] && { dialog --cr-wrap --no-shadow --colors --defaultno --title " TDE development build " --yesno \ " -This routine creates and updates the git repositories local copies. +Create and/or update the git repositories local copies. + +\Z1Y\Zb\Z0es\Zn + * For a first run - will clone the git repositories + * For subsequent runs - will update only + * If the current build list includes new apps, and you don't want the + existing repos updated, the new apps should be run as a new group + initially as selective updating is not supported + * Local repositories will be created/updated as each package is built + OR can be downloaded before the build -> see next screen + +\Zr\Z4\ZbNo\Zn + * The build will use sources already downloaded + +" \ +19 75 +[[ $? == 0 ]] && echo yes > $TMPVARS/CGIT +[[ $? == 1 ]] && echo no > $TMPVARS/CGIT +} + -If this is a first run, answer 'yes' - be patient, downloads from git are slowwww... +#rm -f $TMPVARS/PRE_DOWNLOAD ## this is done at the head of this script +[[ $(cat $TMPVARS/TDEVERSION) == 14.0.7 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." +[[ $(cat $TMPVARS/TDEVERSION) == cgit ]] && PRE_DOWNLOAD_MESSAGE="All cgit sources for the build list packages will be cloned/updated.\nMisc archives will only be downloaded if not already in 'src'." && LINES=18 +## testing for cgit!=no will allow =yes or null, which is the 14.0.7 build case +[[ $(cat $TMPVARS/CGIT) != no ]] && { +dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \ +" +This would be useful for running the build off-line. -For subsequent runs, 'yes' will update only. +\Z1Y\Zb\Z0es\Zn + Download the sources for the build list without building packages. + The build list will be retained, and BUILD-TDE.sh will need to be + re-run selecting the \Z3\ZbTDE build\Zn| option to build the packages. -Local repositories are created/updated as each package is built. -If the current build list includes new apps, and you don't want the existing repos updated, the new apps should be run as a new group initially as selective updating is not supported. +\Zr\Z4\ZbNo\Zn + Download sources as each package is built. -Do you want to create or update the git repositories? +$PRE_DOWNLOAD_MESSAGE " \ -20 75 -[[ $? == 0 ]] && echo yes > $TMPVARS/CGIT -[[ $? == 1 ]] && echo no > $TMPVARS/CGIT +${LINES:-17} 75 +[[ $? == 0 ]] && echo yes > $TMPVARS/PRE_DOWNLOAD +[[ $? == 1 ]] && echo no > $TMPVARS/PRE_DOWNLOAD } - } [[ ! -e $TMPVARS/TDEbuilds ]] && run_dialog - # option to change to stop the build when it fails if [[ $(cat $TMPVARS/build-new) == no ]] ; then if [[ $(cat $TMPVARS/EXIT_FAIL) == "" ]] ; then -if [[ $(cat $TMPVARS/KEEP_BUILD) == no ]] ; then -dialog --cr-wrap --defaultno --yes-label "Stop" --no-label "Continue" --no-shadow --colors --title " Action on failure - 2 " --yesno \ -" -You have chosen to re-use the TDE build list, which now contains only those programs that failed to build. -But this script is set to Continue in the event of a failure, which will delete all but the last build record. It will be easier to investigate each failure if the build is stopped when it fails. +dialog --cr-wrap --defaultno --yes-label "Stop" --no-label "Continue" --no-shadow --colors --title " Confirm action on failure " --yesno \ +" +If there is a failure, this script is set up to continue to the next SlackBuild in the re-used build list. -Do you still want the build to \Zr\Z4\ZbContinue\Zn at a failure - or change to \Z1S\Zb\Z0top\Zn ? +Do you still want it to do that or change to <\Z1S\Zb\Z0top\Zn> ? " \ -15 75 +10 60 [[ $? == 0 ]] && echo "exit 1" > $TMPVARS/EXIT_FAIL -fi;fi;fi +fi +fi ###################### @@ -628,6 +690,8 @@ export EXIT_FAIL=$(cat $TMPVARS/EXIT_FAIL) export KEEP_BUILD=$(cat $TMPVARS/KEEP_BUILD) export PREPEND=$(cat $TMPVARS/PREPEND) export RUNLEVEL=$(cat $TMPVARS/RUNLEVEL) +export PRE_DOWNLOAD=$(cat $TMPVARS/PRE_DOWNLOAD) +export TDEPFX=$(cat $TMPVARS/TDEPFX) # these exports are for koffice.SB [[ $(cat $TMPVARS/Krita_OPTS) == *krita* ]] && export REVERT=yes [[ $(cat $TMPVARS/Krita_OPTS) == *libpng14* ]] && export USE_PNG14=yes @@ -659,9 +723,9 @@ export ARM_FABI=$(readelf -Ah $(which bash)|grep -oE "soft|hard") ### set up variables for the summary list: ## New build -[[ $(cat $TMPVARS/build-new) != no ]] && NEW_BUILD=yes || NEW_BUILD='no - re-use existing' +[[ $(cat $TMPVARS/build-new) != no ]] && NEW_BUILD=yes || NEW_BUILD='no - re-using existing' ## Action on failure -AOF=$(echo $EXIT_FAIL|cut -d" " -f1) +[[ $EXIT_FAIL == "exit 1" ]] && AOF=stop ## if tdebase selected [[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && TDMRL=\\Zb\\Z6$RUNLEVEL\\Zn && SHADERL=" " ## koffice - only if it is being built @@ -678,16 +742,24 @@ TQT_DOCS=no && [[ $TQT_OPTS != *nodocs* ]] && TQT_DOCS=yes } ## whether cloning or updating cgit CLONE=$(cat $TMPVARS/CGIT) +## whether installing packages as they are built +INST_PACKAGE=yes && [[ $INST == 0 ]] && INST_PACKAGE=no +## emphasise downloading only, not building +[[ $PRE_DOWNLOAD == yes ]] && DL_BLD_MSG="Download sources" +## whether using tde prefix +[[ -e $TMPVARS/TDEPFX ]] && tde_prefix=$(cat $TMPVARS/TDEPFX) && [[ ! -s $TMPVARS/TDEPFX ]] && tde_prefix="not used" + ## start dialog EXITVAL=2 until [[ $EXITVAL -lt 2 ]] ; do -dialog --aspect 3 --no-collapse --cr-wrap --yes-label "Start" --no-label "Abort" --help-button --help-label "Build List" --no-shadow --defaultno --colors --title " Start TDE Build " --yesno \ +dialog --aspect 3 --no-collapse --cr-wrap --yes-label "${DL_BLD_MSG:-Start}" --no-label "Cancel" --help-button --help-label "Build List" --no-shadow --defaultno --colors --title " ${DL_BLD_MSG:-Start TDE Build} " --yesno \ " Setup is complete - these are the build options: New build list \Zb\Z6$NEW_BUILD\Zn TDE version \Zb\Z6$TDEVERSION\Zn Clone/update cgit local repositories \Zb\Z6${CLONE:-\Z0\Zbn/a}\Zn +Only download sources \Zb\Z6${PRE_DOWNLOAD:-\Z0\Zbno}\Zn TDE installation directory \Zb\Z6$INSTALL_TDE\Zn TDE system configuration directory \Zb\Z6$SYS_CNF_DIR\Zn Compiler \Zb\Z6$COMPILER\Zn @@ -704,8 +776,8 @@ koffice: revert chalk to krita ${RVT:-n/a} build with libpng14 ${USE_PNG:-n/a} build with GraphicsMagick ${USE_GM:-n/a}\Zn - - <\Z1S\Zb\Z0tart\Zn> building the packages or \Zr\Z4\ZbAbort\Zn +Install packages as they are built \Zb\Z6$INST_PACKAGE\Zn +Prefix for packages common to KDE \Zb\Z6${tde_prefix:-\Z0\Zbn/a}\Zn " \ 0 0 @@ -719,7 +791,7 @@ $(cat $TMPVARS/TDEbuilds | tr -s " " "\n"|sed 's|^|\\Z0\\Zb|;s|/|\\Zn |'|sort - " \ 0 0 [[ $EXITVAL == 0 ]] && break -[[ $EXITVAL == 1 ]] && echo -e "\n\nBuild aborted\n" && exit 1 +[[ $EXITVAL == 1 ]] && echo -e "\n\nBuild Cancelled\n" && exit 1 echo done @@ -755,52 +827,46 @@ do # The real build starts here echo -e "\033[39;1m - Starting $package.SlackBuild .. - $(printf '%0.s\"' $(seq 1 $[${#package}+20])) + Starting $package.SlackBuild + $(printf '%0.s\"' $(seq 1 $[${#package}+20])) \033[0m" - - script -c "sh $package.SlackBuild" $TMP/$package-$(eval echo $version)-$ARCH-$build-build-log || ${EXIT_FAIL:-"true"} + ARCH_i18n="" && [[ $package == *i18n* ]] && ARCH_i18n=noarch + TDE_PFX="" && [[ " ktorrent k3b-i18n k3b gwenview-i18n gwenview filelight amarok libkipi libkexiv2 libkdcraw " == *$package* ]] && TDE_PFX=$TDEPFX + script -c "sh $package.SlackBuild" $TMP/$TDE_PFX$package-$(eval echo $version)-${ARCH_i18n:-$ARCH}-$build-build-log || ${EXIT_FAIL:-"true"} # remove colorizing escape sequences from build-log # Re: http://serverfault.com/questions/71285/in-centos-4-4-how-can-i-strip-escape-sequences-from-a-text-file - sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/$package-$(eval echo $version)-$ARCH-$build-build-log || ${EXIT_FAIL:-"true"} + sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/$TDE_PFX$package-$(eval echo $version)-${ARCH_i18n:-$ARCH}-$build-build-log || ${EXIT_FAIL:-"true"} -checkinstall () -{ -## test for what package is being built .. -## if it's not libpng, test for the package installed -## otherwise test for the libpng package only, not installed +checkmakepkg () { -{ -[[ $package != libpng ]] && [[ $(ls /var/log/packages/$package-*$(eval echo $version)-*-$build*) ]] -} || { -[[ $package == libpng ]] && [[ $(ls $LIBPNG_TMP/$package-$(eval echo $version)-*-$build*.txz) ]] -} -} && \ -## if either test is successful, the above will exit 0, then remove 'package' from the build list \ -sed -i "s|$dir ||" $TMPVARS/TDEbuilds || \ +## test whether the Slackware package has been built .. +[[ $(ls $TMP/$TDE_PFX$package-$(eval echo $version)-*-$build*.txz) ]] && \ +sed -i "s|$dir ||" $TMPVARS/TDEbuilds || { ## if unsuccessful, display error message \ -{ echo " - Error: $package package build failed - Check the build log $TMP/$package-$(eval echo $version)-$ARCH-$build-build-log + Error: $TDE_PFX$package package build failed + Check the build log $TMP/$TDE_PFX$package-$(eval echo $version)-${ARCH_i18n:-$ARCH}-$build-build-log " ## if koffice was building with libpng14, restore the libpng16 headers for any following builds [[ ${USE_PNG14:-} == yes ]] && source $BUILD_TDE_ROOT/get-source.sh && libpng16_fn || true ${EXIT_FAIL:-":"} } } -# 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 -## tidy-html5 is a special case because the version number is not in the archive name + +## skip build/packaging check if only downloading sources +[[ $PRE_DOWNLOAD == yes ]] || { +## install packages +[[ $INST == 1 ]] && [[ $package != tde-i18n ]] && [[ $package != libpng ]] && upgradepkg --install-new --reinstall $TMP/$TDE_PFX$package-$(eval echo $version)-*-$build*.txz && \ +checkmakepkg +## 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 here - test for last language in the I18N list to ensure they've all been built +[[ $package == tde-i18n ]] && package=$package-$(cat $TMPVARS/LASTLANG) && \ +checkmakepkg ## create libpng-1.4 package only - it will be installed by the koffice.SB because it overrides libpng headers which for Sl14.2/current point to libpng16. -[[ $package == tidy-html5 ]] && version=$(unzip -c tidy-html5-master.zip | grep -A 1 version.txt | tail -n 1) -if [[ $INST == 1 ]] && [[ $package != tde-i18n ]] && [[ $package != libpng ]]; then upgradepkg --install-new --reinstall $TMP/$package-$(eval echo $version)-*-$build*.txz -checkinstall -## test for last language in the I18N list to ensure they've all been built -elif [[ $INST == 1 ]] && [[ $package == tde-i18n ]]; then package=$package-$(cat $TMPVARS/LASTLANG) -checkinstall -elif [[ $package == libpng ]]; then checkinstall -fi +## if building only, and/or libpng, just check that the package has been created +[[ $INST == 0 ]] || [[ $package == libpng ]] && \ +checkmakepkg +} # back to original directory cd $BUILD_TDE_ROOT diff --git a/Core/tde-i18n/README b/Core/tde-i18n/README index 3c3cdf9..79daf06 100644 --- a/Core/tde-i18n/README +++ b/Core/tde-i18n/README @@ -1,6 +1,6 @@ There is an option in tde-i18n.SlackBuild to include a language specific patch file in the build. -It needs to be named tde-i18n-{lang}-patch and will then automatically be included for the build for that language. +It needs to be named tde-i18n-{lang}-patch and will then automatically be included for the build for that language. Because of its position in the Slackbuild and the patch -p0 option, the path to the patched file must start with 'tde-i18n-{lang}' - see tde-i18n-en_GB-patch for an example. diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 6a6aa0f..8d325d3 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=tde-i18n -[[ $I18N == "" ]] && echo -e "\nYou have tried to build $PRGNAM without selecting any language(s)\n" && exit +[[ $PRE_DOWNLOAD != yes ]] && [[ $I18N == "" ]] && echo -e "\033[39;1m\nYou have tried to build $PRGNAM without selecting any language(s)\n\033[0m" && exit VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} @@ -84,8 +84,6 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DBUILD_DOC="ON" \ -DBUILD_DATA="ON" \ @@ -94,11 +92,11 @@ cmake \ make_fn -mkdir -p $PKG/$INSTALL_TDE/doc/$PRGNAM-$VERSION +#mkdir -p $PKG/$INSTALL_TDE/doc/$PRGNAM-$VERSION #cp -a $DOCS $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION || true -cat $SRCDIR/$(basename $0) > $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/$PRGNAM-$lang.SlackBuild -chown -R root:root $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION -find $PKG$INSTALL_TDE/doc -type f -exec chmod 644 {} \; +#cat $SRCDIR/$(basename $0) > $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/$PRGNAM-$lang.SlackBuild +#chown -R root:root $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION +#find $PKG$INSTALL_TDE/doc -type f -exec chmod 644 {} \; mkdir_install_fn @@ -133,9 +131,9 @@ $PRGNAM-$lang: ARCH="noarch" cd $PKG -makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-$lang-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz} +makepkg --linkadd y --chown n $OUTPUT/$PRGNAM-$lang-$VERSION-$ARCH-$BUILD.txz cd $OUTPUT -md5sum $PRGNAM-$lang-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz} > $PRGNAM-$lang-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz}.md5 +md5sum $PRGNAM-$lang-$VERSION-$ARCH-$BUILD.txz > $PRGNAM-$lang-$VERSION-$ARCH-$BUILD.txz.md5 cat $PKG/install/slack-desc | grep "^$PRGNAM" | grep -v handy > $OUTPUT/$PRGNAM-$lang-$VERSION-$ARCH-$BUILD.txt # Restore the original umask: @@ -147,10 +145,8 @@ rm -rf $PRGNAM/$PRGNAM-$lang # Install i18n package(s) here because if more than one language pack is built, # upgradepkg [in BUILD-TDE.sh] can't process them in one command and the build will exit -if [ $INST == 1 ] -then -upgradepkg --install-new --reinstall $OUTPUT/$PRGNAM-$lang-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz} -fi +[[ $INST == 1 ]] && upgradepkg --install-new --reinstall $OUTPUT/$PRGNAM-$lang-$VERSION-$ARCH-$BUILD.txz + done echo $lang > $TMPVARS/LASTLANG diff --git a/Core/tdeaccessibility/tdeaccessibility.SlackBuild b/Core/tdeaccessibility/tdeaccessibility.SlackBuild index 17eec73..1b5d56e 100755 --- a/Core/tdeaccessibility/tdeaccessibility.SlackBuild +++ b/Core/tdeaccessibility/tdeaccessibility.SlackBuild @@ -39,7 +39,7 @@ ltoolupdate_fn chown_fn -cd_builddir_fn +cd_builddir_fn LDFLAGS=$SLKLDFLAGS \ CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ @@ -48,8 +48,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --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 8a16bc3..43bb7e9 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -33,8 +33,6 @@ getsource_fn untar_fn -listdocs_fn - ## enable 'ar' compression in Compress As menu echo $' --- konq-plugins/arkplugin/arkplugin.cpp @@ -47,6 +45,8 @@ do patch -N -p0 done || true +listdocs_fn + chown_fn # check for libatlantic [tdegames] @@ -59,7 +59,8 @@ chown_fn [[ $(ls $INSTALL_TDE/lib$LIBDIRSUFFIX/libnoatun.so*) ]] && NOATUN_PLUGINS="ON" cd_builddir_fn - cmake \ + +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ @@ -69,7 +70,6 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_ARTS="ON" \ -DWITH_SDL="ON" \ diff --git a/Core/tdeadmin/tdeadmin.SlackBuild b/Core/tdeadmin/tdeadmin.SlackBuild index dbf49f1..0c3bf64 100755 --- a/Core/tdeadmin/tdeadmin.SlackBuild +++ b/Core/tdeadmin/tdeadmin.SlackBuild @@ -48,8 +48,6 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_DOC="ON" \ diff --git a/Core/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild index 39bc115..fe449a0 100755 --- a/Core/tdeartwork/tdeartwork.SlackBuild +++ b/Core/tdeartwork/tdeartwork.SlackBuild @@ -48,8 +48,6 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_ARTS="ON" \ -DWITH_XSCREENSAVER="OFF" \ diff --git a/Core/tdebase/config/Xsession b/Core/tdebase/config/Xsession deleted file mode 100755 index 72aadb9..0000000 --- a/Core/tdebase/config/Xsession +++ /dev/null @@ -1,87 +0,0 @@ -#! /bin/sh -# Xsession - run as user - -# Merged in parts of the old Xsession to load defaults from -# Xresources and Xmodmap files, 2006-02-09 volkerdi - -session=$1 - -# This section is borrowed from the old X11 Xsession file: -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/usr/lib/X11/xinit/.Xresources -sysmodmap=/usr/lib/X11/xinit/.Xmodmap -# merge in defaults and keymaps -if [ -r $sysresources ]; then - /usr/bin/xrdb -merge $sysresources -fi -if [ -r $sysmodmap ]; then - /usr/bin/xmodmap $sysmodmap -fi -if [ -r $userresources ]; then - /usr/bin/xrdb -merge $userresources -fi -if [ -r $usermodmap ]; then - /usr/bin/xmodmap $usermodmap -fi - -# Note that the respective logout scripts are not sourced. -case $SHELL in - */bash) - [ -z "$BASH" ] && exec $SHELL $0 "$@" - set +o posix - [ -f /etc/profile ] && . /etc/profile - if [ -f $HOME/.bash_profile ]; then - . $HOME/.bash_profile - elif [ -f $HOME/.bash_login ]; then - . $HOME/.bash_login - elif [ -f $HOME/.profile ]; then - . $HOME/.profile - fi - ;; - */zsh) - [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" - emulate -R zsh - [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc - zhome=${ZDOTDIR:-$HOME} - # zshenv is always sourced automatically. - [ -f $zdir/zprofile ] && . $zdir/zprofile - [ -f $zhome/.zprofile ] && . $zhome/.zprofile - [ -f $zdir/zlogin ] && . $zdir/zlogin - [ -f $zhome/.zlogin ] && . $zhome/.zlogin - ;; - */csh|*/tcsh) - # [t]cshrc is always sourced automatically. - # Note that sourcing csh.login after .cshrc is non-standard. - xsess_tmp=`mktemp` - $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export >! $xsess_tmp" - . $xsess_tmp - rm -f $xsess_tmp - ;; - *) # Plain sh, ksh, and anything we don't know. - [ -f /etc/profile ] && . /etc/profile - [ -f $HOME/.profile ] && . $HOME/.profile - ;; -esac - -[ -f /etc/xprofile ] && . /etc/xprofile -[ -f $HOME/.xprofile ] && . $HOME/.xprofile - -case $session in - "") - exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." - ;; - failsafe) - exec xterm -geometry 80x24-0-0 - ;; - custom) - exec $HOME/.xsession - ;; - default) - exec {INSTALL_TDE}/bin/starttde - ;; - *) - eval exec "$session" - ;; -esac -exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." diff --git a/Core/tdebase/doinst.sh b/Core/tdebase/doinst.sh deleted file mode 100755 index bf4a95f..0000000 --- a/Core/tdebase/doinst.sh +++ /dev/null @@ -1,64 +0,0 @@ -# Save old config files: -if [ ! -L etc/X11/tdm ]; then - if [ -d etc/X11/tdm ]; then - 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 -fi - - -config() { - NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} -config .{SYS_CNF_DIR}/tdm/tdmrc.new -config .{SYS_CNF_DIR}/tdm/backgroundrc.new - -# Update the desktop database: -/usr/bin/update-desktop-database .{INSTALL_TDE}/share/applications - -# Update the mime database: -/usr/bin/update-mime-database usr/share/mime - -# Update hicolor theme cache: -/usr/bin/gtk-update-icon-cache -f -t .{INSTALL_TDE}/share/icons/hicolor - - -# update PATH -# 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 -then -echo "PATH=\$PATH:{INSTALL_TDE}/bin:{TQTDIR}/bin" >> /etc/profile -else -if ! grep {TQTDIR}/bin /etc/profile -then -echo "PATH=\$PATH:{TQTDIR}/bin" >> /etc/profile -fi -fi - - -# update MANPATH -if ! grep {INSTALL_TDE}/man /etc/profile -then -echo "export MANPATH=\$MANPATH:{INSTALL_TDE}/man" >> /etc/profile -fi - - -## you may not want to do this ## -# start a 'konsole' with system-wide profile -[[ ! $(grep -x "source /etc/profile" $HOME/.bashrc ) ]] && echo "source /etc/profile" >> $HOME/.bashrc || true -# don't want this -sed -i 's|source /etc/profile.d/mc.sh|#source /etc/profile.d/mc.sh|' $HOME/.bashrc || true diff --git a/Core/tdebase/profile.d/tde.csh b/Core/tdebase/profile.d/tde.csh deleted file mode 100755 index 2cccaa5..0000000 --- a/Core/tdebase/profile.d/tde.csh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/csh -# TDE additions: -if ( ! $?TDEDIR ) then - setenv TDEDIR {INSTALL_TDE} -endif -if ( $?XDG_CONFIG_DIRS ) then - setenv XDG_CONFIG_DIRS $XDG_CONFIG_DIRS:{SYS_CNF_DIR}/xdg -else - 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 deleted file mode 100755 index e58998e..0000000 --- a/Core/tdebase/profile.d/tde.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# TDE additions: -TDEDIR={INSTALL_TDE} -export TDEDIR -if [ ! "$XDG_CONFIG_DIRS" = "" ]; then - XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:{SYS_CNF_DIR}/xdg -else - 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 deleted file mode 100644 index 2090f12..0000000 --- a/Core/tdebase/rc.4.local +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/sh - -# Start TDM: -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 -fi diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index af4dd17..1d506f2 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -35,8 +35,6 @@ getsource_fn untar_fn -listdocs_fn - ## allow for configuration files directory != /etc/trinity sed -i "s|/etc/trinity/|$SYS_CNF_DIR/|" tdm/kfrontend/gentdmconf.c || true @@ -106,6 +104,8 @@ do patch -N -p0 done || true +listdocs_fn + chown_fn cd_builddir_fn @@ -120,7 +120,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_ARTS="ON" \ -DWITH_ELFICON="OFF" \ @@ -213,59 +212,297 @@ installdocs_fn 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 +echo '#!''/bin/sh + +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap + +if [ -f $sysresources ]; then + /usr/bin/xrdb -merge $sysresources +fi + +if [ -f $sysmodmap ]; then + /usr/bin/xmodmap $sysmodmap +fi + +if [ -f $userresources ]; then + /usr/bin/xrdb -merge $userresources +fi + +if [ -f $usermodmap ]; then + /usr/bin/xmodmap $usermodmap +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 +else + exec dbus-launch --exit-with-session '"$INSTALL_TDE"'/bin/starttde +fi +' > $PKG/etc/X11/xinit/xinitrc.tde chmod 755 $PKG/etc/X11/xinit/xinitrc.tde (cd $PKG/etc/X11/xinit/ ln -sf xinitrc.tde xinitrc) +############################################################################## + +## create tde.{,c}sh: + mkdir -p $PKG/etc/profile.d -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 +echo '#!'"/bin/sh +# TDE additions: +export TDEDIR=$INSTALL_TDE + +# upgradepkg runs installpkg twice, so test for the second run: +[[ \"\$XDG_CONFIG_DIRS\" != *$SYS_CNF_DIR/xdg* ]] && { +if [ ! \"\$XDG_CONFIG_DIRS\" = \"\" ]; then + export XDG_CONFIG_DIRS=\$XDG_CONFIG_DIRS:$SYS_CNF_DIR/xdg +else + export XDG_CONFIG_DIRS=/etc/xdg:$SYS_CNF_DIR/xdg +fi +} + +## Re: https://specifications.freedesktop.org/basedir-spec/basedir-spec-0.6.html +## If XDG_DATA_DIRS is null or unset, the default is /usr/local/share:/usr/share +[[ \$XDG_DATA_DIRS == \"\" ]] && \\ +export XDG_DATA_DIRS=/usr/local/share:/usr/share:$INSTALL_TDE/share || { +[[ \$XDG_DATA_DIRS != *$INSTALL_TDE/share* ]] && \\ +export XDG_DATA_DIRS=\$XDG_DATA_DIRS:$INSTALL_TDE/share +} +" > $PKG/etc/profile.d/tde.sh + +echo '#!'"/bin/csh +# TDE additions: +if ( ! \$?TDEDIR ) then + setenv TDEDIR $INSTALL_TDE +endif + +if ( \$?XDG_CONFIG_DIRS ) then + setenv XDG_CONFIG_DIRS \$XDG_CONFIG_DIRS:$SYS_CNF_DIR/xdg +else + setenv XDG_CONFIG_DIRS /etc/xdg:$SYS_CNF_DIR/xdg +endif + +setenv XDG_DATA_DIRS /usr/local/share:/usr/share:$INSTALL_TDE/share +" > $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$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 +echo '#!'" /bin/sh + +# Start TDM: +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 +fi +" > $PKG/etc/rc.d/rc.4.local chmod 755 $PKG/etc/rc.d/rc.4.local +############################################################################## + # Set sane permissions for the include files. if [ -d $PKG$INSTALL_TDE/include ]; then find $PKG$INSTALL_TDE/include -type f -exec chmod 0644 {} \; fi +############################################################################## + # Setup config files for 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|$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$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$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 +# +## new Xsession: +echo '#!'' /bin/sh +# Xsession - run as user + +# Merged in parts of the old Xsession to load defaults from +# Xresources and Xmodmap files, 2006-02-09 volkerdi + +session=$1 + +# This section is borrowed from the old X11 Xsession file: +userresources=$HOME/.Xresources +usermodmap=$HOME/.Xmodmap +sysresources=/usr/lib/X11/xinit/.Xresources +sysmodmap=/usr/lib/X11/xinit/.Xmodmap +# merge in defaults and keymaps +if [ -r $sysresources ]; then + /usr/bin/xrdb -merge $sysresources fi +if [ -r $sysmodmap ]; then + /usr/bin/xmodmap $sysmodmap +fi +if [ -r $userresources ]; then + /usr/bin/xrdb -merge $userresources +fi +if [ -r $usermodmap ]; then + /usr/bin/xmodmap $usermodmap +fi + +# Note that the respective logout scripts are not sourced. +case $SHELL in + */bash) + [ -z "$BASH" ] && exec $SHELL $0 "$@" + set +o posix + [ -f /etc/profile ] && . /etc/profile + if [ -f $HOME/.bash_profile ]; then + . $HOME/.bash_profile + elif [ -f $HOME/.bash_login ]; then + . $HOME/.bash_login + elif [ -f $HOME/.profile ]; then + . $HOME/.profile + fi + ;; + */zsh) + [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@" + emulate -R zsh + [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc + zhome=${ZDOTDIR:-$HOME} + # zshenv is always sourced automatically. + [ -f $zdir/zprofile ] && . $zdir/zprofile + [ -f $zhome/.zprofile ] && . $zhome/.zprofile + [ -f $zdir/zlogin ] && . $zdir/zlogin + [ -f $zhome/.zlogin ] && . $zhome/.zlogin + ;; + */csh|*/tcsh) + # [t]cshrc is always sourced automatically. + # Note that sourcing csh.login after .cshrc is non-standard. + xsess_tmp=`mktemp` + $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export >! $xsess_tmp" + . $xsess_tmp + rm -f $xsess_tmp + ;; + *) # Plain sh, ksh, and anything we don'\''t know. + [ -f /etc/profile ] && . /etc/profile + [ -f $HOME/.profile ] && . $HOME/.profile + ;; +esac + +[ -f /etc/xprofile ] && . /etc/xprofile +[ -f $HOME/.xprofile ] && . $HOME/.xprofile + +case $session in + "") + exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session." + ;; + failsafe) + exec xterm -geometry 80x24-0-0 + ;; + custom) + exec $HOME/.xsession + ;; + default) + exec '"$INSTALL_TDE"'/bin/starttde + ;; + *) + eval exec "$session" + ;; +esac +exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." +' > $PKG$SYS_CNF_DIR/tdm/Xsession + +############################################################################## + +mv $PKG$SYS_CNF_DIR/tdm/backgroundrc $PKG$SYS_CNF_DIR/tdm/backgroundrc.new +[[ -r $PKG$SYS_CNF_DIR/tdm/README ]] && \ +sed -i "s|$TMP_BUILD/package-tdebase$SYS_CNF_DIR/tdm|$SYS_CNF_DIR/tdm|" $PKG$SYS_CNF_DIR/tdm/README + mkdir_install_fn -sed "s|{SYS_CNF_DIR}|$SYS_CNF_DIR|;s|{INSTALL_TDE}|$INSTALL_TDE|;s|{TQTDIR}|$TQTDIR|" < $SRCDIR/doinst.sh > $PKG/install/doinst.sh +############################################################################## +## create doinst.sh: + +echo '# Save old config files: +if [ ! -L etc/X11/tdm ]; then + if [ -d etc/X11/tdm ]; then + 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 +fi + +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there'\''s no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +config .'"$SYS_CNF_DIR"'/tdm/tdmrc.new +config .'"$SYS_CNF_DIR"'/tdm/backgroundrc.new + +# update PATH +# upgradepkg runs installpkg 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 +then +echo "PATH=\$PATH:'"$INSTALL_TDE"'/bin:'"$TQTDIR"'/bin" >> /etc/profile +else +if ! grep '"$TQTDIR"'/bin /etc/profile +then +echo "PATH=\$PATH:'"$TQTDIR"'/bin" >> /etc/profile +fi +fi + +# update MANPATH +if ! grep '"$INSTALL_TDE"'/man /etc/profile +then +echo "export MANPATH=\$MANPATH:'"$INSTALL_TDE"'/man" >> /etc/profile +fi + +## you may not want to do this ## +# start a '\''konsole'\'' with system-wide profile +[[ ! $(grep -x "source /etc/profile" $HOME/.bashrc ) ]] && echo "source /etc/profile" >> $HOME/.bashrc || true +# don'\''t want this +sed -i '\''s|source /etc/profile.d/mc.sh|#source /etc/profile.d/mc.sh|'\'' $HOME/.bashrc || true +' > $PKG/install/doinst.sh + [[ $RUNLEVEL == 4 ]] && { -echo " -## set default runlevel to 4 for tdm +echo "## set default runlevel to 4 for tdm sed -i 's|id:[1-5]|id:4|' etc/inittab " >> $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 @@ -275,6 +512,10 @@ echo 'export TDEROOTHOME=/root/.tde' >> /etc/profile " >> $PKG/install/doinst.sh } +doinst_sh_fn + +############################################################################## + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Core/tdebase/xinitrc.tde b/Core/tdebase/xinitrc.tde deleted file mode 100755 index 19705f5..0000000 --- a/Core/tdebase/xinitrc.tde +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -if [ -f $sysresources ]; then - /usr/bin/xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - /usr/bin/xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - /usr/bin/xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - /usr/bin/xmodmap $usermodmap -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 -else - exec dbus-launch --exit-with-session {INSTALL_TDE}/bin/starttde -fi - diff --git a/Core/tdeedu/tdeedu.SlackBuild b/Core/tdeedu/tdeedu.SlackBuild index 337d95c..b35b383 100755 --- a/Core/tdeedu/tdeedu.SlackBuild +++ b/Core/tdeedu/tdeedu.SlackBuild @@ -104,8 +104,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_GCC_VISIBILITY="OFF" \ -DWITH_ARTS="ON" \ -DWITH_OCAML_SOLVER=$OCAML \ diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild index 33d4130..70ef4c3 100755 --- a/Core/tdegames/tdegames.SlackBuild +++ b/Core/tdegames/tdegames.SlackBuild @@ -32,6 +32,7 @@ source ../../get-source.sh getsource_fn untar_fn + listdocs_fn chown_fn @@ -45,8 +46,6 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_ARTS="ON" \ -DBUILD_ATLANTIK="ON" \ -DBUILD_DOC="ON" \ @@ -103,6 +102,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index 3d358cb..d1bdf59 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -66,8 +66,6 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_T1LIB="OFF" \ -DWITH_PAPER="OFF" \ diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index c33c1f1..f99c40b 100644 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -84,7 +84,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DCMAKE_SKIP_RPATH="OFF" \ -DTDE_MALLOC="OFF" \ diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index f8f0385..347c968 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -55,8 +55,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ --disable-rpath \ --disable-debug \ --enable-closure @@ -83,8 +81,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_ALSA="ON" \ -DWITH_ARTS_AKODE="$AKODE" \ -DWITH_ARTS_AUDIOFILE="ON" \ diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index 76ed35a..97fd5ba 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -33,9 +33,6 @@ getsource_fn untar_fn -# If speex is installed, include it in the build for jingle -[[ -s /usr/include/speex/speex.h ]] && SPX="ON" - listdocs_fn chown_fn @@ -44,6 +41,8 @@ cd_builddir_fn ## If changing any of these options, READ CMakeLists.txt for info on interdependencies .. ## GADU & MEANWHILE require libgadu and meanwhile installed. +# If speex is installed, include it in the build for jingle +[[ -s /usr/include/speex/speex.h ]] && SPX="ON" cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ @@ -52,8 +51,6 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_ARTS="ON" \ -DWITH_JINGLE="ON" \ -DWITH_SPEEX=${SPX:-"OFF"} \ diff --git a/Core/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild index a29cd79..5b4af5c 100755 --- a/Core/tdepim/tdepim.SlackBuild +++ b/Core/tdepim/tdepim.SlackBuild @@ -33,18 +33,18 @@ getsource_fn untar_fn -# If libcaldav is installed, include it in the build for korganizer -[[ -s $INSTALL_TDE/include/libcaldav/caldav.h ]] 2>/dev/null && LCALDAV="ON" - -# If libcarddav is installed, include it in the build for korganizer -[[ -s $INSTALL_TDE/include/libcarddav/carddav.h ]] 2>/dev/null && LCARDDAV="ON" - listdocs_fn chown_fn cd_builddir_fn +# If libcaldav is installed, include it in the build for korganizer +[[ -s $INSTALL_TDE/include/libcaldav/caldav.h ]] 2>/dev/null && LCALDAV="ON" + +# If libcarddav is installed, include it in the build for korganizer +[[ -s $INSTALL_TDE/include/libcarddav/carddav.h ]] 2>/dev/null && LCARDDAV="ON" + cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ @@ -55,8 +55,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_ARTS="ON" \ -DWITH_BIRTHDAYS="ON" \ -DWITH_CALDAV=${LCALDAV:-"OFF"} \ diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild index 2251b21..097d835 100755 --- a/Core/tdesdk/tdesdk.SlackBuild +++ b/Core/tdesdk/tdesdk.SlackBuild @@ -49,7 +49,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -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 ca5545f..1049d15 100755 --- a/Core/tdetoys/tdetoys.SlackBuild +++ b/Core/tdetoys/tdetoys.SlackBuild @@ -49,7 +49,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DBUILD_AMOR="ON" \ -DBUILD_DOC="ON" \ @@ -68,6 +67,8 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index de98da6..730ac81 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -39,6 +39,8 @@ chown_fn cd_builddir_fn +## TDEFileReplace has been moved from tdewebdev for R14.1.0 +[[ $TDEVERSION == cgit ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON" cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ @@ -48,8 +50,6 @@ cmake \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_DPMS="ON" \ -DWITH_XSCREENSAVER="OFF" \ @@ -83,7 +83,7 @@ cmake \ -DBUILD_KTIMER="ON" \ -DBUILD_TDEWALLET="ON" \ -DBUILD_SUPERKARAMBA="ON" \ - -DBUILD_TDEFILEREPLACE="ON" \ + ${TDEFileReplace:-} \ -Wno-dev \ .. @@ -97,6 +97,7 @@ mkdir_install_fn doinst_sh_fn +[[ $TDEVERSION == cgit ]] && TDEFileReplace="* TDEFileReplace: powerful search and replace in multiple files" echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -126,8 +127,7 @@ $PRGNAM: * ktimer: execute programs after some time $PRGNAM: * superkaramba: a version of Karamba with python scripting $PRGNAM: * tdelirc: a TDE frontend for the Linux Infrared Remote Control system $PRGNAM: * tdewallet: a convenient and secure way to manage all your passwords -$PRGNAM: * TDEFileReplace: powerful search and replace in multiple files -$PRGNAM: [Moved from tdewebdev for R14.1.0] +$PRGNAM: ${TDEFileReplace:-} " > $PKG/install/slack-desc makepkg_fn diff --git a/Core/tdevelop/tdevelop.SlackBuild b/Core/tdevelop/tdevelop.SlackBuild index 9ad77e1..c31aa5b 100755 --- a/Core/tdevelop/tdevelop.SlackBuild +++ b/Core/tdevelop/tdevelop.SlackBuild @@ -49,8 +49,6 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ -DWITH_BUILDTOOL_ADA="ON" \ -DWITH_BUILDTOOL_ANT="ON" \ -DWITH_BUILDTOOL_AUTOTOOLS="ON" \ diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index fa1788b..fcb6d5c 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -48,8 +48,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -63,6 +61,8 @@ mkdir_install_fn doinst_sh_fn +## TDEFileReplace has been moved to tdeutils for R14.1.0 +[[ $TDEVERSION == 14.0.7 ]] && TDEFileReplace="* TDEFileReplace: powerful search and replace in multiple files" echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -77,11 +77,11 @@ $PRGNAM: * Quanta Plus: a web IDE $PRGNAM: $PRGNAM: The runtime dependencies are: $PRGNAM: * Kommander: a GUI script builder and executor tool. -$PRGNAM: * TDEFileReplace: powerful search and replace in multiple files -$PRGNAM: [Moved to tdeutils for R14.1.0] $PRGNAM: * KXSLDbg: XSL debugger $PRGNAM: * KImageMapEditor: image map editor $PRGNAM: * KLinkStatus: link checker +$PRGNAM: ${TDEFileReplace:-} +$PRGNAM: " > $PKG/install/slack-desc makepkg_fn diff --git a/Deps/avahi-tqt/avahi-tqt.SlackBuild b/Deps/avahi-tqt/avahi-tqt.SlackBuild index b3be975..3c02320 100755 --- a/Deps/avahi-tqt/avahi-tqt.SlackBuild +++ b/Deps/avahi-tqt/avahi-tqt.SlackBuild @@ -49,7 +49,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_GCC_VISIBILITY="OFF" \ -.. + .. make_fn diff --git a/Deps/dbus-tqt/dbus-tqt.SlackBuild b/Deps/dbus-tqt/dbus-tqt.SlackBuild index 8cb855d..415544b 100755 --- a/Deps/dbus-tqt/dbus-tqt.SlackBuild +++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild @@ -54,8 +54,6 @@ make_fn installdocs_fn -mangzip_fn - strip_fn mkdir_install_fn diff --git a/Deps/libart-lgpl/libart-lgpl.SlackBuild b/Deps/libart-lgpl/libart-lgpl.SlackBuild index 7ce74e8..2f91494 100644 --- a/Deps/libart-lgpl/libart-lgpl.SlackBuild +++ b/Deps/libart-lgpl/libart-lgpl.SlackBuild @@ -47,6 +47,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DMAN_INSTALL_DIR=/usr/man \ -DWITH_GCC_VISIBILITY="OFF" \ -DBUILD_DOC="ON" \ .. @@ -55,6 +56,9 @@ make_fn installdocs_fn +INSTALL_TDE=/usr +mangzip_fn + strip_fn mkdir_install_fn diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index 4de244a..2e5fdbd 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -47,8 +47,6 @@ CXX=$COMPILER_CXX \ ./autogen.sh \ --prefix=$INSTALL_TDE \ --libdir=$INSTALL_TDE/lib$LIBDIRSUFFIX \ - --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 eef518a..4b50a6b 100755 --- a/Deps/libcarddav/libcarddav.SlackBuild +++ b/Deps/libcarddav/libcarddav.SlackBuild @@ -47,8 +47,6 @@ CXX=$COMPILER_CXX \ ./autogen.sh \ --prefix=$INSTALL_TDE \ --libdir=$INSTALL_TDE/lib$LIBDIRSUFFIX \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure diff --git a/Deps/tqca-tls/tqca-tls.SlackBuild b/Deps/tqca-tls/tqca-tls.SlackBuild index b2995d7..60bcc40 100755 --- a/Deps/tqca-tls/tqca-tls.SlackBuild +++ b/Deps/tqca-tls/tqca-tls.SlackBuild @@ -37,7 +37,7 @@ listdocs_fn chown_fn -#cd_builddir_fn +#cd_builddir_fn - don't use [[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|$INSTALL_TDE/include/tqt|g" configure || true LDFLAGS=$SLKLDFLAGS \ diff --git a/Deps/tqt3/apps/tqassistant.desktop b/Deps/tqt3/apps/tqassistant.desktop deleted file mode 100644 index d835c72..0000000 --- a/Deps/tqt3/apps/tqassistant.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=TQt Assistant -Icon=qtassistant -Comment=Shows documentation and examples for TQt -Exec=tqassistant -Terminal=false -Categories=Development;Programming; diff --git a/Deps/tqt3/apps/tqdesigner.desktop b/Deps/tqt3/apps/tqdesigner.desktop deleted file mode 100644 index fcdcf20..0000000 --- a/Deps/tqt3/apps/tqdesigner.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=TQt Designer -Icon=qtdesigner -Comment=Design TQt3 GUI -Exec=tqdesigner -Terminal=false -Categories=Development;Programming; diff --git a/Deps/tqt3/apps/tqlinguist.desktop b/Deps/tqt3/apps/tqlinguist.desktop deleted file mode 100644 index 00bcca8..0000000 --- a/Deps/tqt3/apps/tqlinguist.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=TQt Linguist -Icon=qtlinguist -Comment=Translation tool for TQT3 -Exec=tqlinguist -Terminal=false -Categories=Development;Programming; diff --git a/Deps/tqt3/apps/tqtconfig.desktop b/Deps/tqt3/apps/tqtconfig.desktop deleted file mode 100644 index 8cb2076..0000000 --- a/Deps/tqt3/apps/tqtconfig.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=TQt3 Config -Icon=qtlogo -Comment=Configure TQt3 -Exec=tqtconfig -Terminal=false -Categories=Settings diff --git a/Deps/tqt3/profile.d/tqt3.csh b/Deps/tqt3/profile.d/tqt3.csh deleted file mode 100755 index 4c3e2aa..0000000 --- a/Deps/tqt3/profile.d/tqt3.csh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/csh -# Environment path variables for the Qt package: -if ( ! $?QTDIR ) then - # It's best to use the generic directory to avoid - # compiling in a version-containing path: - if ( -d $TQTDIR ) then - setenv QTDIR $TQTDIR - else - # Find the newest Qt directory and set $QTDIR to that: - foreach qtd ( $TQTDIR-* ) - if ( -d $qtd ) then - setenv QTDIR $qtd - endif - end - endif -endif diff --git a/Deps/tqt3/profile.d/tqt3.sh b/Deps/tqt3/profile.d/tqt3.sh deleted file mode 100755 index 3bf8210..0000000 --- a/Deps/tqt3/profile.d/tqt3.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# Environment variables for the Qt package. -# -# It's best to use the generic directory to avoid -# compiling in a version-containing path: -if [ -d $TQTDIR ]; then - QTDIR=$TQTDIR -else - # Find the newest Qt directory and set $QTDIR to that: - for qtd in $TQTDIR-* ; do - if [ -d $qtd ]; then - QTDIR=$qtd - fi - done -fi -export QTDIR diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild index 5768743..12309cb 100755 --- a/Deps/tqt3/tqt3.SlackBuild +++ b/Deps/tqt3/tqt3.SlackBuild @@ -80,7 +80,7 @@ listdocs_fn chown_fn -#cd_builddir_fn +#cd_builddir_fn - don't use echo "yes" | CFLAGS=$SLKCFLAGS CXXFLAGS=$SLKCFLAGS \ ./configure \ @@ -144,10 +144,43 @@ ln -s linux-g++ default installdocs_fn mkdir -p $PKG/etc/profile.d -# JD: adapt these to the correct value of LIBDIRSUFFIX -# later changed to TQTDIR -sed "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/profile.d/$PRGNAM.sh > $PKG/etc/profile.d/$PRGNAM.sh -sed "s|\$TQTDIR|$TQTDIR|g" < $SRCDIR/profile.d/$PRGNAM.csh > $PKG/etc/profile.d/$PRGNAM.csh +# +echo '#!'"/bin/sh +# Environment variables for the tQt package. +# +# It's best to use the generic directory to avoid +# compiling in a version-containing path: +if [ -d $TQTDIR ]; then + QTDIR=$TQTDIR +else + # Find the newest Qt directory and set \$QTDIR to that: + for qtd in $TQTDIR-* ; do + if [ -d \$qtd ]; then + QTDIR=\$qtd + fi + done +fi +export QTDIR +" > $PKG/etc/profile.d/tqt3.sh +# +echo '#!'"/bin/csh +# Environment path variables for the tQt package: +if ( ! \$?QTDIR ) then + # It's best to use the generic directory to avoid + # compiling in a version-containing path: + if ( -d $TQTDIR ) then + setenv QTDIR $TQTDIR + else + # Find the newest Qt directory and set \$QTDIR to that: + foreach qtd ( $TQTDIR-* ) + if ( -d \$qtd ) then + setenv QTDIR \$qtd + endif + end + endif +endif +" > $PKG/etc/profile.d/tqt3.csh +# chmod 755 $PKG/etc/profile.d/* strip_fn @@ -157,20 +190,18 @@ mkdir -p $PKG$INSTALL_TDE/bin ( cd $PKG$INSTALL_TDE/bin ln -sf ../lib$LIBDIRSUFFIX/$PRGNAM-$VERSION/bin/* . ) - +# mkdir -p $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig ( cd $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig ln -sf ../$PRGNAM-$VERSION/lib/pkgconfig/tqt-mt.pc . ) -[[ ! $TQT_OPTS == *minimal* ]] && { -# Add desktop files to launch some programs: +[[ $TQT_OPTS != *minimal* ]] && { +## move .desktop files to where the other TDE .desktop files are installed mkdir -p $PKG$INSTALL_TDE/share/applications/tde -cp -a $SRCDIR/apps/tqtconfig.desktop $PKG$INSTALL_TDE/share/applications/tde/tqtconfig.desktop -cp -a $SRCDIR/apps/tqlinguist.desktop $PKG$INSTALL_TDE/share/applications/tde/tqlinguist.desktop -cp -a $SRCDIR/apps/tqdesigner.desktop $PKG$INSTALL_TDE/share/applications/tde/tqdesigner.desktop -cp -a $SRCDIR/apps/tqassistant.desktop $PKG$INSTALL_TDE/share/applications/tde/tqassistant.desktop +mv $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/$PRGNAM-$TDEVERSION/share/applications/* $PKG$INSTALL_TDE/share/applications/tde/ } +rm -rf $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/$PRGNAM-$TDEVERSION/share/applications # Symlink tqt3 includes to qt3, to provide it for non-tde software as well =] mkdir -p $PKG$INSTALL_TDE/include @@ -196,12 +227,8 @@ if [ -x /sbin/ldconfig ]; then fi # Update PKG_CONFIG_PATH: -if ! grep $INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig /etc/profile.d/pkgconfig.sh -then -sed -i "s|pkgconfig$|pkgconfig:$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig|g" /etc/profile.d/pkgconfig.sh -sed -i "s|pkgconfig$|pkgconfig:$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig|g" /etc/profile.d/pkgconfig.csh -fi - +[[ ! \$( grep $INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig /etc/profile.d/pkgconfig.sh ) ]] && \\ +sed -i "s|pkgconfig$|pkgconfig:$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig|" /etc/profile.d/pkgconfig.{,c}sh EOINS ## Removing any existing TDE libs paths and re-installing prevents duplication - @@ -217,10 +244,10 @@ if [ -x /sbin/ldconfig ]; then fi # Update PKG_CONFIG_PATH: -sed -i "s|$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig||g;s|:$||g" /etc/profile.d/pkgconfig.{,c}sh -sed -i "s|PKG_CONFIG_PATH=|PKG_CONFIG_PATH=$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig:|g;s|::|:|g" /etc/profile.d/pkgconfig.sh -sed -i "s|PKG_CONFIG_PATH |PKG_CONFIG_PATH $INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig:|g;s|::|:|g" /etc/profile.d/pkgconfig.csh - +[[ ! \$( grep PKG_CONFIG_PATH=$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig: /etc/profile.d/pkgconfig.sh ) ]] && { +sed -i "s|PKG_CONFIG_PATH=|PKG_CONFIG_PATH=$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig:|" /etc/profile.d/pkgconfig.sh +sed -i "s| PKG_CONFIG_PATH | PKG_CONFIG_PATH $INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig:|" /etc/profile.d/pkgconfig.csh +} EOINS doinst_sh_fn @@ -235,7 +262,7 @@ echo " |-----handy-ruler------------------------------------------------------| $PRGNAM: tqt3 (C++ GUI application framework) $PRGNAM: -$PRGNAM: Qt is a multiplatform C++ GUI application framework +$PRGNAM: tQt is a multiplatform C++ GUI application framework $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Libs/kipi-plugins/kipi-plugins.SlackBuild b/Libs/kipi-plugins/kipi-plugins.SlackBuild index eaf4d61..64fb626 100755 --- a/Libs/kipi-plugins/kipi-plugins.SlackBuild +++ b/Libs/kipi-plugins/kipi-plugins.SlackBuild @@ -63,7 +63,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure @@ -72,6 +71,8 @@ make_fn installdocs_fn +mangzip_fn + strip_fn mkdir_install_fn diff --git a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild b/Libs/libkdcraw/libkdcraw.SlackBuild old mode 100755 new mode 100644 similarity index 97% rename from Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild rename to Libs/libkdcraw/libkdcraw.SlackBuild index 2dc86ee..2f787b3 --- a/Libs/tdelibkdcraw/tdelibkdcraw.SlackBuild +++ b/Libs/libkdcraw/libkdcraw.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=libkdcraw -PKGNAM=tde$PRGNAM +PKGNAM=$TDEPFX$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -54,8 +54,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-openmp \ --enable-closure @@ -68,6 +66,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + PRGNAM=$PKGNAM echo " # HOW TO EDIT THIS FILE: diff --git a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild b/Libs/libkexiv2/libkexiv2.SlackBuild old mode 100755 new mode 100644 similarity index 97% rename from Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild rename to Libs/libkexiv2/libkexiv2.SlackBuild index 66c2ce8..5eb1ffe --- a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild +++ b/Libs/libkexiv2/libkexiv2.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=libkexiv2 -PKGNAM=tde$PRGNAM +PKGNAM=$TDEPFX$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -76,7 +76,7 @@ $PRGNAM: metadata. This library is used by kipi-plugins, digiKam and other $PRGNAM: kipi host programs. The library documentation is available in the $PRGNAM: kexiv2.h header file. $PRGNAM: -$PRGNAM: Homepage: http://www.kipi-plugins.org/ +$PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Libs/tdelibkipi/tdelibkipi.SlackBuild b/Libs/libkipi/libkipi.SlackBuild old mode 100755 new mode 100644 similarity index 96% rename from Libs/tdelibkipi/tdelibkipi.SlackBuild rename to Libs/libkipi/libkipi.SlackBuild index 9443b0e..d5b4b4b --- a/Libs/tdelibkipi/tdelibkipi.SlackBuild +++ b/Libs/libkipi/libkipi.SlackBuild @@ -24,7 +24,7 @@ # SUCH DAMAGE. PRGNAM=libkipi -PKGNAM=tde$PRGNAM +PKGNAM=$TDEPFX$PRGNAM VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} @@ -34,10 +34,6 @@ getsource_fn untar_fn -listdocs_fn - -chown_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 po/$Lang ]] && langs="$langs $Lang/$PRGNAM.po";done @@ -45,6 +41,10 @@ sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt langs=$(echo $langs|sed "s|/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON +listdocs_fn + +chown_fn + cd_builddir_fn cmake \ @@ -56,8 +56,8 @@ cmake \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DWITH_GCC_VISIBILITY="OFF" \ - -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ - -DCMAKE_SKIP_RPATH=ON \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -DCMAKE_SKIP_RPATH="ON" \ .. make_fn @@ -68,6 +68,8 @@ strip_fn mkdir_install_fn +doinst_sh_fn + PRGNAM=$PKGNAM echo " # HOW TO EDIT THIS FILE: diff --git a/Libs/libksquirrel/libksquirrel.SlackBuild b/Libs/libksquirrel/libksquirrel.SlackBuild index a129755..0268065 100755 --- a/Libs/libksquirrel/libksquirrel.SlackBuild +++ b/Libs/libksquirrel/libksquirrel.SlackBuild @@ -33,6 +33,9 @@ getsource_fn untar_fn +## don't install 'sources' docs +sed -i 's|sources ||' doc/Makefile.am + listdocs_fn ltoolupdate_fn @@ -48,8 +51,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ./configure \ --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ --disable-rpath \ --enable-closure diff --git a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild index 395570d..bb6963a 100755 --- a/Misc/GraphicsMagick/GraphicsMagick.SlackBuild +++ b/Misc/GraphicsMagick/GraphicsMagick.SlackBuild @@ -51,19 +51,18 @@ CXX=$COMPILER_CXX \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ --localstatedir=/var \ - --sysconfdir=/etc \ --mandir=/usr/man \ --enable-shared \ --disable-static \ --with-modules \ --with-x \ --with-frozenpaths - make_fn installdocs_fn +INSTALL_TDE=/usr mangzip_fn strip_fn diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild index a5e32af..86ee1fe 100644 --- a/Misc/graphviz/graphviz.SlackBuild +++ b/Misc/graphviz/graphviz.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=graphviz VERSION=${VERSION:-2.42.3} BUILD=${BUILD:-1} -TAG=${TAG:-_tde} +TAG=${TAG:-} SRCURL="https://ftp.osuosl.org/pub/blfs/conglomeration/graphviz/graphviz-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" @@ -38,26 +38,13 @@ getsource_fn untar_fn -listdocs_fn - -chown_fn - -#cd_builddir_fn - -# set file permissions -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - # Install PHP bindings to proper location. sed -i 's|/php/modules|/php/extensions|' configure # Fix for php-5.4 and patches from Arch (thanks!) echo $'--- plugin/gs/gvloadimage_gs.c +++ plugin/gs/gvloadimage_gs.c -@@ -72,11 +72,11 @@ +@@ -83,11 +83,11 @@ assert (err < 0); @@ -83,12 +70,18 @@ do patch -p0 done +listdocs_fn + +chown_fn + +cd_builddir_fn + CFLAGS=$SLKCFLAGS \ CXXFLAGS=$SLKCFLAGS \ LDFLAGS=$SLKLDFLAGS \ CC=$COMPILER \ CXX=$COMPILER_CXX \ -./configure \ +../configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ --mandir=/usr/man \ @@ -118,9 +111,6 @@ cat << EOF > $PKG/etc/php.d/graphviz.ini.new ; ?> EOF -# gzip man pages -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done # Remove empty directories of language bindings that are absent. find $PKG/usr/lib$LIBDIRSUFFIX/graphviz -depth -type d -empty -exec rmdir {} \; @@ -136,10 +126,34 @@ echo '# Dummy content.' > $PKG/usr/lib$LIBDIRSUFFIX/graphviz/config6 installdocs_fn +INSTALL_TDE=/usr +mangzip_fn + strip_fn mkdir_install_fn +cat << EOF > $PKG/install/doinst.sh +config() { + NEW="\$1" + OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r \$OLD ]; then + mv \$NEW \$OLD + elif [ "\$(cat \$OLD|md5sum)" = "\$(cat \$NEW|md5sum)" ]; then + # toss the redundant copy + rm \$NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/php.d/graphviz.ini.new + +# Configure plugins +# (writes /usr/lib*/graphviz/config6 with available plugin information) +chroot . /usr/bin/dot -c +EOF + echo " # HOW TO EDIT THIS FILE: # The 'handy ruler' below makes it easier to edit a package description. Line @@ -162,25 +176,4 @@ $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc -cat << EOF > $PKG/install/doinst.sh -config() { - NEW="\$1" - OLD="\$(dirname \$NEW)/\$(basename \$NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r \$OLD ]; then - mv \$NEW \$OLD - elif [ "\$(cat \$OLD|md5sum)" = "\$(cat \$NEW|md5sum)" ]; then - # toss the redundant copy - rm \$NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/php.d/graphviz.ini.new - -# Configure plugins -# (writes /usr/lib*/graphviz/config6 with available plugin information) -chroot . /usr/bin/dot -c -EOF - makepkg_fn diff --git a/Misc/imlib/imlib.SlackBuild b/Misc/imlib/imlib.SlackBuild index c647d27..a157c45 100644 --- a/Misc/imlib/imlib.SlackBuild +++ b/Misc/imlib/imlib.SlackBuild @@ -489,14 +489,12 @@ do patch -p0 done - listdocs_fn chown_fn cd_builddir_fn - CFLAGS=$SLKCFLAGS \ CC=$COMPILER \ CXX=$COMPILER_CXX \ @@ -509,6 +507,7 @@ make_fn installdocs_fn +INSTALL_TDE=/usr mangzip_fn strip_fn diff --git a/Misc/inkscape/inkscape.SlackBuild b/Misc/inkscape/inkscape.SlackBuild index d3288f5..650491c 100755 --- a/Misc/inkscape/inkscape.SlackBuild +++ b/Misc/inkscape/inkscape.SlackBuild @@ -50,6 +50,10 @@ sed -i 's|lib/inkscape|lib${LIB_SUFFIX}/inkscape|' CMakeScripts/HelperMacros.cma ## only build for required locales { +## set up a directory to store the required locale files temporarily +TEMP_DIR=$TMP_BUILD/tmp-$PRGNAM/loc_tmp +mkdir $TEMP_DIR + ## .. for po/LINGUAS LOCALES=$(cat po/LINGUAS) rm po/LINGUAS @@ -58,10 +62,14 @@ for locale in $I18N [[ $LOCALES == *$locale* ]] && \ echo $locale >> po/LINGUAS done - -## set up a directory to store the required locale files temporarily -TEMP_DIR=$TMP_BUILD/tmp-$PRGNAM/loc_tmp -mkdir $TEMP_DIR +## .. for translations +locas="" ## for slack-desc +for locale in $I18N + do + mv po/$locale.po $TEMP_DIR && locas="$locas $locale" + done +rm -rf po/*.po +mv $TEMP_DIR/* po/ ## .. for READMEs for locale in $I18N @@ -81,14 +89,6 @@ rm doc/keys.*.html mv $TEMP_DIR/* doc/ KEYS_LIST=$(ls -1 doc/keys.*) -## .. for translations -for locale in $I18N - do - mv po/$locale.po $TEMP_DIR - done -rm -rf po/*.po -mv $TEMP_DIR/* po/ - ## .. for tutorials for locale in $I18N do @@ -106,11 +106,10 @@ rm share/templates/*.*.* mv $TEMP_DIR/* share/templates/ } || true +listdocs_fn chown_fn -listdocs_fn - cd_builddir_fn ## default options have been pulled from CMakeLists.txt @@ -146,30 +145,29 @@ cmake \ make_fn +installdocs_fn + ## only package man pages for required locales +mkdir -p $PKG/usr/man/man1/ +mv $PKG/usr/local/share/man/man1/* $PKG/usr/man/man1/ +rm -rf $PKG/usr/local/share/man { for locale in $I18N do - mv $PKG/usr/local/share/man/man1/inkscape.$locale.1 $TEMP_DIR + [[ -s $PKG/usr/man/man1/inkscape.$locale.1 ]] && mv $PKG/usr/man/man1/inkscape.$locale.1 $TEMP_DIR done -rm $PKG/usr/local/share/man/man1/inkscape.*.1 -mv $TEMP_DIR/* $PKG/usr/local/share/man/man1/ +rm $PKG/usr/man/man1/inkscape.*.1 +mv $TEMP_DIR/* $PKG/usr/man/man1/ +rm -rf $TEMP_DIR } || true - -installdocs_fn - -#mangzip_fn +INSTALL_TDE=/usr +mangzip_fn strip_fn mkdir_install_fn -echo " -# Update the desktop database: -/usr/bin/update-desktop-database usr/local/share/applications - -# Update hicolor theme cache: -/usr/bin/gtk-update-icon-cache -f -t usr/local/share/icons/hicolor -" >> $PKG/install/doinst.sh +INSTALL_TDE=/usr/local +doinst_sh_fn echo " # HOW TO EDIT THIS FILE: @@ -186,9 +184,9 @@ $PRGNAM: similar to Illustrator, Freehand, CorelDraw, or Xara X using the W3C $PRGNAM: standard Scalable Vector Graphics (SVG) file format. $PRGNAM: $PRGNAM: With language support for: -$PRGNAM: en $(echo $(cat ../po/LINGUAS)) +$PRGNAM: en$locas +$PRGNAM: $PRGNAM: -$PRGNAM: Homepage: http://www.inkscape.org/ $PRGNAM: $PRGNAM: " > $PKG/install/slack-desc diff --git a/Misc/libpng/libpng.SlackBuild b/Misc/libpng/libpng.SlackBuild index df9d329..aaaaf30 100755 --- a/Misc/libpng/libpng.SlackBuild +++ b/Misc/libpng/libpng.SlackBuild @@ -44,7 +44,6 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=/usr \ - --sysconfdir=/etc \ --libdir=/usr/lib$LIBDIRSUFFIX \ --includedir=/usr/include \ --mandir=/usr/man \ @@ -54,6 +53,7 @@ make_fn installdocs_fn +INSTALL_TDE=/usr mangzip_fn strip_fn diff --git a/Misc/lxml/lxml.SlackBuild b/Misc/lxml/lxml.SlackBuild index cc4fcc4..abd7d75 100755 --- a/Misc/lxml/lxml.SlackBuild +++ b/Misc/lxml/lxml.SlackBuild @@ -44,7 +44,8 @@ listdocs_fn chown_fn -#cd_builddir_fn +#cd_builddir_fn - don't use + CC=$COMPILER \ python setup.py install --with-unicode-strings --root=$PKG || exit 1 @@ -56,8 +57,6 @@ fi installdocs_fn -mangzip_fn - strip_fn mkdir_install_fn diff --git a/Misc/moodbar/moodbar.SlackBuild b/Misc/moodbar/moodbar.SlackBuild index 7856d96..2ec998a 100755 --- a/Misc/moodbar/moodbar.SlackBuild +++ b/Misc/moodbar/moodbar.SlackBuild @@ -50,15 +50,12 @@ CXX=$COMPILER_CXX \ ../configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ - --mandir=/usr/man \ --disable-static make_fn installdocs_fn -mangzip_fn - strip_fn mkdir_install_fn diff --git a/Misc/libmp4v2/libmp4v2.SlackBuild b/Misc/mp4v2/mp4v2.SlackBuild old mode 100755 new mode 100644 similarity index 93% rename from Misc/libmp4v2/libmp4v2.SlackBuild rename to Misc/mp4v2/mp4v2.SlackBuild index 3f6488e..9b94afe --- a/Misc/libmp4v2/libmp4v2.SlackBuild +++ b/Misc/mp4v2/mp4v2.SlackBuild @@ -24,7 +24,6 @@ # SUCH DAMAGE. PRGNAM=mp4v2 -PKGNAM=lib$PRGNAM VERSION=${VERSION:-2.0.0} BUILD=${BUILD:-1} TAG=${TAG:-} @@ -37,13 +36,13 @@ getsource_fn untar_fn +## patch for gcc7 ../src/rtphint.cpp:342:35: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] +sed -i "s|(pSlash != '|(*pSlash != '|" src/rtphint.cpp + listdocs_fn chown_fn -## patch for gcc7 ../src/rtphint.cpp:342:35: error: ISO C++ forbids comparison between pointer and integer [-fpermissive] -sed -i "s|pSlash != '|*pSlash != '|" src/rtphint.cpp - cd_builddir_fn LDFLAGS=$SLKLDFLAGS \ @@ -61,13 +60,15 @@ make_fn installdocs_fn +## can't work out why man pages aren't being installed, so use this work-around +cp ../doc/man/man1/* $PKG/usr/man/man1/ +INSTALL_TDE=/usr mangzip_fn 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 @@ -85,7 +86,7 @@ $PRGNAM: used as a multimedia file format in a variety of platforms and $PRGNAM: applications. It is a very powerful and extensible format that can $PRGNAM: accommodate practically any type of media. $PRGNAM: -$PRGNAM: Home: http://code.google.com/p/mp4v2/ +$PRGNAM: $PRGNAM: " > $PKG/install/slack-desc diff --git a/Misc/potrace/potrace.SlackBuild b/Misc/potrace/potrace.SlackBuild index 39beefe..9bc7933 100755 --- a/Misc/potrace/potrace.SlackBuild +++ b/Misc/potrace/potrace.SlackBuild @@ -28,7 +28,7 @@ VERSION=${VERSION:-1.16} BUILD=${BUILD:-1} TAG=${TAG:-} -SRCURL="https://sourceforge.net/projects/potrace/files/$VERSION/potrace-$VERSION.tar.gz/download" +SRCURL="https://downloads.sourceforge.net/project/potrace/$VERSION/potrace-$VERSION.tar.gz" ARCHIVE_TYPE="tar.gz" source ../../get-source.sh @@ -51,12 +51,13 @@ CXX=$COMPILER_CXX \ --prefix=/usr/local \ --libdir=/usr/lib$LIBDIRSUFFIX \ --with-libpotrace \ - --mandir=/usr/man \ - + --mandir=/usr/man + make_fn installdocs_fn +INSTALL_TDE=/usr mangzip_fn strip_fn diff --git a/Misc/speex/speex.SlackBuild b/Misc/speex/speex.SlackBuild index 26cecde..d9f02a7 100755 --- a/Misc/speex/speex.SlackBuild +++ b/Misc/speex/speex.SlackBuild @@ -67,6 +67,7 @@ make_fn installdocs_fn +INSTALL_TDE=/usr mangzip_fn # Fix libspeex.la Thanks SBo script: diff --git a/Misc/tidy-html5/tidy-html5.SlackBuild b/Misc/tidy-html5/tidy-html5.SlackBuild index 034be6a..4d3c752 100755 --- a/Misc/tidy-html5/tidy-html5.SlackBuild +++ b/Misc/tidy-html5/tidy-html5.SlackBuild @@ -24,37 +24,21 @@ # SUCH DAMAGE. PRGNAM=tidy-html5 -# VERSION is entered in this way to work around setting version= in BUILD-TDE.sh -VERSION=master -VERSION=${VERSION:-*} +VERSION=${VERSION:-5.6.0} BUILD=${BUILD:-1} TAG=${TAG:-} -# override download option in get-source.sh because there is no version # in the file name -[[ ! -s ../../src/$PRGNAM-$VERSION.zip ]] && { -wget -nv -T 20 -O ../../src/$PRGNAM-$VERSION.zip https://github.com/htacg/$PRGNAM/archive/$VERSION.zip || { -echo -e "\033[39;1m" -echo " $PRGNAM-$VERSION.zip isn't in 'src' and hasn't been downloaded " -echo -e "\033[0m" -exit -} -} -ARCHIVE_TYPE="zip" +SRCURL="https://github.com/htacg/tidy-html5/archive/$VERSION.tar.gz" +ARCHIVE_TYPE="tar.gz" source ../../get-source.sh getsource_fn -cd $TMP_BUILD/tmp-$PRGNAM -unzip $SOURCE - -cd $PRGNAM-$VERSION -VERSION=$(head -n 1 version.txt) +untar_fn -listdocs_fn - -# Include tidy support only for additional languages set by I18N -## Set SUPPORT_LOCALIZATIONS default option to OFF -sed -i 's|languages." ON|languages." OFF|' CMakeLists.txt +# Include localization only for additional languages set by I18N +## Set SUPPORT_LOCALIZATIONS default option to OFF in cmake +## and set localization(s) in src/language.c I18N=$(echo $I18N | tr '[:upper:]' '[:lower:]') for lang in $I18N do @@ -65,25 +49,33 @@ sed -i "s| \&language_en,|& \&language_$lang,|" src/language.c } done -cd build/cmake - -cmake ../.. \ --DCMAKE_C_COMPILER=$COMPILER \ --DCMAKE_CXX_COMPILER=$COMPILER_CXX \ --DCMAKE_BUILD_TYPE=Release \ --DCMAKE_INSTALL_PREFIX=/usr/local \ --DLIB_SUFFIX=$LIBDIRSUFFIX \ --DBUILD_SHARED_LIB="ON" \ --DTIDY_CONSOLE_SHARED="ON" \ --DBUILD_TAB2SPACE="ON" \ --DBUILD_SAMPLE_CODE="OFF" +## listdocs_fn - don't use +DOCDIR=$PWD +DOCS=$(ls README.md localize/README.md README/*) chown_fn +cd build + +cmake \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr/local \ + -DMAN_INSTALL_DIR=/usr/man \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DBUILD_SHARED_LIB="ON" \ + -DTIDY_CONSOLE_SHARED="ON" \ + -DBUILD_TAB2SPACE="ON" \ + -DBUILD_SAMPLE_CODE="OFF" \ + -DSUPPORT_LOCALIZATIONS="OFF" \ + .. + make_fn installdocs_fn +INSTALL_TDE=/usr mangzip_fn strip_fn @@ -105,7 +97,7 @@ $PRGNAM: $PRGNAM: For languages: $PRGNAM: en ${langs:-} $PRGNAM: -$PRGNAM: http://www.html-tidy.org +$PRGNAM: https://github.com/htacg $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Misc/xmedcon/xmedcon.SlackBuild b/Misc/xmedcon/xmedcon.SlackBuild index c0e06eb..1119522 100755 --- a/Misc/xmedcon/xmedcon.SlackBuild +++ b/Misc/xmedcon/xmedcon.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=xmedcon VERSION=${VERSION:-0.16.2} BUILD=${BUILD:-1} -TAG=${TAG:-_tde} +TAG=${TAG:-} SRCURL="https://downloads.sourceforge.net/project/xmedcon/XMedCon-Source/$VERSION/xmedcon-$VERSION.tar.bz2" ARCHIVE_TYPE="tar.bz2" @@ -41,7 +41,7 @@ listdocs_fn chown_fn -#cd_builddir_fn +#cd_builddir_fn - don't use CFLAGS=$SLKCFLAGS \ CXXFLAGS=$SLKCFLAGS \ @@ -60,6 +60,7 @@ make_fn installdocs_fn +INSTALL_TDE=/usr mangzip_fn strip_fn @@ -83,6 +84,8 @@ Exec=xmedcon Icon=xmedcon.png Categories=Graphics;Utility;" > $PKG/usr/share/applications/xmedcon.desktop +INSTALL_TDE=/usr +doinst_sh_fn echo $'config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -96,25 +99,8 @@ echo $'config() { # Otherwise, we leave the .new copy for the admin to consider... } -preserve_perms() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - if [ -e $OLD ]; then - cp -a $OLD ${NEW}.incoming - cat $NEW > ${NEW}.incoming - mv ${NEW}.incoming $NEW - fi - config $NEW -} - config etc/xmedconrc.new - -# Update the desktop database: -/usr/bin/update-desktop-database usr/share/applications - -# Update the mime database: -/usr/bin/update-mime-database usr/share/mime -' > $PKG/install/doinst.sh +' >> $PKG/install/doinst.sh echo " # HOW TO EDIT THIS FILE: diff --git a/Misc/yauap/yauap.SlackBuild b/Misc/yauap/yauap.SlackBuild index b9bf954..cae4380 100755 --- a/Misc/yauap/yauap.SlackBuild +++ b/Misc/yauap/yauap.SlackBuild @@ -57,8 +57,6 @@ make DESTDIR=$PKG install || exit 1 installdocs_fn -mangzip_fn - strip_fn mkdir_install_fn diff --git a/README.md b/README.md index 0ce3191..45d1e42 100644 --- a/README.md +++ b/README.md @@ -16,9 +16,10 @@ Run **INST=0 ./BUILD-TDE.sh** to build only. Any package, or set of packages, can be selected in the 'TDE Packages Selection' screen. The TDE mandatory packages can be pre-selected. -Notes at the bottom of the dialog screen have been added for information about dependencies for some packages. +Information about dependencies for some packages has been added at the bottom of the dialog screen. -Source archives can be stored locally pre-build, or will be downloaded during the build from a geoIP located mirror site. Development [cgit] sources are downloaded, with the option to update, during the build. +R14.0.7 source archives will be downloaded from a geoIP located mirror site, or the development sources [R14.1.0] cloned or updated from cgit. +Downloading can be done pre-build [useful for an off-line build], or during the build. The directory structure for the SlackBuild scripts is in line with the Trinity release source repositories: ``` diff --git a/get-source.sh b/get-source.sh index e4edc27..5360f0d 100755 --- a/get-source.sh +++ b/get-source.sh @@ -53,7 +53,7 @@ PKG=$TMP_BUILD/package-$PRGNAM OUTPUT=/tmp # remove any previous builds if option chosen -[[ $KEEP_BUILD != "yes" ]] && echo -e "\n removing previous build data ..\n" && rm -rf $TMP_BUILD/{tmp,package}* +[[ $KEEP_BUILD != "yes" ]] && [[ $PRE_DOWNLOAD != 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 @@ -85,8 +85,7 @@ done ) ## if [r]14.0.? or misc, download archive: -[[ $TDEVERSION == *14.0.? || $TDEMIR_SUBDIR == misc ]] && \ -{ +[[ $TDEVERSION == *14.0.? || $TDEMIR_SUBDIR == misc ]] && { ## check for and remove any zero byte archive files [[ ! -s $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \ rm $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true @@ -102,13 +101,14 @@ SOURCE=$SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} # SRCURL for non-TDE archives, set in the SB, will override the Trinity default *tar.xz URL SRCURL=${SRCURL:-"https://$TDE_MIRROR/releases/R$VERSION/main$TDEMIR_SUBDIR/$PRGNAM-trinity-$VERSION.tar.xz"} # Source file availability: +[[ -f $SOURCE ]] && [[ $PRE_DOWNLOAD == yes ]] && echo " $(basename $SOURCE) already downloaded ..." + if ! [ -f $SOURCE ]; then echo "Source '$(basename $SOURCE)' not available yet..." # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" - if [ -f $SOURCE ]; then echo "Ah, found it!"; continue; fi if ! [ "x$SRCURL" == "x" ]; then - echo "Will download file to $(dirname $SOURCE)" + echo -e "\nDownloading to $(dirname $SOURCE)" wget -T 20 -O "$SOURCE" "$SRCURL" if [ $? -ne 0 -o ! -s "$SOURCE" ]; then echo "Downloading '$(basename $SOURCE)' failed... aborting the build." @@ -122,6 +122,7 @@ if ! [ -f $SOURCE ]; then ${EXIT_FAIL:-":"} fi fi + if [ "$P1" == "--download" ]; then echo "Download complete." exit 0 @@ -129,7 +130,8 @@ fi } || \ { ## if not creating/updating git, nothing to do in this function for git builds -## otherwise, now not R14.0.? or misc, and we are creating/updating git, so [1] start with admin/cmake: +## otherwise, now not R14.0.? or misc, and we are creating/updating git, +## so [1] start with admin/cmake: [[ $(cat $TMPVARS/CGIT) == yes ]] && { cd $BUILD_TDE_ROOT/src/cgit @@ -154,9 +156,10 @@ git pull) touch $TMPVARS/admin-cmake-done } -## if not tde-i18n, [2] update or clone PRGNAM -[[ $PRGNAM != tde-i18n ]] && { +## if not tde-i18n +## [2] update or clone PRGNAM +[[ $PRGNAM != tde-i18n ]] && { ## get latest commits if the local repository for PRGNAM exists [[ -d $PRGNAM ]] && \ (echo "Updating $PRGNAM ..." @@ -194,7 +197,8 @@ 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: +## still creating/updating git +## so [3] for tde-i18n-$lang: ## Use wget to download the required i18n repos to avoid the ~1x10^6 byte download for the full tde-i18n ## - same for both creating and updating @@ -227,6 +231,8 @@ P1=${1:-1} # Save old umask and set to 0022: _UMASK_=$(umask) umask 0022 + +[[ $PRE_DOWNLOAD == yes ]] && exit || true # need true to override exit 1 if 'PRE_DOWNLOAD != yes' } untar_fn () @@ -279,7 +285,6 @@ cd $PRGNAM* } } - listdocs_fn () { DOCDIR=$PWD # this is set for installdocs_fn @@ -318,17 +323,18 @@ installdocs_fn () [[ $TDEMIR_SUBDIR == misc || $PRGNAM == libart-lgpl ]] && INSTALL_TDE=/usr mkdir -p $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION (cd ${DOCDIR:-};cp -a --parents ${DOCS:-} $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION) || true # DOCDIR might not exist -cat $SRCDIR/$(basename $0) > $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +## leave this commented out in case anybody wants to reinstate it +#cat $SRCDIR/$(basename $0) > $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown -R root:root $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION find $PKG$INSTALL_TDE/doc -type f -exec chmod 644 {} \; } mangzip_fn () { -if [ -d $PKG/usr/man ]; then - find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -fi +[[ -d $PKG$INSTALL_TDE/man ]] && { + find $PKG$INSTALL_TDE/man -type f -name "*.?" -exec gzip -9f {} \; + for i in $(find $PKG$INSTALL_TDE/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +} } strip_fn ()