From c18d07c7f04861ea5fd5a3d3424ab3b6012af609 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Fri, 27 Dec 2019 17:52:23 +0000 Subject: [PATCH] Updated for release 14.0.7 modified: Apps/kbookreader/kbookreader.SlackBuild modified: Apps/kdbusnotification/kdbusnotification.SlackBuild modified: Apps/kile/kile.SlackBuild modified: Apps/knemo/knemo.SlackBuild modified: Apps/tdeamarok/tdeamarok.SlackBuild modified: Apps/tdektorrent/tdektorrent.SlackBuild modified: Apps/yakuake/yakuake.SlackBuild modified: BUILD-TDE.sh modified: Core/tdeadmin/tdeadmin.SlackBuild new file: Core/tdeedu/README modified: Core/tdeedu/tdeedu.SlackBuild modified: Core/tdelibs/tdelibs.SlackBuild new file: Core/tdemultimedia/README modified: Core/tdemultimedia/tdemultimedia.SlackBuild modified: Core/tdenetwork/tdenetwork.SlackBuild new file: Deps/akode/README new file: Deps/akode/akode.SlackBuild modified: Deps/avahi-tqt/avahi-tqt.SlackBuild modified: Deps/dbus-tqt/dbus-tqt.SlackBuild modified: Deps/libart-lgpl/libart-lgpl.SlackBuild modified: Deps/tqca-tls/tqca-tls.SlackBuild modified: Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild modified: Libs/tdelibkipi/tdelibkipi.SlackBuild modified: README.md modified: get-source.sh --- Apps/kbookreader/kbookreader.SlackBuild | 22 +-- .../kdbusnotification.SlackBuild | 16 --- Apps/kile/kile.SlackBuild | 14 -- Apps/knemo/knemo.SlackBuild | 32 +---- Apps/tdeamarok/tdeamarok.SlackBuild | 132 ++++++++++++++++++ Apps/tdektorrent/tdektorrent.SlackBuild | 9 +- Apps/yakuake/yakuake.SlackBuild | 29 +--- BUILD-TDE.sh | 14 +- Core/tdeadmin/tdeadmin.SlackBuild | 39 ++++-- Core/tdeedu/README | 25 ++++ Core/tdeedu/tdeedu.SlackBuild | 79 +++++++++-- Core/tdelibs/tdelibs.SlackBuild | 29 +--- Core/tdemultimedia/README | 22 +++ Core/tdemultimedia/tdemultimedia.SlackBuild | 114 +++++++++------ Core/tdenetwork/tdenetwork.SlackBuild | 1 + Deps/akode/README | 22 +++ Deps/akode/akode.SlackBuild | 97 +++++++++++++ Deps/avahi-tqt/avahi-tqt.SlackBuild | 30 ++-- Deps/dbus-tqt/dbus-tqt.SlackBuild | 3 +- Deps/libart-lgpl/libart-lgpl.SlackBuild | 16 --- Deps/tqca-tls/tqca-tls.SlackBuild | 4 +- Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild | 23 ++- Libs/tdelibkipi/tdelibkipi.SlackBuild | 27 +--- README.md | 31 ++-- get-source.sh | 21 ++- 25 files changed, 536 insertions(+), 315 deletions(-) create mode 100644 Core/tdeedu/README create mode 100644 Core/tdemultimedia/README create mode 100644 Deps/akode/README create mode 100644 Deps/akode/akode.SlackBuild diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild index 80de33f..574f17a 100755 --- a/Apps/kbookreader/kbookreader.SlackBuild +++ b/Apps/kbookreader/kbookreader.SlackBuild @@ -37,7 +37,6 @@ listdocs_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package -[[ $TDEVERSION == cgit ]] && { langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang.po";done ## output list of available locales ... (cd po @@ -48,28 +47,13 @@ do : done) [[ $langs != "" ]] && TRANS=ON && langs=$(echo $langs|sed "s|.po||g") -} -chown_fn -[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn +chown_fn cd_builddir_fn -[[ $TDEVERSION == *14.0.6 ]] && { - -LDFLAGS=$SLKLDFLAGS \ -CXXFLAGS=$SLKCFLAGS \ -CFLAGS=$SLKCFLAGS \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=$INSTALL_TDE \ - --libdir=$INSTALL_TDE/lib$LIBDIRSUFFIX - -} || { - - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -80,8 +64,6 @@ CXX=$COMPILER_CXX \ -DBUILD_TRANSLATIONS=${TRANS:-OFF} \ .. -} - make_fn installdocs_fn diff --git a/Apps/kdbusnotification/kdbusnotification.SlackBuild b/Apps/kdbusnotification/kdbusnotification.SlackBuild index 65d02c2..79c5ddb 100755 --- a/Apps/kdbusnotification/kdbusnotification.SlackBuild +++ b/Apps/kdbusnotification/kdbusnotification.SlackBuild @@ -35,24 +35,10 @@ untar_fn listdocs_fn -[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn - chown_fn cd_builddir_fn -[[ $TDEVERSION == *14.0.6 ]] && { - -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=$INSTALL_TDE - -} || { - cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ @@ -61,8 +47,6 @@ cmake \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ .. -} - make_fn installdocs_fn diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild index 264c9a8..703c862 100755 --- a/Apps/kile/kile.SlackBuild +++ b/Apps/kile/kile.SlackBuild @@ -40,20 +40,6 @@ listdocs_fn langs="";for Lang in $I18N;do [[ -e translations/$Lang ]] && langs="$langs $Lang";done sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am -[[ $TDEVERSION == R14.0.4 ]] && { -## patch for clang -echo $' ---- src/kile/kileprojectview.h -+++ src/kile/kileprojectview.h -@@ -28 +28 @@ --class KileDocument::Info; -+namespace KileDocument { class Info; } -' | while read line -do -patch -p0 -done -} - ltoolupdate_fn chown_fn diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild index 0ef2805..b285652 100755 --- a/Apps/knemo/knemo.SlackBuild +++ b/Apps/knemo/knemo.SlackBuild @@ -43,42 +43,22 @@ sed -i 's|Default Gateway" ), LINK_QUALITY|Default Gateway" ), GATEWAY|' src/kne # set support for additional language(s) as per I18N variable # but only for languages available with this package -[[ $TDEVERSION == cgit ]] && LANG_SUFF=/messages/kcm_knemo.po -langs="";for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang${LANG_SUFF:-}";done +langs="";for Lang in $I18N;do [[ -d translations/$Lang ]] && langs="$langs $Lang/messages/kcm_knemo.po";done ## convoluted method to work around cmake 'add_custom_target' seeing duplicate files -[[ $TDEVERSION == cgit ]] && LANG_SUFF=/messages/knemod.po && langs2="" && \ -for Lang in $I18N;do [[ -d translations/$Lang ]] && langs2="$langs2 $Lang${LANG_SUFF:-}";done && \ +langs2="" && \ +for Lang in $I18N;do [[ -d translations/$Lang ]] && langs2="$langs2 $Lang/messages/knemod.po";done && \ langs="$langs $langs2" && \ sed -i "s|\${po_files}|$langs|" translations/CMakeLists.txt && \ -langs=$(echo $langs2|sed "s|$LANG_SUFF||g") || \ -sed -i "s|SUBDIRS=.*$|SUBDIRS=$langs|" translations/Makefile.am +langs=$(echo $langs2|sed "s|/messages/knemod.po||g") [[ $langs != "" ]] && TRANS=ON -[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn - listdocs_fn chown_fn cd_builddir_fn -[[ $TDEVERSION == *14.0.6 ]] && { - -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ - --disable-rpath \ - --enable-closure - -} || { - - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -90,8 +70,6 @@ CXX=$COMPILER_CXX \ -DCMAKE_SKIP_RPATH=ON \ .. -} - make_fn installdocs_fn diff --git a/Apps/tdeamarok/tdeamarok.SlackBuild b/Apps/tdeamarok/tdeamarok.SlackBuild index cfe3708..a517b15 100755 --- a/Apps/tdeamarok/tdeamarok.SlackBuild +++ b/Apps/tdeamarok/tdeamarok.SlackBuild @@ -54,6 +54,138 @@ sed -i -e 's|wav )|wav )\nadd_subdirectory( speex )|' \ # Yauap does NOT handle the mp3 format. [[ $(ls /var/log/packages/yauap-*) ]] && YAUAP="ON" +# fix includehints - see issue #16 +echo $' +--- amarok/src/Options1.ui ++++ amarok/src/Options1.ui +@@ -686,0 +687,3 @@ ++ kcombobox.h ++ klineedit.h ++ kactivelabel.h +@@ -695,5 +697,0 @@ +- +- kcombobox.h +- klineedit.h +- kactivelabel.h +- +--- amarok/src/Options2.ui ++++ amarok/src/Options2.ui +@@ -746,0 +747,3 @@ ++ tdefontrequester.h ++ kcolorbutton.h ++ kcombobox.h +@@ -759,9 +761,0 @@ +- +- tdefontrequester.h +- tdefontrequester.h +- tdefontrequester.h +- kcolorbutton.h +- kcolorbutton.h +- kcolorbutton.h +- kcombobox.h +- +--- amarok/src/Options5.ui ++++ amarok/src/Options5.ui +@@ -508,0 +509,5 @@ ++ ktextedit.h ++ kcombobox.h ++ kcolorbutton.h ++ tdefontrequester.h ++ knuminput.h +@@ -528,3 +528,0 @@ +- +- ktextedit.h +- +--- amarok/src/Options8.ui ++++ amarok/src/Options8.ui +@@ -292,0 +293,2 @@ ++ kactivelabel.h ++ klineedit.h +@@ -298,7 +299,0 @@ +- +- kactivelabel.h +- kactivelabel.h +- klineedit.h +- klineedit.h +- kactivelabel.h +- +--- amarok/src/dbsetup.ui ++++ amarok/src/dbsetup.ui +@@ -450,0 +451,3 @@ ++ knuminput.h ++ klineedit.h ++ kcombobox.h +@@ -459,9 +461,0 @@ +- +- knuminput.h +- klineedit.h +- klineedit.h +- klineedit.h +- klineedit.h +- klineedit.h +- kcombobox.h +- +--- amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui ++++ amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui +@@ -436,0 +437 @@ ++ kactivelabel.h +@@ -460,3 +460,0 @@ +- +- kactivelabel.h +- +--- amarok/src/organizecollectiondialog.ui ++++ amarok/src/organizecollectiondialog.ui +@@ -565,0 +566,3 @@ ++ kcombobox.h ++ klineedit.h ++ kactivelabel.h +@@ -589,7 +591,0 @@ +- +- kcombobox.h +- klineedit.h +- kactivelabel.h +- klineedit.h +- klineedit.h +- +--- amarok/src/scripts/graphequalizer/eqdialog.ui ++++ amarok/src/scripts/graphequalizer/eqdialog.ui +@@ -200,0 +201 @@ ++ equalizercanvasview.h +@@ -209,3 +209,0 @@ +- +- equalizercanvasview.h +- +--- amarok/src/tagguesserconfigdialog.ui ++++ amarok/src/tagguesserconfigdialog.ui +@@ -192,0 +193,2 @@ ++ tdelistview.h ++ kpushbutton.h +@@ -213,9 +214,0 @@ +- +- kdialog.h +- tdelistview.h +- kpushbutton.h +- kpushbutton.h +- kpushbutton.h +- kpushbutton.h +- kpushbutton.h +- +--- amarok/src/scriptmanagerbase.ui ++++ amarok/src/scriptmanagerbase.ui +@@ -131,0 +132 @@ ++ tdelistview.h +--- amarok/src/engine/xine/xineconfigbase.ui ++++ amarok/src/engine/xine/xineconfigbase.ui +@@ -503,0 +504,2 @@ ++ kcombobox.h ++ knuminput.h +' | while read line +do +patch -N -p0 +done || true +## and then do the rest ... +find . -name \*.ui -exec sed -i -e 's|includehint|include|g' '{}' + + listdocs_fn # set support for additional language(s) as per I18N variable diff --git a/Apps/tdektorrent/tdektorrent.SlackBuild b/Apps/tdektorrent/tdektorrent.SlackBuild index addc81a..037abdd 100644 --- a/Apps/tdektorrent/tdektorrent.SlackBuild +++ b/Apps/tdektorrent/tdektorrent.SlackBuild @@ -36,6 +36,11 @@ 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 + ltoolupdate_fn chown_fn @@ -91,12 +96,12 @@ $PRGNAM: $PRGNAM (A TDE BitTorrent client) $PRGNAM: $PRGNAM: A BitTorrent client for TDE $PRGNAM: -$PRGNAM: -$PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: +$PRGNAM: With language support for: $PRGNAM: +$PRGNAM: en$langs $PRGNAM: $PRGNAM: Home: https://www.trinitydesktop.org/index.php " > $PKG/install/slack-desc diff --git a/Apps/yakuake/yakuake.SlackBuild b/Apps/yakuake/yakuake.SlackBuild index 50cd22f..ff64653 100755 --- a/Apps/yakuake/yakuake.SlackBuild +++ b/Apps/yakuake/yakuake.SlackBuild @@ -35,39 +35,18 @@ untar_fn listdocs_fn -[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn - chown_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package -[[ $TDEVERSION == cgit ]] && LANG_SUFF=/$PRGNAM.po -langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang${LANG_SUFF:-}";done -[[ $TDEVERSION == cgit ]] && \ +langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/$PRGNAM.po";done sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt && \ -langs=$(echo $langs|sed "s|$LANG_SUFF||g") || \ -sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am +langs=$(echo $langs|sed "s|/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON cd_builddir_fn -[[ $TDEVERSION == *14.0.6 ]] && { - -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ - --disable-rpath \ - --enable-closure - -} || { - - cmake \ +cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_C_COMPILER=$COMPILER \ @@ -79,8 +58,6 @@ CXX=$COMPILER_CXX \ -DCMAKE_SKIP_RPATH=ON \ .. -} - make_fn installdocs_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 663f56f..0f82d2c 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -89,10 +89,9 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Version " --menu Set the version of TDE to be built. " \ -14 75 3 \ -"14.0.6" "the R14.0.6 release - source from archives" \ +12 75 2 \ +"14.0.7" "the R14.0.7 release - source from archives" \ "cgit" "R14.1.0 development - source from Trinity git" \ -"r14.0.6" "snapshot" \ 2> $TMPVARS/TDEVERSION @@ -362,7 +361,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "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" \ -"Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" ${SELECT:-off} "\Zb\Z6 \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 \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ "Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 \Zn" \ @@ -372,6 +371,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Core/tdegames" "Games for TDE - atlantik, kasteroids, katomic, etc." off "\Zb\Z6 \Zn" \ " Misc/imlib" "An image loading and rendering library" off "\Zb\Z6 Build-time option for tdegraphics - needed for kuickshow \Zn" \ "Core/tdegraphics" "Misc graphics apps" off "\Zb\Z6 \Zn" \ +"Deps/akode" "A player and plugins for aRts music formats" off "\Zb\Z6 For tdemultimedia - aRts-plugin and Juk \Zn" \ "Core/tdemultimedia" "Multimedia packages for TDE" off "\Zb\Z6 \Zn" \ " Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Buildtime option for tdenetwork and amarok. Requires l/speexdsp \Zn" \ "Core/tdenetwork" "Networking applications for TDE" off "\Zb\Z6 Optional build-time dependency - speex \Zn" \ @@ -751,11 +751,11 @@ do build=$(cat $package.SlackBuild | grep "BUILD:" | cut -d "-" -f2 | rev | cut -c 2- | rev) # The real build starts here - script -c "sh $package.SlackBuild" $TMP/$package-$TDEVERSION-$ARCH-build-log || ${EXIT_FAIL:-"true"} + script -c "sh $package.SlackBuild" $TMP/$package-$TDEVERSION-$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-$TDEVERSION-$ARCH-build-log || ${EXIT_FAIL:-"true"} + sed -ri "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" $TMP/$package-$TDEVERSION-$ARCH-$build-build-log || ${EXIT_FAIL:-"true"} checkinstall () { @@ -775,7 +775,7 @@ sed -i "s|$dir ||" $TMPVARS/TDEbuilds || \ { echo " Error: $package package build failed - Check the build log $TMP/$package-$TDEVERSION-$ARCH-build-log + Check the build log $TMP/$package-$TDEVERSION-$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 diff --git a/Core/tdeadmin/tdeadmin.SlackBuild b/Core/tdeadmin/tdeadmin.SlackBuild index a01b876..88c4839 100755 --- a/Core/tdeadmin/tdeadmin.SlackBuild +++ b/Core/tdeadmin/tdeadmin.SlackBuild @@ -35,25 +35,34 @@ untar_fn listdocs_fn -ltoolupdate_fn - chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ -../configure \ - --prefix=${INSTALL_TDE} \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ - --disable-rpath \ - --enable-closure \ - --with-pam=no \ - --build=$ARCH-slackware-linux +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_C_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -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_KCRON=ON \ + -DBUILD_KDAT=ON \ + -DBUILD_KNETWORKCONF=ON \ + -DBUILD_KSYSV=ON \ + -DBUILD_KUSER=ON \ + -DBUILD_LILO_CONFIG=ON \ + -DBUILD_KPACKAGE=ON \ + -DBUILD_TDEFILE_PLUGINS=ON \ + -DBUILD_SECPOLICY=OFF \ + -Wno-dev \ + .. make_fn diff --git a/Core/tdeedu/README b/Core/tdeedu/README new file mode 100644 index 0000000..e268ded --- /dev/null +++ b/Core/tdeedu/README @@ -0,0 +1,25 @@ +There are issues building with cmake, so until they are resolved, the preference is an autotools build. +If you DO want to build with cmake, run 'USE_CMAKE_EDU=yes ./BUILD-TDE.sh' +kalzium won't build at all with cmake; it will with autotools, with limitations: + +Re: configure output: +""" +The Kalzium Chemical Equation Solver has been disabled. Possible reasons of that: + +* OCaml was not found. In order to have the Solver, you have to install OCaml. You can get OCaml from http://pauillac.inria.fr/ocaml/. + +* The FaCiLe module for OCaml was not found. In order to have the Solver, you have to install the FaCiLe module. You can get it from http://www.recherche.enac.fr/opti/facile/. + + +Kig Python scripting support has been disabled, because you are missing the necessary headers and/or libraries. +In order to use Kig Python scripting, you need to have Python installed, along with its development package ( e.g. libpython-dev ), and also the Boost.Python library, along with its development package ( e.g. libboost-python-dev ). + +Kig will continue to function without Python scripting support, but you will not be able to created Python scripted objects, or load Kig files that use them. + +Installing the libraries: +The python development libraries themselves are almost certainly packaged by your favourite distribution. +Look for a package name like libpython-dev, with possibly a version number inserted somewhere in the name.. +For the Boost.Python libs, check this documentation: "http://boost.org/more/download.html" and "http://boost.org/more/download.html#Installation" or look for a package like libboost-python-dev or libboost-dev.. + +""" + diff --git a/Core/tdeedu/tdeedu.SlackBuild b/Core/tdeedu/tdeedu.SlackBuild index 2fa188d..b920e82 100755 --- a/Core/tdeedu/tdeedu.SlackBuild +++ b/Core/tdeedu/tdeedu.SlackBuild @@ -35,22 +35,81 @@ untar_fn listdocs_fn +## There are issues building with cmake - see README +USE_CMAKE_EDU=${USE_CMAKE_EDU:-no} + +[[ $USE_CMAKE_EDU == no ]] && { + +## include all keyboards for ktouch +(cd ktouch/keyboards/ +sed -i '/keyboard_DATA/q' Makefile.am +echo $(ls *keyboard) >> Makefile.am) + ltoolupdate_fn chown_fn -#cd_builddir_fn - do not use - -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ./configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --disable-rpath \ --enable-closure +} || { + +chown_fn + +cd_builddir_fn + +## KALZIUM won't build without ocamlc +KALZIUM=OFF + +cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -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_ALL_OPTIONS="OFF" \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_ARTS="ON" \ + -DWITH_OCAML_SOLVER="ON" \ + -DWITH_LIBUSB="ON" \ + -DWITH_V4L="ON" \ + -DBUILD_ALL="OFF" \ + -DBUILD_BLINKEN="ON" \ + -DBUILD_KALZIUM="$KALZIUM" \ + -DBUILD_KANAGRAM="ON" \ + -DBUILD_KBRUCH="ON" \ + -DBUILD_KEDUCA="ON" \ + -DBUILD_KGEOGRAPHY="ON" \ + -DBUILD_KHANGMAN="ON" \ + -DBUILD_KIG="ON" \ + -DBUILD_KITEN="ON" \ + -DBUILD_KLATIN="ON" \ + -DBUILD_KLETTRES="ON" \ + -DBUILD_KMPLOT="ON" \ + -DBUILD_KPERCENTAGE="ON" \ + -DBUILD_KSTARS="ON" \ + -DBUILD_KTOUCH="ON" \ + -DBUILD_KTURTLE="ON" \ + -DBUILD_KVERBOS="ON" \ + -DBUILD_KVOCTRAIN="ON" \ + -DBUILD_KWORDQUIZ="ON" \ + -DBUILD_DOC="ON" \ + .. + +} + make_fn installdocs_fn @@ -72,8 +131,8 @@ $PRGNAM: $PRGNAM: Many pieces of software for education. $PRGNAM: $PRGNAM: -$PRGNAM: -$PRGNAM: +$PRGNAM: +$PRGNAM: $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index 69530c9..6d26cd7 100644 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -36,33 +36,6 @@ untar_fn ## remove x-rar-compressed.desktop sed -i '/x-rar-compressed.desktop/d' mimetypes/application/{CMakeLists.txt,Makefile.am} -## patch for building with clang - added '-N' and '|| true' for cgit build -echo $' ---- tdeabc/tests/testaddresseelist.cpp -+++ tdeabc/tests/testaddresseelist.cpp -@@ -20,1 +20,1 @@ --int main(int /*argc*/,char /* **argv*/) -+int main(int /*argc*/, char** /*argv*/) -' | while read line -do -patch -N -p0 -done || true - -## patch for 'Magic file type detection not working' - bug 2713 - commit f54496a1 -echo $' ---- tdeio/tdeio/kmimemagic.cpp -+++ tdeio/tdeio/kmimemagic.cpp -@@ -195,1 +195,1 @@ -- int magic_flags = MAGIC_CONTINUE|MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/; -+ int magic_flags = MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/; -@@ -302,1 +302,1 @@ -- int magic_flags = MAGIC_CONTINUE|MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/; -+ int magic_flags = MAGIC_ERROR|MAGIC_MIME_TYPE/*|MAGIC_DEBUG*/; -' | while read line -do -patch -N -p0 -done || true - ## TDE bug 2821 ## patch to enable tdecmshell to find TDE .desktop file in the event of a duplication in file names echo $'--- tdecmshell/main.cpp @@ -99,7 +72,7 @@ listdocs_fn chown_fn # Check for avahi-tqt -[[ $(ls /var/log/packages/avahi-tqt-*) ]] && AVAHI="ON" +[[ -s $INSTALL_TDE/include/avahi-tqt/qt-watch.h ]] && AVAHI="ON" cd_builddir_fn cmake \ diff --git a/Core/tdemultimedia/README b/Core/tdemultimedia/README new file mode 100644 index 0000000..d3e20a1 --- /dev/null +++ b/Core/tdemultimedia/README @@ -0,0 +1,22 @@ +There are issues building with cmake, so until they are resolved, the preference is an autotools build. +If you DO want to build with cmake, run 'USE_CMAKE_MM=yes ./BUILD-TDE.sh' +Juk won't build at all with cmake - the autotools build is more accommodating: + +Re: configure output: +""" +* You do not seem to have libmusicbrainz and libtunepimp. +* JuK will be compiled without MusicBrainz support and automatic song recognition will not be supported. +* Please download libmusicbrainz 2.x and libtunepimp 0.3.x from: +* http://www.musicbrainz.org/products/client/download.html +* http://www.musicbrainz.org/products/tunepimp/download.html +""" + +---------------------------- +And if akode isn't installed: +""" +aKode was not found. Without it the aKode aRts-plugin will not be +installed, and aRts will be unable to play many music formats. +You can find aKode in KDE's Subversion repository under +trunk/tdesupport/akode. +""" + diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild index 47724f9..289bc46 100755 --- a/Core/tdemultimedia/tdemultimedia.SlackBuild +++ b/Core/tdemultimedia/tdemultimedia.SlackBuild @@ -28,71 +28,93 @@ VERSION=${VERSION:-$TDEVERSION} BUILD=${BUILD:-1} TAG=${TAG:-_tde} -# This is one of the builds that Trinity 'How to Build' advises may not build if greater than -j1 -# if so, set NUMJOBS="-j1" -NUMJOBS=$NUMJOBS -# cmake only builds 'kmix' - comment out to use cmake -# otherwise using automake/configure to be able to build all options -USECMAKE="no" - source ../../get-source.sh getsource_fn untar_fn -## patch for building with clang -echo $' ---- noatun/library/noatunarts/StereoVolumeControl_impl.cpp -+++ noatun/library/noatunarts/StereoVolumeControl_impl.cpp -@@ -74,1 +74,1 @@ -- void calculateBlock(unsigned long samples) -+ void calculateBlock(unsigned long samples) __attribute__((noinline)) -' | while read line -do -patch -p0 -done - listdocs_fn -chown_fn +## There are issues building with cmake - see README +USE_CMAKE_MM=${USE_CMAKE_MM:-no} + +[[ $USE_CMAKE_MM == no ]] && { -if [ ! "${USECMAKE:-}" == "no" ] -then -# Ummm...so this just builds kmix....? lmao -cd_builddir_fn - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ - -DCMAKE_C_COMPILER=${COMPILER} \ - -DCMAKE_CXX_COMPILER=${COMPILER_CXX} \ - -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_ALL="ON" \ - .. -else ltoolupdate_fn +chown_fn + cd_builddir_fn # change hard-coded tqt headers directory: [[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|${INSTALL_TDE}/include/tqt|g" ../configure -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ +LDFLAGS=$SLKLDFLAGS \ +CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ +CXXFLAGS=$SLKCFLAGS \ +CC=$COMPILER \ +CXX=$COMPILER_CXX \ ../configure \ - --prefix=${INSTALL_TDE} \ + --prefix=$INSTALL_TDE \ --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ + --mandir=$INSTALL_TDE/man \ --disable-rpath \ --disable-debug \ --enable-closure -fi + +} || { + +chown_fn + +cd_builddir_fn + +## akode is required for ARTS_AKODE +AKODE=OFF && [[ -s $INSTALL_TDE/include/akode/akodelib.h ]] && AKODE=ON +## JUK requires musicbrainz and akode - ** to be completed for musicbrainz test ** +JUK=OFF && [[ $AKODE == ON ]] && : + +cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -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" \ + -DWITH_ARTS_MPEGLIB="ON" \ + -DWITH_ARTS_XINE="ON" \ + -DWITH_CDPARANOIA="ON" \ + -DWITH_FLAC="ON" \ + -DWITH_GSTREAMER="ON" \ + -DWITH_KSCD_CDDA="ON" \ + -DWITH_LAME="ON" \ + -DWITH_MUSICBRAINZ="ON" \ + -DWITH_TAGLIB="ON" \ + -DWITH_THEORA="ON" \ + -DWITH_VORBIS="ON" \ + -DBUILD_ARTS="ON" \ + -DBUILD_DOC="ON" \ + -DBUILD_JUK="$JUK" \ + -DBUILD_KABOODLE="ON" \ + -DBUILD_KAPPFINDER_DATA="ON" \ + -DBUILD_KAUDIOCREATOR="ON" \ + -DBUILD_KMIX="ON" \ + -DBUILD_KREC="ON" \ + -DBUILD_KSCD="ON" \ + -DBUILD_LIBKCDDB="ON" \ + -DBUILD_MPEGLIB="ON" \ + -DBUILD_NOATUN="ON" \ + -DBUILD_TDEFILE_PLUGINS="ON" \ + -DBUILD_TDEIOSLAVE="ON" \ + -DBUILD_TDEMID="ON" \ + .. + +} make_fn diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild index 661fab3..5c3ee96 100755 --- a/Core/tdenetwork/tdenetwork.SlackBuild +++ b/Core/tdenetwork/tdenetwork.SlackBuild @@ -88,6 +88,7 @@ cd_builddir_fn -DBUILD_KOPETE_PROTOCOL_JABBER="ON" \ -DBUILD_KOPETE_PROTOCOL_GADU="OFF" \ -DBUILD_KOPETE_PROTOCOL_MEANWHILE="OFF" \ + -DBUILD_KOPETE_PROTOCOL_MSN="ON" \ -DBUILD_KOPETE_PLUGIN_LATEX="ON" \ -DBUILD_KOPETE_PLUGIN_AUTOREPLACE="ON" \ -DBUILD_KOPETE_PLUGIN_HISTORY="ON" \ diff --git a/Deps/akode/README b/Deps/akode/README new file mode 100644 index 0000000..295d57e --- /dev/null +++ b/Deps/akode/README @@ -0,0 +1,22 @@ +## Re: PACKAGING: + +""" +The plugins are designed for being packaged and installed separately of akodelib. + +Take especially note of the following: +- Do not install mpeg_decoder if you have software patent concerns +- Do not install src_resampler and mpeg_decoder if you want a pure LGPL library since they are both derived of GPL libraries. +- If you wish to install plugins in a non-standard place, you can change the AKODE_SEARCHDIR definition in lib/pluginhandler.cpp. +- You SHOULD not install sinks for backends you don't use. Thus jack_sink should only be installed when jackd is available, pulse_sink only when the PulseAudio server is used and alsa_sink only when using a Linux kernel with ALSA drivers. + + When using direct aKode playback sinks will be autodetected by loading and probing plugins in this order: pulse, jack, alsa, oss +""" + +--------------------- +Attempting to build FFMPEG_DECODER was abandoned because the akode code is too old. + +Example: +/tmp/build/tmp-akode/akode-trinity-14.0.7/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp:98:17: error: ‘AVCODEC_MAX_AUDIO_FRAME_SIZE’ was not declared in this scope + + ... is no longer defined in ffmpeg. + diff --git a/Deps/akode/akode.SlackBuild b/Deps/akode/akode.SlackBuild new file mode 100644 index 0000000..fac0e58 --- /dev/null +++ b/Deps/akode/akode.SlackBuild @@ -0,0 +1,97 @@ +#!/bin/sh +# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST +# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, Netherlands +# Copyright 2015-2017 Thorn Inurcide +# Copyright 2015-2017 tde-slackbuilds project on GitHub +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. + +PRGNAM=akode +VERSION=${VERSION:-$TDEVERSION} +BUILD=${BUILD:-1} +TAG=${TAG:-_tde} + +source ../../get-source.sh +getsource_fn + +untar_fn + +## edit headers locations for Slackware package - but see README +sed -i 's|ffmpeg/avcodec.h|libavcodec/avcodec.h|' akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp +sed -i 's|ffmpeg/avformat.h|libavformat/avformat.h|' akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp +sed -i 's|ffmpeg/avio.h|libavformat/avio.h|' akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp + +chown_fn + +cd_builddir_fn + +## see README for cmake options +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DLIB_SUFFIX=$LIBDIRSUFFIX \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_LIBLTDL="ON" \ + -DWITH_ALSA_SINK="ON" \ + -DWITH_JACK_SINK="OFF" \ + -DWITH_PULSE_SINK="ON" \ + -DWITH_OSS_SINK="OFF" \ + -DWITH_SUN_SINK="OFF" \ + -DWITH_FFMPEG_DECODER="OFF" \ + -DWITH_MPC_DECODER="ON" \ + -DWITH_MPEG_DECODER="ON" \ + -DWITH_SRC_RESAMPLER="OFF" \ + -DWITH_XIPH_DECODER="OFF" \ + .. + +make_fn + +strip_fn + +mkdir_install_fn + +echo " +# HOW TO EDIT THIS FILE: +# The 'handy ruler' below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +$PRGNAM: $PRGNAM - player and plugins for aRts music formats +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +$PRGNAM: +" > $PKG/install/slack-desc + +makepkg_fn diff --git a/Deps/avahi-tqt/avahi-tqt.SlackBuild b/Deps/avahi-tqt/avahi-tqt.SlackBuild index f037de6..47d1336 100755 --- a/Deps/avahi-tqt/avahi-tqt.SlackBuild +++ b/Deps/avahi-tqt/avahi-tqt.SlackBuild @@ -37,25 +37,19 @@ listdocs_fn chown_fn -#cd_builddir_fn -do not use +cd_builddir_fn -# This has a CmakeList.txt so this can be converted to cmake at any time. -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ -./autogen.sh \ - --prefix=${INSTALL_TDE} \ - --libdir=${INSTALL_TDE}/lib${LIBDIRSUFFIX} \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ - --docdir=${INSTALL_TDE}/doc/$PRGNAM-$VERSION \ - --with-distro=slackware \ - --enable-introspection=auto \ - --disable-static \ - --enable-shared \ - --build=$ARCH-slackware-linux \ +cmake \ + -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING=$SLKCFLAGS \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -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 21ec24a..d92eac5 100755 --- a/Deps/dbus-tqt/dbus-tqt.SlackBuild +++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild @@ -47,9 +47,8 @@ cd_builddir_fn -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=${INSTALL_TDE} \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ - -DMAN_INSTALL_DIR=${INSTALL_TDE}/man \ .. + make_fn installdocs_fn diff --git a/Deps/libart-lgpl/libart-lgpl.SlackBuild b/Deps/libart-lgpl/libart-lgpl.SlackBuild index 7c16a17..f2416a6 100644 --- a/Deps/libart-lgpl/libart-lgpl.SlackBuild +++ b/Deps/libart-lgpl/libart-lgpl.SlackBuild @@ -39,20 +39,6 @@ chown_fn cd_builddir_fn -[[ $TDEVERSION == *14.0.6 ]] && { - -LDFLAGS=$SLKLDFLAGS \ -CXXFLAGS=$SLKCFLAGS \ -CFLAGS=$SLKCFLAGS \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=/usr \ - --libdir=/usr/lib$LIBDIRSUFFIX \ - --disable-static - -} || { - cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ @@ -63,8 +49,6 @@ CXX=$COMPILER_CXX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ .. -} - make_fn installdocs_fn diff --git a/Deps/tqca-tls/tqca-tls.SlackBuild b/Deps/tqca-tls/tqca-tls.SlackBuild index b2c3a92..c148b76 100755 --- a/Deps/tqca-tls/tqca-tls.SlackBuild +++ b/Deps/tqca-tls/tqca-tls.SlackBuild @@ -39,14 +39,12 @@ chown_fn #cd_builddir_fn -# This configure script doesn't accept crap for arguments see ./configure --help to verify [[ ! -d /usr/include/tqt ]] && sed -i "s|/usr/include/tqt|$INSTALL_TDE/include/tqt|g" configure || true -unset CT && [[ $TDEVERSION == cgit ]] && CT=t LDFLAGS=$SLKLDFLAGS \ CXXFLAGS=$SLKCFLAGS \ CFLAGS=$SLKCFLAGS \ ./configure \ ---${CT:-}qtdir=$TQTDIR-$VERSION +--tqtdir=$TQTDIR-$VERSION ## configure uses the installed tqt for it's flags - if this is a re-build of this package only, ## it may pick up the wrong march/mtune flags, or none at all - use SET_march as set up in BUILD-TDE.sh diff --git a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild index 228b8e5..1447c7b 100755 --- a/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild +++ b/Libs/tdelibkexiv2/tdelibkexiv2.SlackBuild @@ -36,23 +36,20 @@ untar_fn listdocs_fn -ltoolupdate_fn - chown_fn cd_builddir_fn -LDFLAGS="${SLKLDFLAGS}" \ -CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \ -CXXFLAGS="${SLKCFLAGS}" \ -CC=${COMPILER} \ -CXX=${COMPILER_CXX} \ -../configure \ - --prefix=${INSTALL_TDE} \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=${INSTALL_TDE}/man \ - --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 \ + -DCMAKE_SKIP_RPATH=ON \ + .. make_fn diff --git a/Libs/tdelibkipi/tdelibkipi.SlackBuild b/Libs/tdelibkipi/tdelibkipi.SlackBuild index 047be47..d2912df 100755 --- a/Libs/tdelibkipi/tdelibkipi.SlackBuild +++ b/Libs/tdelibkipi/tdelibkipi.SlackBuild @@ -36,38 +36,17 @@ untar_fn listdocs_fn -[[ $TDEVERSION == *14.0.6 ]] && ltoolupdate_fn - chown_fn # set support for additional language(s) as per I18N variable # but only for languages available with this package -[[ $TDEVERSION == cgit ]] && LANG_SUFF=/$PRGNAM.po -langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang${LANG_SUFF:-}";done -[[ $TDEVERSION == cgit ]] && \ +langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/$PRGNAM.po";done sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt && \ -langs=$(echo $langs|sed "s|$LANG_SUFF||g") || \ -sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am +langs=$(echo $langs|sed "s|/$PRGNAM.po||g") [[ $langs != "" ]] && TRANS=ON cd_builddir_fn -[[ $TDEVERSION == *14.0.6 ]] && { - -LDFLAGS=$SLKLDFLAGS \ -CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \ -CXXFLAGS=$SLKCFLAGS \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=$INSTALL_TDE \ - --sysconfdir=$SYS_CNF_DIR \ - --mandir=$INSTALL_TDE/man \ - --disable-rpath \ - --enable-closure - -} || { - cmake \ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \ @@ -80,8 +59,6 @@ CXX=$COMPILER_CXX \ -DCMAKE_SKIP_RPATH=ON \ .. -} - make_fn installdocs_fn diff --git a/README.md b/README.md index 08ef89e..0ce3191 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,16 @@ 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. -Build the release version R14.0.6 from tar archives; or the development version R14.1.0 from trinitydesktop cgit. - +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. + +[](https://ray-v.github.io/TDE-version.png) + The default is to install the packages as they are built, which is necessary initially for the required packages and for some interdependencies [for example, tdesdk requires tdepim]. 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. +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. 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. @@ -51,12 +53,12 @@ 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. -See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more information +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. +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. --- -[](https://ray-v.github.io/TDE-version.png) - ***Building the development version from git sources*** The individual TDE apps can be cloned from Trinity git, so the build is set up to do that - except for individual language packs of tde-i18n. The whole tde-i18n download is ~1x10^6 bytes, so to reduce that, wget is used to download individual tde-i18n-$lang packs as they are not git repositories. @@ -67,13 +69,6 @@ The git repositories are cloned to 'src/cgit' --- -***Building a pre-release from snapshot sources*** - -This option has been retained for updating any builds already based on these sources. -New builds should use the R14.0.6 archives. - ---- - ***Cross compiling for RPi3*** Cross compiling a number of packages for the Raspberry Pi3 based on these scripts is detailed in the html page in the gh-pages branch: @@ -86,12 +81,16 @@ 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 +* 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 +* ... and a few other TDE and non-TDE apps to provide a basic, but useful, TDE desktop. + +--- + +See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more information --- diff --git a/get-source.sh b/get-source.sh index 377d9d0..95c0178 100755 --- a/get-source.sh +++ b/get-source.sh @@ -90,11 +90,12 @@ done ## 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 -## R14.0.6 archive names include -trinity. +## R14.0.6+ archive names include -trinity. ## To maintain compatibility with the previous naming convention, -## rename any pre-downloaded R14.0.6 archives -[[ $TDEVERSION == 14.0.6 ]] && [[ -s $SRCDIR/../../src/$PRGNAM-trinity-$VERSION.tar.xz ]] && \ -mv $SRCDIR/../../src/$PRGNAM-trinity-$VERSION.tar.xz $SRCDIR/../../src/$PRGNAM-$VERSION.tar.xz +## sym-link any pre-downloaded R14.0.6+ archives +[[ $TDEVERSION == 14.0.[6-9] ]] && [[ -s $SRCDIR/../../src/$PRGNAM-trinity-$VERSION.tar.xz ]] && \ +(cd $SRCDIR/../../src/ +ln -sf $PRGNAM-trinity-$VERSION.tar.xz $PRGNAM-$VERSION.tar.xz) ln -sf $SRCDIR/../../src/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} $SRCDIR SOURCE=$SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} @@ -126,7 +127,6 @@ if [ "$P1" == "--download" ]; then exit 0 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: @@ -212,7 +212,6 @@ done } } - # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: { [[ $ARCH == x86_64 ]] && SLKCFLAGS="-O2 -fPIC ${SET_march:-}" \ SLKLDFLAGS="-L$INSTALL_TDE/lib$LIBDIRSUFFIX -L/usr/lib64"; } \ @@ -239,8 +238,8 @@ cd $TMP_BUILD/tmp-$PRGNAM [[ $TDEVERSION == 14.0.? || $TDEMIR_SUBDIR == misc ]] && { ## unpack R14 or misc echo -e " unpacking $(basename $SOURCE) ... \n" -tar -xf $SOURCE -#[[ $TDEMIR_SUBDIR != misc ]] && cd ./$(echo $TDEMIR_SUBDIR | cut -d / -f 2) || true +tar -xf $SOURCE +true # if this fails, go to [4] and let SlackBuild fail from there } || { ## ## [2] not R14 nor misc - is it r14 snapshot? @@ -248,7 +247,7 @@ tar -xf $SOURCE [[ $TDEVERSION == r14.0.? ]] && { ## unpack r14 echo -e " unpacking $(basename $SOURCE) ... \n" -tar -xf $SOURCE +tar -xf $SOURCE ## unpack all needed common sources .. (cd $PRGNAM-$TDEVERSION echo 'admin @@ -259,13 +258,12 @@ do [[ -d $line && ! $line == libtdevnc ]] && tar xf $SRCDIR/../../src/$line-$TDEVERSION.$ARCHIVE_TYPE --strip-components=1 -C $line [[ -d $line && $line == libtdevnc ]] && tar xf $SRCDIR/../../src/$line-r14.0.1.tar.gz --strip-components=1 -C $line done -true # don't go on to [3] if this fails +true # if this fails, go to [4] and let SlackBuild fail from there ) } } || { ## ## [3] not [rR]14 nor misc, so must be cgit .. -## ## copy git repo but don't copy .git directory: echo -e " copying $PRGNAM source files to build area ... \n" (cd $BUILD_TDE_ROOT/src/cgit @@ -281,6 +279,7 @@ cd $PRGNAM* } } + listdocs_fn () { DOCDIR=$PWD # this is set for installdocs_fn