diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild old mode 100644 new mode 100755 index 571d53d..2b33ad4 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -40,6 +40,9 @@ 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 +## set installation directory for abakus.desktop file +sed -i 's|DESTINATION ${APPS_INSTALL_DIR}/Utilities|DESTINATION ${XDG_APPS_INSTALL_DIR}|' src/CMakeLists.txt + # 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 diff --git a/Apps/amarok/amarok.SlackBuild b/Apps/amarok/amarok.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/filelight/filelight.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/gwenview-i18n/gwenview-i18n.SlackBuild b/Apps/gwenview-i18n/gwenview-i18n.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/gwenview/gwenview.SlackBuild b/Apps/gwenview/gwenview.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/k3b-i18n/k3b-i18n.SlackBuild b/Apps/k3b-i18n/k3b-i18n.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/k3b/k3b.SlackBuild b/Apps/k3b/k3b.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/kkbswitch/kkbswitch.SlackBuild b/Apps/kkbswitch/kkbswitch.SlackBuild old mode 100644 new mode 100755 index 164d62f..cc54461 --- a/Apps/kkbswitch/kkbswitch.SlackBuild +++ b/Apps/kkbswitch/kkbswitch.SlackBuild @@ -33,6 +33,12 @@ getsource_fn untar_fn +## set installation directory for kkbswitch.desktop file +sed -i 's|DESTINATION ${APPS_INSTALL_DIR}/Utilities|DESTINATION ${XDG_APPS_INSTALL_DIR}|' kkbswitch/CMakeLists.txt + +## edit man page +sed -i "s|/usr/share/doc/.*/HTML/en/kkbswitch/|$INSTALL_TDE/share/doc/tde/HTML/en/kkbswitch/|" doc/man/kkbswitch.1 + # set support for additional language(s) as per I18N variable # but only for languages available with this package langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang.po";done diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/ktorrent/ktorrent.SlackBuild b/Apps/ktorrent/ktorrent.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index 0a74297..8fbac89 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -33,6 +33,9 @@ getsource_fn untar_fn +## set installation directory for kvkbd.desktop file +[[ $TDEVERSION == 14.0.7 ]] && sed -i 's|DESTINATION ${APPS_INSTALL_DIR}/Utilities|DESTINATION ${XDG_APPS_INSTALL_DIR}|' src/CMakeLists.txt + listdocs_fn chown_fn @@ -45,6 +48,9 @@ cmake \ -DCMAKE_C_COMPILER=$COMPILER \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ .. make_fn diff --git a/Apps/rosegarden/rosegarden.SlackBuild b/Apps/rosegarden/rosegarden.SlackBuild old mode 100644 new mode 100755 diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild old mode 100644 new mode 100755 diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index f97f368..168080b 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -354,8 +354,10 @@ This means that TDE libs will be at the end of the search path. If the package c If you experience any problems of this nature, then try the \Z1P\Zb\Z0repend\Zn option, which will set up doinst.sh for tqt3 to add the TDE libs paths to the beginning of the search path. Then \Zb\Z2rebuild tqt3\Zn. This build option only applies to that package. +OR + Edit /etc/ld.so.conf .. " \ - 20 75 + 22 75 done @@ -377,7 +379,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Deps/dbus-1-tqt" "\Zb\Zr\Z4R\Zn D-Bus bindings" ${SELECT:-off} "\Zb\Z6 \Zn" \ "Deps/libart-lgpl" "\Zb\Zr\Z4R\Zn The LGPL'd component of libart" ${SELECT:-off} "\Zb\Z6 \Zn" \ "Deps/tqca-tls" "\Zb\Zr\Z4R\Zn Plugin to provide SSL/TLS capability" ${SELECT:-off} "\Zb\Z6 \Zn" \ -"Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Requires Avahi. Optional for tdelibs and used by default if installed. \Zn" \ +"Deps/avahi-tqt" "Avahi support" off "\Zb\Z6 Optional for tdelibs and used if installed. Requires Avahi. \Zn" \ "Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" ${SELECT:-off} "\Zb\Z6 Will build with Avahi support if avahi/avahi-tqt are installed. \Zn" \ "Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" ${SELECT:-off} "\Zb\Z6 \Zn" \ "Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when any \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ @@ -591,7 +593,7 @@ done [[ $(cat $TMPVARS/READMEs) ]] && { dialog --cr-wrap --defaultno --no-shadow --colors --title " READMEs " --yesno \ " -A number of selected packages have READMEs in their SlackBuilds directories. +Some of the selected packages have READMEs in their SlackBuilds directories. Do you want to read them? " \ diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild old mode 100644 new mode 100755 index f99c40b..e1b2112 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -94,6 +94,7 @@ cmake \ -DWITH_ASPELL="OFF" \ -DWITH_AVAHI=${AVAHI:-"OFF"} \ -DWITH_CONSOLEKIT="OFF" \ + -DWITH_CRYPTSETUP="ON" \ -DWITH_CUPS="ON" \ -DWITH_DEVKITPOWER="ON" \ -DWITH_ELFICON="OFF" \ @@ -115,12 +116,15 @@ cmake \ -DWITH_OLD_XDG_STD="OFF" \ -DWITH_OPENEXR="ON" \ -DWITH_PCRE="ON" \ + -DWITH_PCSC="OFF" \ + -DWITH_PKCS="OFF" \ -DWITH_SSL="ON" \ -DWITH_SUDO_TDESU_BACKEND="ON" \ -DWITH_TDEHWLIB="ON" \ -DWITH_TDEHWLIB_DAEMONS="ON" \ -DWITH_TDEICONLOADER_DEBUG="OFF" \ - -DWITH_TIFF="OFF" \ + -DWITH_TIFF="ON" \ + -DWITH_UDEVIL="ON" \ -DWITH_UDISKS2="ON" \ -DWITH_UDISKS="ON" \ -DWITH_UPOWER="OFF" \ diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index 97fd5ba..6d8340d 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -55,8 +55,10 @@ cmake \ -DWITH_JINGLE="ON" \ -DWITH_SPEEX=${SPX:-"OFF"} \ -DWITH_GSM="OFF" \ + -DWITH_LIBXSLT="OFF" \ -DWITH_XMMS="OFF" \ -DWITH_SLP="OFF" \ + -DWITH_WEBCAM="OFF" \ -DBUILD_DCOPRSS="ON" \ -DBUILD_DOC="ON" \ -DBUILD_FILESHARING="ON" \ diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index 730ac81..1dda784 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -33,6 +33,9 @@ getsource_fn untar_fn +## set installation directory for superkaramba.desktop file +sed -i 's|DESTINATION ${APPS_INSTALL_DIR}/Utilities|DESTINATION ${XDG_APPS_INSTALL_DIR}|' superkaramba/src/CMakeLists.txt + listdocs_fn chown_fn @@ -97,7 +100,7 @@ mkdir_install_fn doinst_sh_fn -[[ $TDEVERSION == cgit ]] && TDEFileReplace="* TDEFileReplace: powerful search and replace in multiple files" +[[ $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 @@ -127,7 +130,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:-} +$PRGNAM:${TDEFileReplace:-} " > $PKG/install/slack-desc makepkg_fn diff --git a/Deps/akode/akode.SlackBuild b/Deps/akode/akode.SlackBuild old mode 100644 new mode 100755 diff --git a/Deps/libart-lgpl/libart-lgpl.SlackBuild b/Deps/libart-lgpl/libart-lgpl.SlackBuild old mode 100644 new mode 100755 diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild index 2e5fdbd..d6a2877 100755 --- a/Deps/libcaldav/libcaldav.SlackBuild +++ b/Deps/libcaldav/libcaldav.SlackBuild @@ -37,18 +37,21 @@ listdocs_fn chown_fn -#cd_builddir_fn - don't use +cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -./autogen.sh \ - --prefix=$INSTALL_TDE \ - --libdir=$INSTALL_TDE/lib$LIBDIRSUFFIX \ - --disable-rpath \ - --enable-closure +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DBUILD_DOC="ON" \ + -DBUILD_CALDAV_TEST="OFF" \ + -DBUILD_UNITTEST="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ + .. make_fn diff --git a/Deps/libcarddav/libcarddav.SlackBuild b/Deps/libcarddav/libcarddav.SlackBuild index 4b50a6b..901d9e1 100755 --- a/Deps/libcarddav/libcarddav.SlackBuild +++ b/Deps/libcarddav/libcarddav.SlackBuild @@ -37,18 +37,19 @@ listdocs_fn chown_fn -#cd_builddir_fn - don't use +cd_builddir_fn -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -./autogen.sh \ - --prefix=$INSTALL_TDE \ - --libdir=$INSTALL_TDE/lib$LIBDIRSUFFIX \ - --disable-rpath \ - --enable-closure +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DBUILD_DOC="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ + .. make_fn diff --git a/Libs/libkdcraw/libkdcraw.SlackBuild b/Libs/libkdcraw/libkdcraw.SlackBuild old mode 100644 new mode 100755 diff --git a/Libs/libkexiv2/libkexiv2.SlackBuild b/Libs/libkexiv2/libkexiv2.SlackBuild old mode 100644 new mode 100755 diff --git a/Libs/libkipi/libkipi.SlackBuild b/Libs/libkipi/libkipi.SlackBuild old mode 100644 new mode 100755 diff --git a/README.md b/README.md index 45d1e42..7cf97cc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ --- ***Build TDE [Trinity Desktop Environment]*** for Slackware 14.2 or current on i586+ and x86_64. -Native building for Raspberry Pi3 [see [README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)] is now rather dated and cross compiling is preferred - see 'Cross compiling for RPi3' for armv7/aarch64 builds. +See 'Cross compiling for RPi3' for armv7/aarch64 builds. Native building for Raspberry Pi3 [[README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)] is now rather dated and cross compiling is preferred. Build the release version R14.0.7 from tar archives; or the development version R14.1.0 from trinitydesktop cgit. For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series of screens for user input. @@ -21,7 +21,11 @@ Information about dependencies for some packages has been added at the bottom of 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: +If you're curious about what this might involve, [take a look at a sample build set up](https://ray-v.github.io/A_typical_TDE_SlackBuild.html). + +--- + +***The directory structure*** for the SlackBuild scripts is in line with the Trinity release source repositories: ``` Deps [dependencies/] Core [] @@ -31,16 +35,18 @@ Apps [applications/] Other directories are: ``` Misc - for non-Trinity package builds -src - to hold all the source tarballs, either pre-downloaded or downloaded during the build. +src - to hold all the sources, either pre-downloaded or downloaded during the build. ``` Other scripts: ``` -get-source.sh - a chunk of common code for the SlackBuilds - used for getting the source archive, - setting FLAGS, creating build directories. +get-source.sh - a chunk of common code for the SlackBuilds + - used for getting the sources, setting FLAGS, creating build directories, ... ``` There is an override in the Misc SlackBuilds for non-trinity source archive URLs. Non-trinity builds have been included where a TDE package requires a dependency that is not in Slackware, or where it's an alternative to a TDE package. -Required packages for a basic working TDE are: +--- + +***Required packages*** for a basic working TDE are: ``` Deps/tqt3 Deps/tqtinterface @@ -52,7 +58,11 @@ Deps/libart-lgpl Core/tdelibs Core/tdebase ``` -i18n support [locale and html/help docs] in the packages is restricted to whatever is selected in the BUILD-TDE.sh 'Select Additional Languages' screen and, of that, to whatever is available in any individual package source. +--- + +***Internationalization*** + +i18n support [locale and html/help docs] in the packages is restricted to whatever is selected in the ./BUILD-TDE.sh 'Select Additional Languages' screen and, of that, to whatever is available in any individual package source. There is an option in tde-i18n.SlackBuild to include a user created 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. @@ -82,12 +92,13 @@ git checkout gh-pages or @ https://ray-v.github.io/tde-slackbuilds/cross-compiling-TDE-for-the-RPi3.html Includes: -* Setting parameters for a 32-bit [armv7 hard float], or 64-bit [aarch64], build -* Building a cross compiler toolchain -* Building a 64-bit kernel which can be used for the 32-bit system -* Building qemu to run the TDE binaries built and used during compilation -* The required TDE apps -* ... and a few other TDE and non-TDE apps to provide a basic, but useful, TDE desktop. +* Setting parameters for a 32-bit [armv7 hard float], or 64-bit [aarch64], build, + and building .. +* a cross compiler toolchain +* a 64-bit kernel which can be used for the 32-bit system +* qemu to run the TDE binaries built and used during compilation +* the required TDE apps +* a few other TDE and non-TDE apps to provide a basic, but useful, TDE desktop. --- @@ -97,10 +108,10 @@ See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more infor ***Known issues*** -[1] TDM may need some manual setting up - see Core/tdebase/README, which can also be viewed while running BUILD-TDE.sh if tdebase is selected. +[1] TDM may need some manual setting up - see Core/tdebase/README, which can also be viewed while running ./BUILD-TDE.sh if tdebase is selected. [2] The i18n downloads with wget can't be updated because cgit produces 'current time' timestamps. The consequence is that if tde-i18n-$lang is a part of the build after its initial download, it will be downloaded again. As updates are infrequent, once built, there will probably be no need to do so again and so tde-i18n for a particular language will probably only be run once. On that basis I don't see this being a significant issue. -[3] If Slackware's KDE is installed as well as TDE, there might be an issue with TDE launching the KDE4 Konsole and attempting to use it's ark. To fix, adjust the PATH so that the TDE directories come before /usr/share/bin. +[3] If Slackware's KDE is installed as well as TDE, there might be an issue with TDE launching the KDE4 Konsole and attempting to use it's ark. To fix, adjust the PATH so that the TDE directories come before /usr/bin. [4] The Misc directory contains SlackBuilds for software that might already be installed from other sources. Please check because any misc builds selected here could overwrite them. diff --git a/get-source.sh b/get-source.sh index 5360f0d..70b1c38 100755 --- a/get-source.sh +++ b/get-source.sh @@ -54,13 +54,15 @@ OUTPUT=/tmp # remove any previous builds if option chosen [[ $KEEP_BUILD != "yes" ]] && [[ $PRE_DOWNLOAD != yes ]] && echo -e "\n removing previous build data ..\n" && rm -rf $TMP_BUILD/{tmp,package}* -# Create working directories: +# Only create working directories if building packages: +[[ $PRE_DOWNLOAD != yes ]] && { mkdir -p $OUTPUT mkdir -p $TMP_BUILD/tmp-$PRGNAM mkdir -p $PKG rm -rf $PKG/* rm -rf $TMP_BUILD/tmp-$PRGNAM/* rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log +} # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd)