From f194cf13fc91a8b0d35d0240378fbd328605142e Mon Sep 17 00:00:00 2001 From: Ray-V Date: Sun, 12 Jul 2020 12:45:30 +0100 Subject: [PATCH] Updated development builds option to build 14.0.x - currently 14.0.9 use of LINGUAS variable for localization of development builds --- Apps/abakus/abakus.SlackBuild | 6 +- Apps/dolphin/dolphin.SlackBuild | 9 +- Apps/kaffeine/kaffeine.SlackBuild | 4 +- Apps/kbfx/kbfx.SlackBuild | 2 +- Apps/kkbswitch/kkbswitch.SlackBuild | 32 +++- Apps/knetstats/knetstats.SlackBuild | 12 +- Apps/knights/knights.SlackBuild | 24 +-- Apps/knmap/knmap.SlackBuild | 16 +- Apps/kscope/kscope.SlackBuild | 36 ++++- Apps/ksensors/ksensors.SlackBuild | 16 +- Apps/kshutdown/kshutdown.SlackBuild | 33 +++-- Apps/kvkbd/kvkbd.SlackBuild | 16 +- Apps/kvpnc/kvpnc.SlackBuild | 41 ++--- Apps/potracegui/potracegui.SlackBuild | 31 ++-- .../tde-style-qtcurve.SlackBuild | 36 ++++- Apps/tdepowersave/tdepowersave.SlackBuild | 2 +- Apps/tdesudo/tdesudo.SlackBuild | 16 +- Apps/tdmtheme/tdmtheme.SlackBuild | 16 +- Apps/yakuake/yakuake.SlackBuild | 10 +- BUILD-TDE.sh | 12 +- Core/tde-i18n/tde-i18n-en_GB-patch | 14 +- Core/tde-i18n/tde-i18n.SlackBuild | 19 +-- Deps/tqca-tls/tqca-tls.SlackBuild | 4 +- README.md | 31 ++-- get-source.sh | 140 ++++++++++-------- 25 files changed, 387 insertions(+), 191 deletions(-) diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild index 298d3fa..ca5c3cc 100755 --- a/Apps/abakus/abakus.SlackBuild +++ b/Apps/abakus/abakus.SlackBuild @@ -33,10 +33,12 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, set support for additional language(s) as per I18N variable # but only for languages available with this package +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang.po";done -sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt [[ $langs != "" ]] && TRANS=ON ## for slack-desc langs=$(echo $langs|sed "s|.po||g") diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild index 3e144d4..31ce333 100755 --- a/Apps/dolphin/dolphin.SlackBuild +++ b/Apps/dolphin/dolphin.SlackBuild @@ -33,12 +33,15 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, set support for additional language(s) as per I18N variable # but only for languages available with this package +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang.po";done -sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt -langs=$(echo $langs|sed "s|.po||g") +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt [[ $langs != "" ]] && TRANS=ON +## for slack-desc +langs=$(echo $langs|sed "s|.po||g") listdocs_fn diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild index 921b380..da0c442 100755 --- a/Apps/kaffeine/kaffeine.SlackBuild +++ b/Apps/kaffeine/kaffeine.SlackBuild @@ -37,7 +37,7 @@ untar_fn # but only for languages available with this package langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang.po";done ## this GLOB overrides 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake +sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake [[ $langs != "" ]] && TRANS=ON && langs=$(echo $langs | sed "s|.po||g") listdocs_fn @@ -76,7 +76,7 @@ make_fn installdocs_fn -[[ $TDEVERSION != 14.0.7 ]] && mangzip_fn +mangzip_fn strip_fn diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild index d5247ba..3618b3c 100755 --- a/Apps/kbfx/kbfx.SlackBuild +++ b/Apps/kbfx/kbfx.SlackBuild @@ -37,7 +37,7 @@ untar_fn # 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 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake +sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") [[ $langs != "" ]] && TRANS=ON diff --git a/Apps/kkbswitch/kkbswitch.SlackBuild b/Apps/kkbswitch/kkbswitch.SlackBuild index 0148d5d..db8ac94 100755 --- a/Apps/kkbswitch/kkbswitch.SlackBuild +++ b/Apps/kkbswitch/kkbswitch.SlackBuild @@ -33,18 +33,40 @@ 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 +## https://mirror.git.trinitydesktop.org/cgit/kkbswitch, commit d8aff77 +[[ $TDEVERSION == 14.0.8 ]] && { +patch -N -p0 << EOF || true +--- kkbswitch/CMakeLists.txt ++++ kkbswitch/CMakeLists.txt +# Install the translated kkbswitch.desktop file to default XDG_APPS_INSTALL_DIR +@@ -48,4 +48 @@ +-tde_create_translated_desktop( +- SOURCE \${PROJECT_NAME}.desktop +- DESTINATION \${AUTOSTART_INSTALL_DIR} +-) ++tde_create_translated_desktop( \${PROJECT_NAME}.desktop ) +# Install the translated kkbswitch.desktop file to AUTOSTART_INSTALL_DIR +@@ -54,2 +51,2 @@ +- FILES \${PROJECT_NAME}.desktop +- DESTINATION \${APPS_INSTALL_DIR}/Utilities ++ FILES \${CMAKE_CURRENT_BINARY_DIR}/\${PROJECT_NAME}.desktop ++ DESTINATION \${AUTOSTART_INSTALL_DIR} +EOF +} ## 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 +# for 14.0.8, set support for additional language(s) as per I18N variable # but only for languages available with this package +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang.po";done -sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt -[[ $langs != "" ]] && TRANS=ON && langs=$(echo $langs | sed "s|.po||g") +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt +[[ $langs != "" ]] && TRANS=ON [[ $langs == *ru* || $langs == *uk* ]] && RU_UA=ON +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") listdocs_fn diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild index bf7fcf2..55035f4 100755 --- a/Apps/knetstats/knetstats.SlackBuild +++ b/Apps/knetstats/knetstats.SlackBuild @@ -33,11 +33,19 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, 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 translations/$Lang ]] && langs="$langs $Lang/messages/$PRGNAM.po";done -sed -i "s|\${po_files}|$langs|" translations/CMakeLists.txt && \ +sed -i "s|\${po_files}|$langs|" translations/CMakeLists.txt +## for slack-desc langs=$(echo $langs|sed "s|/messages/$PRGNAM.po||g") +# +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +## for slack-desc +[[ $TDEVERSION != 14.0.8 ]] && { +langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$Lang $langs";done +} [[ $langs != "" ]] && TRANS=ON listdocs_fn diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild index d921111..3a33ee3 100755 --- a/Apps/knights/knights.SlackBuild +++ b/Apps/knights/knights.SlackBuild @@ -33,18 +33,24 @@ getsource_fn untar_fn +# for 14.0.8, set support for additional language(s) as per I18N variable +# but only for languages available with this package +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages +# # 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 -cp $SRCDIR/es.po po || true +# the included es.po file is a Google translation - if you don't want to use it, +# then comment out the following line: +cp $SRCDIR/es.po ${PO_PATH:-po} # -# 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 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake -langs=$(echo $langs | sed "s|.po||g") +langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done +# +## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt: +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake [[ $langs != "" ]] && TRANS=ON +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") listdocs_fn diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild index 0bbd063..55dbc65 100755 --- a/Apps/knmap/knmap.SlackBuild +++ b/Apps/knmap/knmap.SlackBuild @@ -33,13 +33,19 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, 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 -## this GLOB overrides 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake -langs=$(echo $langs | sed "s|.po||g") +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages +# +langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done +# +## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt: +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake [[ $langs != "" ]] && TRANS=ON +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") listdocs_fn diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild index 3f80a9e..ddf355c 100755 --- a/Apps/kscope/kscope.SlackBuild +++ b/Apps/kscope/kscope.SlackBuild @@ -33,20 +33,29 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, 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') +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages +# +langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done +# +## for 14.0.8 autotools build: +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am +[[ $langs != "" ]] && TRANS=ON +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") listdocs_fn -ltoolupdate_fn +[[ $TDEVERSION == 14.0.8 ]] && ltoolupdate_fn chown_fn cd_builddir_fn +[[ $TDEVERSION == 14.0.8 ]] && { CFLAGS="$SLKRCFLAGS" \ CXXFLAGS="$SLKRCFLAGS" \ CC=$COMPILER \ @@ -54,11 +63,28 @@ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ --disable-rpath +} || { +cmake \ + -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ + -DCMAKE_C_COMPILER=$COMPILER \ + -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ + -DMAN_INSTALL_DIR=$INSTALL_TDE/man \ + -DWITH_GCC_VISIBILITY="OFF" \ + -DBUILD_DOC="ON" \ + -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ + -Wno-dev \ + .. +} make_fn installdocs_fn +[[ $TDEVERSION != 14.0.8 ]] && mangzip_fn + strip_fn mkdir_install_fn diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild index e52ac6b..e4046a7 100755 --- a/Apps/ksensors/ksensors.SlackBuild +++ b/Apps/ksensors/ksensors.SlackBuild @@ -33,13 +33,19 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, 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 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake -langs=$(echo $langs | sed "s|.po||g") +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages +# +langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done +# +## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt: +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake [[ $langs != "" ]] && TRANS=ON +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") listdocs_fn diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild index 38f0f58..41f8e07 100755 --- a/Apps/kshutdown/kshutdown.SlackBuild +++ b/Apps/kshutdown/kshutdown.SlackBuild @@ -35,18 +35,31 @@ 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 +# +[[ $TDEVERSION == 14.0.8 ]] && { +langs="";for Lang in $I18N;do [[ -e po/$Lang.po ]] && langs="$langs $Lang.po";done ## this GLOB overrides 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake -langs=$(echo $langs | sed "s|.po||g") -[[ $langs != "" ]] && TRANS=ON - -## always build 'en' docs ... -langdoc="kshutdown man" +sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake +# +## always build 'en' [==kshutdown] docs ... +ldocs="kshutdown man" +} || { +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +## langs= for slack-desc only .. +langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done +ldocs="en man" +} +# ## ... and find other html docs required and available ... -for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done +for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done ## ... and edit tde_auto_add_subdirectories GLOB: -sed -i "s|} \* )|} $langdoc )|" cmake/modules/TDEMacros.cmake +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|} \* )|} $ldocs )|" cmake/modules/TDEMacros.cmake +# +[[ $langs != "" ]] && TRANS=ON +# +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") +ldocs=$(echo $ldocs | sed "s|kshutdown|en|;s| man||") listdocs_fn @@ -95,7 +108,7 @@ $PRGNAM: With language support for: $PRGNAM: en $langs $PRGNAM: $PRGNAM: and help documentation for: -$PRGNAM: $(echo $langdoc | sed 's|kshutdown|en|;s| man||') +$PRGNAM: $ldocs $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index bc5db95..d236370 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -33,13 +33,19 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, 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 -## this GLOB overrides 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake -langs=$(echo $langs | sed "s|.po||g") +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages +# +langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done +# +## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt: +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake [[ $langs != "" ]] && TRANS=ON +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") listdocs_fn diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild index f971418..a62f925 100755 --- a/Apps/kvpnc/kvpnc.SlackBuild +++ b/Apps/kvpnc/kvpnc.SlackBuild @@ -33,27 +33,35 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, 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 +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages +## for cgit, this lang variable is only used for slack-desc +langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done +# +## for cgit, translations are generated via LINGUAS variable +[[ $TDEVERSION == 14.0.8 ]] && { ## this GLOB overrides 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake -langs=$(echo $langs | sed "s|.po||g") -[[ $langs != "" ]] && TRANS=ON - +sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake +# ## set up doc/CMakeLists.txt as per other apps ## to make compatible with the following docs routine echo "tde_auto_add_subdirectories( )" > doc/CMakeLists.txt - -## always build 'en' docs ... -ldocs="en tdeioslave man misc" +} +## always build en_US docs ... +ldocs="en man misc tdeioslave" ## ... and find other html docs required and available ... for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done ## ... and edit tde_auto_add_subdirectories GLOB: -sed -i "s|} \* )|} $ldocs )|" cmake/modules/TDEMacros.cmake -## .. then set ldocs for slack-desc +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|} \* )|} $ldocs )|" cmake/modules/TDEMacros.cmake +# +[[ $langs != "" ]] && TRANS=ON +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") ldocs=$(echo $ldocs | sed "s| man misc||") - +# ## add misc docs MISC_FILES=$(cd doc/misc/;ls README* pptp.txt) cat << EOF > doc/misc/CMakeLists.txt @@ -63,6 +71,9 @@ INSTALL( COMPONENT doc ) EOF +## this will only work for cgit +## substituting tde_auto_add_subdirectories( ) above covers the 14.0.8 case +sed -i 's|add_subdirectory( tdeioslave )|&\nadd_subdirectory( misc )|' doc/CMakeLists.txt chown_fn @@ -83,11 +94,7 @@ cmake \ make_fn -installdocs_fn -for file in $(ls -1 ../doc | grep -vE "compile|Makefile|CMakeLists.txt") -do -cp ../doc/$file $PKG$INSTALL_TDE/doc/$PRGNAM-$VERSION/ 2>/dev/null || true -done +#installdocs_fn # not required - docs installed with cmake mangzip_fn diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild index 21c8c44..a5eb3a8 100755 --- a/Apps/potracegui/potracegui.SlackBuild +++ b/Apps/potracegui/potracegui.SlackBuild @@ -33,22 +33,31 @@ getsource_fn untar_fn -patch -p0 < $SRCDIR/reformat-message.patch +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages/ +sed "s|po/|${PO_PATH:-po/}|" $SRCDIR/reformat-message.patch | patch -p0 -# set support for additional language(s) as per I18N variable +# for 14.0.8, 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 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake -langs=$(echo $langs | sed "s|.po||g") +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages +# +langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done +# +## for cgit, translations are generated via LINGUAS variable +## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt: +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake [[ $langs != "" ]] && TRANS=ON - +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") +# ## always build 'en' docs ... -langdoc="en man" +ldocs="en man" ## ... and find other html docs required and available ... -for Lang in $I18N;do [[ -d doc/$Lang ]] && langdoc="$langdoc $Lang";done +for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done ## ... and edit tde_auto_add_subdirectories GLOB: -sed -i "s|} \* )|} $langdoc )|" cmake/modules/TDEMacros.cmake +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s|} \* )|} $ldocs )|" cmake/modules/TDEMacros.cmake +ldocs=$(echo $ldocs | sed 's| man||') listdocs_fn @@ -95,7 +104,7 @@ $PRGNAM: With language support for: $PRGNAM: en $langs $PRGNAM: $PRGNAM: With help documentation for: -$PRGNAM: $(echo $langdoc | sed 's| man||') +$PRGNAM: $ldocs $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild index 6c70e48..bb9ac23 100755 --- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild +++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild @@ -33,11 +33,45 @@ getsource_fn untar_fn +## errors: +##common/config_file.c:1611:57: warning: invalid suffix on literal; C++11 requires a space between literal and string macro [-Wliteral-suffix] +## filename=TQFile::decodeName(cfgDir)+"../"OLD_CONFIG_FILE; +## ^ +## and more .. +patch -N -p0 << EOF || true +--- common/config_file.c ++++ common/config_file.c +@@ -1611 +1611 @@ +- filename=TQFile::decodeName(cfgDir)+"../"OLD_CONFIG_FILE; ++ filename=TQFile::decodeName(cfgDir)+"../" OLD_CONFIG_FILE; +@@ -2303 +2303 @@ +- static const char * constFiles[]={ /*"/etc/qt4/"OLD_CONFIG_FILE, "/etc/qt3/"OLD_CONFIG_FILE, "/etc/qt/"OLD_CONFIG_FILE,*/ "/etc/"OLD_CONFIG_FILE, NULL }; ++ static const char * constFiles[]={ /*"/etc/qt4/"OLD_CONFIG_FILE, "/etc/qt3/"OLD_CONFIG_FILE, "/etc/qt/"OLD_CONFIG_FILE,*/ "/etc/" OLD_CONFIG_FILE, NULL }; +--- config/qtcurveconfig.cpp ++++ config/qtcurveconfig.cpp +@@ -802 +802 @@ +- TQStringList files(TDEGlobal::dirs()->findAllResources("data", "QtCurve/*"EXTENSION, false, true)); ++ TQStringList files(TDEGlobal::dirs()->findAllResources("data", "QtCurve/*" EXTENSION, false, true)); +@@ -1377,2 +1377,2 @@ +- i18n("*"EXTENSION"|QtCurve Settings Files\n" +- THEME_PREFIX"*"THEME_SUFFIX"|QtCurve TDE Theme Files"), ++ i18n("*" EXTENSION"|QtCurve Settings Files\n" ++ THEME_PREFIX"*" THEME_SUFFIX"|QtCurve TDE Theme Files"), +@@ -1387 +1387 @@ +- TQString file(KFileDialog::getSaveFileName(TQString::null, i18n("*"EXTENSION"|QtCurve Settings Files"), this)); ++ TQString file(KFileDialog::getSaveFileName(TQString::null, i18n("*" EXTENSION"|QtCurve Settings Files"), this)); +--- config/exportthemedialog.cpp ++++ config/exportthemedialog.cpp +@@ -67 +67 @@ +- TQString fileName(themeUrl->url()+"/"THEME_PREFIX+name+".themerc"); ++ TQString fileName(themeUrl->url()+"/" THEME_PREFIX+name+".themerc"); +EOF + # 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 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake +sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake langs=$(echo $langs | sed "s|.po||g") [[ $langs != "" ]] && TRANS=ON diff --git a/Apps/tdepowersave/tdepowersave.SlackBuild b/Apps/tdepowersave/tdepowersave.SlackBuild index 90ebcdc..cf6079e 100755 --- a/Apps/tdepowersave/tdepowersave.SlackBuild +++ b/Apps/tdepowersave/tdepowersave.SlackBuild @@ -58,7 +58,7 @@ ldocs="$ldocs $Lang" done # ## this GLOB overrides "LANG auto" in po/CMakeLists.txt: -sed -i "s|\*.po|$lpos|" cmake/modules/TDEMacros.cmake +sed -i "s| \*.po| $lpos|" cmake/modules/TDEMacros.cmake [[ $lpos != "" ]] && TRANS=ON listdocs_fn diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild index 19622a2..231c9a5 100755 --- a/Apps/tdesudo/tdesudo.SlackBuild +++ b/Apps/tdesudo/tdesudo.SlackBuild @@ -33,13 +33,19 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, 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 -## this GLOB overrides 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake -langs=$(echo $langs | sed "s|.po||g") +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages +# +langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done +# +## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt: +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake [[ $langs != "" ]] && TRANS=ON +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") listdocs_fn diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild index 351506f..37bac73 100755 --- a/Apps/tdmtheme/tdmtheme.SlackBuild +++ b/Apps/tdmtheme/tdmtheme.SlackBuild @@ -33,13 +33,19 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, 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 -## this GLOB overrides 'LANG auto' in po/CMakeLists.txt: -sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake -langs=$(echo $langs | sed "s|.po||g") +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +# +[[ $TDEVERSION != 14.0.8 ]] && PO_PATH=translations/messages +# +langs="";for Lang in $I18N;do [[ -s ${PO_PATH:-po}/$Lang.po ]] && langs="$langs $Lang.po";done +# +## for 14.0.8, this GLOB overrides 'LANG auto' in po/CMakeLists.txt: +[[ $TDEVERSION == 14.0.8 ]] && sed -i "s| \*.po| $langs|" cmake/modules/TDEMacros.cmake [[ $langs != "" ]] && TRANS=ON +## for slack-desc +langs=$(echo $langs | sed "s|.po||g") listdocs_fn diff --git a/Apps/yakuake/yakuake.SlackBuild b/Apps/yakuake/yakuake.SlackBuild index 7be2a08..3d52f37 100755 --- a/Apps/yakuake/yakuake.SlackBuild +++ b/Apps/yakuake/yakuake.SlackBuild @@ -33,11 +33,19 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable +# for 14.0.8, set support for additional language(s) as per I18N variable # but only for languages available with this package +# +[[ $TDEVERSION == 14.0.8 ]] && { langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/$PRGNAM.po";done sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt +## for slack-desc langs=$(echo $langs|sed "s|/$PRGNAM.po||g") +} || { +## for later versions, use the env variable LINGUAS=$I18N - set in BUILD-TDE.sh +## langs= for slack-desc only - translations are generated via LINGUAS variable +langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done +} [[ $langs != "" ]] && TRANS=ON listdocs_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index da4f5fb..b18c708 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -10,7 +10,7 @@ export TMPVARS=/tmp/build/vars 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 +## .. and if building 14.0.x/14.1.0, turn off cgit downloads [[ $(cat $TMPVARS/DL_CGIT) == yes ]] && echo \\Z0\\Zbno > $TMPVARS/DL_CGIT @@ -97,8 +97,9 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Version " --menu Set the version of TDE to be built. " \ -12 75 2 \ +12 75 3 \ "14.0.8" "the R14.0.8 release - source from archives" \ +"14.0.x" "r14.0.9 preview/wip - source from Trinity git" \ "cgit" "R14.1.0 development - source from Trinity git" \ 2> $TMPVARS/TDEVERSION @@ -602,7 +603,7 @@ $(cat $TMPVARS/READMEs)" \ rm -f $TMPVARS/DL_CGIT # place this here to facilitate testing for summary screen -[[ $(cat $TMPVARS/TDEVERSION) == cgit ]] && \ +[[ $(cat $TMPVARS/TDEVERSION) == cgit || $(cat $TMPVARS/TDEVERSION) == 14.0.x ]] && \ [[ $(grep -o [ACDLM][a-z]*/ $TMPVARS/TDEbuilds | sort | head -n1) != Misc/ ]] && { dialog --cr-wrap --no-shadow --colors --defaultno --title " TDE development build " --yesno \ " @@ -629,7 +630,7 @@ Create and/or update the git repositories local copies. #rm -f $TMPVARS/PRE_DOWNLOAD ## this is done at the head of this script [[ $(cat $TMPVARS/TDEVERSION) == 14.0.8 ]] && 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 +[[ $(cat $TMPVARS/TDEVERSION) == cgit || $(cat $TMPVARS/TDEVERSION) == 14.0.x ]] && 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.8 build case [[ $(cat $TMPVARS/DL_CGIT) != no ]] && { dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \ @@ -690,6 +691,9 @@ export ARCH=$(cat $TMPVARS/ARCH) # set again for the 'continue' option export TDE_MIRROR=${TDE_MIRROR:-https://mirror.ppa.trinitydesktop.org/trinity} export NUMJOBS=$(cat $TMPVARS/NUMJOBS) export I18N=$(cat $TMPVARS/I18N) +## for later versions, use the env variable LINGUAS to determine the supported locales - +## any of I18N not included in translations/... will be ignored - +[[ $TDEVERSION != 14.0.8 ]] && export LINGUAS=$I18N export TQT_OPTS=$(cat $TMPVARS/TQT_OPTS) export EXIT_FAIL=$(cat $TMPVARS/EXIT_FAIL) export KEEP_BUILD=$(cat $TMPVARS/KEEP_BUILD) diff --git a/Core/tde-i18n/tde-i18n-en_GB-patch b/Core/tde-i18n/tde-i18n-en_GB-patch index c5f8920..7adfe85 100644 --- a/Core/tde-i18n/tde-i18n-en_GB-patch +++ b/Core/tde-i18n/tde-i18n-en_GB-patch @@ -1,13 +1,19 @@ +## this patch needs some context to avoid unwanted patching at offsets for the git builds --- tde-i18n-en_GB/messages/tdebase/libkickermenu_prefmenu.po +++ tde-i18n-en_GB/messages/tdebase/libkickermenu_prefmenu.po -@@ -35 +34,0 @@ +@@ -34,3 +34,2 @@ + #: prefmenu.cpp:248 -#, fuzzy + msgid "Trinity Control Center" --- tde-i18n-en_GB/messages/tdebase/khelpcenter.po +++ tde-i18n-en_GB/messages/tdebase/khelpcenter.po -@@ -36 +35,0 @@ +@@ -35,3 +35,2 @@ + #: application.cpp:63 -#, fuzzy -@@ -41 +39,0 @@ + msgid "Trinity Help Center" +@@ -40,5 +39,4 @@ + #: application.cpp:65 navigator.cpp:476 -#, fuzzy -@@ -43 +41 @@ + msgid "The Trinity Help Center" -msgstr "The TDE Control Centre" +msgstr "The TDE Help Centre" diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 112c2b1..2a70680 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -35,27 +35,22 @@ getsource_fn ## extract, build, and remove source for each language package one at a time cd $TMP_BUILD/tmp-$PRGNAM -[[ $TDEVERSION == *14.0.? ]] && { -[[ $TDEVERSION == r14.0.? ]] && SNAPSHOT=-$TDEVERSION || SNAPSHOT=-trinity-$TDEVERSION +[[ $TDEVERSION == 14.0.8 ]] && { # extract the cmake source once only echo -e "\033[39;1m" -echo "Extracting the cmake source from the $(basename $SOURCE) archive ..." +echo "Extracting the cmake source from $(basename $SOURCE) ..." echo -e "\033[0m" -tar xf $SOURCE $PRGNAM${SNAPSHOT:-}/cmake -[[ $TDEVERSION == r14.0.? ]] && { -## copy cmake contents to cmake directory -tar xf $SRCDIR/../../src/cmake-$TDEVERSION.$ARCHIVE_TYPE --strip-components=1 -C $PRGNAM${SNAPSHOT:-}/cmake -} +tar xf $SOURCE $PRGNAM-trinity-$TDEVERSION/cmake } for lang in $I18N do -[[ $TDEVERSION == *14.0.? ]] && { +[[ $TDEVERSION == 14.0.8 ]] && { # extract the source for one language at a time for each iteration of the loop echo -e "\033[39;1m" -echo "Extracting the $PRGNAM-$lang source from the $(basename $SOURCE) archive ..." +echo "Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ..." echo -e "\033[0m" -tar -xf $SOURCE $PRGNAM${SNAPSHOT:-}/$PRGNAM-$lang +tar -xf $SOURCE $PRGNAM-trinity-$TDEVERSION/$PRGNAM-$lang cd $PRGNAM* true # don't go to cgit if extracting fails @@ -70,7 +65,7 @@ cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/tde-i18n-$lang/) } ## language specific patches -patch -p0 < $SRCDIR/tde-i18n-$lang-patch || true # continue if patch file doesn't exist +patch -N -p0 < $SRCDIR/tde-i18n-$lang-patch || true # continue if patch file doesn't exist chown_fn diff --git a/Deps/tqca-tls/tqca-tls.SlackBuild b/Deps/tqca-tls/tqca-tls.SlackBuild index 0d4057a..52014dd 100755 --- a/Deps/tqca-tls/tqca-tls.SlackBuild +++ b/Deps/tqca-tls/tqca-tls.SlackBuild @@ -42,8 +42,8 @@ chown_fn ## add TQt headers directory to configure search list sed -i "s|/usr/include/tqt|$TQTDIR/include/tqt|" configure -## QTDIR is needed for 14.0.7 because configure can't find tqmake -## from its algorithm - ignored for cgit which needs TQTDIR +## QTDIR is needed for 14.0.? because configure can't find tqmake +## from its algorithm - ignored for 14.1.0 which needs TQTDIR ## which has been set as a shell variable in BUILD-TDE.sh QTDIR=$TQTDIR \ CXXFLAGS="$SLKRCFLAGS" \ diff --git a/README.md b/README.md index fab1f65..77bc31d 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ --- ***Build TDE [Trinity Desktop Environment]*** -for Slackware 14.2 or current on i586+ and x86_64. -See 'Cross compiling for RPi3' for armv7/aarch64 builds. The README for a native build for Raspberry Pi3 [[README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)] is now rather dated and cross compiling is preferred. +.. for Slackware 14.2 or current on i586+ and x86_64. +.. see 'Cross compiling for RPi3' for building for armv7/aarch64. -Build the release version R14.0.8 from tar archives; or the development version R14.1.0 from trinitydesktop cgit. +Build the release version 14.0.8 from tar archives; or the development versions 14.0.9, 14.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) @@ -14,19 +14,19 @@ For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series 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. -This is a global option so can't be used where the build list includes packages requiring dependencies that haven't been installed. +This is a global option so can't be used where the build list includes packages which will be dependencies for other packages in the build list. Any package, or set of packages, can be selected in the 'TDE Packages Selection' screen. Information about dependencies for some packages has been added at the bottom of the dialog screen. -R14.0.8 source archives will be downloaded from a geoIP located mirror site, or the development sources [R14.1.0] cloned or updated from cgit. +14.0.8 source archives will be downloaded from a geoIP located mirror site, or the development sources [14.0.9/14.1.0] cloned or updated from cgit. Downloading can be done pre-build [useful for an off-line build], or during the build. 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). --- -There are other command line options that can be used to set some build parameters: +***Other command line options*** that can be used to set some build parameters: * TDE_MIRROR= - override the trinitydesktop.org geoIP redirector to use https - example, *https://mirrorservice.org/sites/trinitydesktop.org/trinity*. URLs @ https://www.trinitydesktop.org/mirrorstatus.php * BUILD= - sets the package build identifier, overriding the SlackBuild default of 1 * USE_CMAKE_MM=yes - to build tdemultimedia with cmake - see Core/tdemultimedia/README. @@ -73,13 +73,15 @@ 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. +Additionally for the development builds, translations for the .desktop files are determined from the LINGUAS variable which is set in this build shell to the additional languages selected. + 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. --- -***Building the development version from git sources*** +***Building the development versions 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. @@ -98,7 +100,7 @@ cd tde-slackbuilds git checkout gh-pages ``` -or @ https://ray-v.github.io/tde-slackbuilds/cross-compiling-TDE-for-the-RPi3.html +which can be viewed [online](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, @@ -111,10 +113,6 @@ Includes: --- -See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more information - ---- - ***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. @@ -123,6 +121,13 @@ See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more infor [3] 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. -[4] The tdeedu build with kalzium equation solver needs ocaml and facile pre-downloaded to the 'src' directory. +[4] The README for a native build for Raspberry Pi3 [[README-Raspberry-Pi3.md](./README-Raspberry-Pi3.md)] is now rather dated and cross compiling is preferred. + +[5] Building the kalzium equation solver needs ocaml and facile installed. They will be built, packaged, and installed during the tdeedu build if the source archives are pre-downloaded to the 'src' directory. https://github.com/ocaml/ocaml/archive/4.05.0.tar.gz http://www.recherche.enac.fr/opti/facile/distrib/facile-1.1.3.tar.gz + +--- + +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 c33bcdd..bd6c512 100755 --- a/get-source.sh +++ b/get-source.sh @@ -67,27 +67,8 @@ rm -rf $OUTPUT/{checkout,configure,make,install,error,makepkg,patch}-$PRGNAM.log # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd) -## if snapshot, need to change some variables: -[[ $TDEVERSION == r14.0.6 && ! $TDEMIR_SUBDIR == misc ]] && \ -ARCHIVE_TYPE=tar.gz && \ -SRCURL=https://mirror.git.trinitydesktop.org/cgit/$PRGNAM/snapshot/$PRGNAM-$TDEVERSION.$ARCHIVE_TYPE && \ -( -## download admin/cmake/libltdl/libtdevnc as prerequisites -cd $SRCDIR/../../src/ -echo 'admin -cmake -libltdl -libtdevnc' | while read line -do -[[ ! -s $line-$TDEVERSION.$ARCHIVE_TYPE && ! $line == libtdevnc ]] && \ -wget https://mirror.git.trinitydesktop.org/cgit/$line/snapshot/$line-$TDEVERSION.$ARCHIVE_TYPE -[[ ! -s $line-r14.0.1.$ARCHIVE_TYPE && $line == libtdevnc ]] && \ -wget https://mirror.git.trinitydesktop.org/cgit/$line/snapshot/$line-r14.0.1.$ARCHIVE_TYPE -done -) - -## if [r]14.0.? or misc, download archive: -[[ $TDEVERSION == *14.0.? || $TDEMIR_SUBDIR == misc ]] && { +## if 14.0.8 or misc, download archive: +[[ $TDEVERSION == 14.0.8 || $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 @@ -131,8 +112,7 @@ if [ "$P1" == "--download" ]; then 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, +## otherwise, not R14.0.8 or misc, and we are creating/updating git, ## so [1] start with admin/cmake: [[ $(cat $TMPVARS/DL_CGIT) == yes ]] && { cd $BUILD_TDE_ROOT/src/cgit @@ -143,12 +123,15 @@ cd $BUILD_TDE_ROOT/src/cgit (echo "Updating admin ..." cd admin git checkout -- * -git pull) +git pull +## repo is in master - update r14.0.x to latest revision +git fetch origin r14.0.x:r14.0.x) [[ -d cmake ]] && \ (echo "Updating cmake ..." cd cmake git checkout -- * -git pull) +git pull +git fetch origin r14.0.x:r14.0.x) ## if admin and cmake don't exist, clone them [[ ! -d admin ]] && git clone https://mirror.git.trinitydesktop.org/cgit/admin admin @@ -167,7 +150,8 @@ touch $TMPVARS/admin-cmake-done (echo "Updating $PRGNAM ..." cd $PRGNAM git checkout -- * -git pull) +git pull +git fetch origin r14.0.x:r14.0.x) ## if the local repository for PRGNAM doesn't exist, clone it .. [[ ! -d $PRGNAM ]] && \ git clone https://mirror.git.trinitydesktop.org/cgit/$PRGNAM @@ -178,25 +162,28 @@ git clone https://mirror.git.trinitydesktop.org/cgit/$PRGNAM (echo "Updating libltdl ..." cd libltdl git checkout -- * -git pull) +git pull +git fetch origin r14.0.x:r14.0.x) [[ ! -d libltdl ]] && \ git clone https://mirror.git.trinitydesktop.org/cgit/libltdl } -## if tdenetwork, need libtdevnc +## if tdenetwork, need libtdevnc, but not yet for 14.0.x==14.0.9 which uses krfb/libvncserver [[ " tdenetwork " == *$PRGNAM* ]] && { [[ -d libtdevnc ]] && \ (echo "Updating libtdevnc ..." cd libtdevnc git checkout -- * -git pull) +git pull +# git fetch origin r14.0.x:r14.0.x +) [[ ! -d libtdevnc ]] && \ git clone https://mirror.git.trinitydesktop.org/cgit/libtdevnc } -true # stop the following i18n download (attempts) if this routine fails and i18n not required +true # prevent the following i18n download (attempts) if this routine fails } || \ { ## still creating/updating git @@ -212,6 +199,8 @@ rm -rf cgit/tde-i18n/plain/tde-i18n-$lang wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/tde-i18n-$lang/ ##will download the tde-i18n-$lang files to: ##$BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/tde-i18n-$lang/* +## remove admin and cmake links which are downloaded as files +rm cgit/tde-i18n/plain/tde-i18n-$lang/{admin,cmake} cd .. done } @@ -252,49 +241,78 @@ cd $TMP_BUILD/tmp-$PRGNAM ## ## [1] firstly test for R14 or misc .. ## -[[ $TDEVERSION == 14.0.? || $TDEMIR_SUBDIR == misc ]] && { +[[ $TDEVERSION == 14.0.8 || $TDEMIR_SUBDIR == misc ]] && { + ## unpack R14 or misc echo -e "\n unpacking $(basename $SOURCE) ... \n" tar -xf $SOURCE -true # if this fails, go to [4] and let SlackBuild fail from there + +: # if this fails, don't try a git build, and go to [3] + } || { -## -## [2] not R14 nor misc - is it r14 snapshot? -## -[[ $TDEVERSION == r14.0.? ]] && { -## unpack r14 -echo -e "\n unpacking $(basename $SOURCE) ... \n" -tar -xf $SOURCE -## unpack all needed common sources .. -(cd $PRGNAM-$TDEVERSION -echo 'admin -cmake -libltdl -libtdevnc' | while read line -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 # if this fails, go to [4] and let SlackBuild fail from there + +## [2] not 14.0.8 nor misc, so must be git .. +## but is it [2a] 14.0.x .. +[[ $TDEVERSION == 14.0.x ]] && { + +## copy git r14.0.x content to build area: +( +cd $BUILD_TDE_ROOT/src/cgit/$PRGNAM/ +echo -e "\n copying $PRGNAM git sources to build area ... \n" +## remove any old .git/worktrees records - only being used here as a build source +rm -rf .git/worktrees/* +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ r14.0.x + +## work-around for some cr*p in admin in the r14.0.x branch of tdeio-locate +## it's a cmake build, so admin isn't needed +[[ $PRGNAM != tdeio-locate ]] && { +cd ../admin +echo -e "\n copying admin git sources to build area ... \n" +rm -rf .git/worktrees/* +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/admin/ r14.0.x +} + +cd ../cmake +echo -e "\n copying cmake git sources to build area ... \n" +rm -rf .git/worktrees/* +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/cmake/ r14.0.x + +[[ " arts tdelibs " == *$PRGNAM* ]] && { +cd ../libltdl +echo -e "\n copying libltdl git sources to build area ... \n" +rm -rf .git/worktrees/* +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/libltdl/ r14.0.x +} + +[[ " tdenetwork " == *$PRGNAM* && $TDEVERSION != 14.0.x ]] && { +cd ../libtdevnc/ +echo -e "\n copying libtdevnc git sources to build area ... \n" +rm -rf .git/worktrees/* +git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/libtdevnc/ r14.0.x +} +echo # if this fails, SlackBuild will fail from [3] ) } -} || { -## -## [3] not [rR]14 nor misc, so must be cgit .. + +## .. or [2b] 14.1.0 .. +[[ $TDEVERSION == cgit ]] && { ## copy git repo but don't copy .git directory: -echo -e "\n copying $PRGNAM source files to build area ... \n" +echo -e "\n copying $PRGNAM git sources to build area ... \n" (cd $BUILD_TDE_ROOT/src/cgit cp -a --parents $PRGNAM/* $TMP_BUILD/tmp-$PRGNAM/ cp -a --parents {admin,cmake}/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ -[[ " arts tdelibs " == *$PRGNAM* ]] && cp -a --parents libltdl/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ || true -[[ " tdenetwork " == *$PRGNAM* ]] && cp -a --parents libtdevnc/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ || true) -} && { -## -## [4] finally, cd into source directory -## -cd $PRGNAM* +[[ " arts tdelibs " == *$PRGNAM* ]] && cp -a --parents libltdl/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ +[[ " tdenetwork " == *$PRGNAM* ]] && cp -a --parents libtdevnc/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ +# +echo # if this fails, SlackBuild will fail from [3] +) } } +# +## [3] finally, cd into source directory +# +cd $PRGNAM* +} listdocs_fn () {