From 7b7367d4a48c95e158f49f23e75c1cddba56cec7 Mon Sep 17 00:00:00 2001
From: Ray-V <ray-v@inbox.lv>
Date: Tue, 28 Apr 2020 10:44:15 +0100
Subject: [PATCH] Updated for release 14.0.8

---
 Apps/abakus/abakus.SlackBuild                 |  17 +--
 Apps/amarok/amarok.SlackBuild                 |   1 -
 Apps/dolphin/dolphin.SlackBuild               |   7 +-
 Apps/filelight/filelight.SlackBuild           |  24 ++--
 Apps/kaffeine/kaffeine.SlackBuild             |  31 -----
 Apps/kbfx/kbfx.SlackBuild                     |  16 +--
 Apps/kbookreader/kbookreader.SlackBuild       |   7 +-
 Apps/kkbswitch/kkbswitch.SlackBuild           |   6 +-
 Apps/knemo/knemo.SlackBuild                   |   3 +
 Apps/knights/knights.SlackBuild               |   2 +-
 Apps/knmap/knmap.SlackBuild                   |  15 ++-
 Apps/ksensors/ksensors.SlackBuild             |   2 +-
 Apps/kshutdown/kshutdown.SlackBuild           |   2 +-
 Apps/kvkbd/kvkbd.SlackBuild                   |  17 ++-
 Apps/kvpnc/kvpnc.SlackBuild                   |  28 +++--
 Apps/potracegui/potracegui.SlackBuild         |   2 +-
 .../tde-style-lipstik.SlackBuild              |  13 +-
 .../tde-style-qtcurve.SlackBuild              |   6 +-
 Apps/tdesudo/tdesudo.SlackBuild               |   4 +-
 Apps/tdmtheme/tdmtheme.SlackBuild             |  15 ++-
 BUILD-TDE.sh                                  |  18 +--
 Core/tde-i18n/tde-i18n-en_GB-patch            |   9 ++
 Core/tdeedu/README                            |  11 +-
 Core/tdeedu/tdeedu.SlackBuild                 | 116 +++++++++---------
 Core/tdegraphics/tdegraphics.SlackBuild       |   2 -
 Core/tdelibs/tdelibs.SlackBuild               |  16 +--
 Core/tdenetwork/tdenetwork.SlackBuild         |   2 +-
 Core/tdewebdev/README                         |   2 +
 Core/tdewebdev/tdewebdev.SlackBuild           |   2 +-
 Deps/tqt3/tqt3.SlackBuild                     |   2 +-
 README.md                                     |  16 ++-
 get-source.sh                                 |   2 +-
 32 files changed, 214 insertions(+), 202 deletions(-)
 create mode 100644 Core/tdewebdev/README

diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild
index 4246a10..298d3fa 100755
--- a/Apps/abakus/abakus.SlackBuild
+++ b/Apps/abakus/abakus.SlackBuild
@@ -33,22 +33,13 @@ getsource_fn
 
 untar_fn
 
-## add check for mpfr installed to set HAVE_MPFR, otherwise even if it is installed, abakus won't be built with mpfr
-sed -i 's|HAVE_INOTIFY )|HAVE_INOTIFY )\ncheck_include_file( mpfr.h HAVE_MPFR )|' ConfigureChecks.cmake
-## the linker can't find 'gmp' although it can find 'mpfr' and fails with:
-## [100%] Linking CXX executable abakus c++: error: gmp: No such file or directory
-## As libgmp is linked through libmpfr, do we really need libgmp here?
-sed -i 's|mpfr gmp|mpfr -lgmp|' src/CMakeLists.txt
-
-## set installation directory for abakus.desktop file
-sed -i 's|DESTINATION ${APPS_INSTALL_DIR}/Utilities|DESTINATION ${XDG_APPS_INSTALL_DIR}|' src/CMakeLists.txt
-
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
-langs="";for Lang in $I18N;do [[ -d po/$Lang ]] && langs="$langs $Lang/$PRGNAM.po";done
-sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt
-langs=$(echo $langs|sed "s|/$PRGNAM.po||g")
+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
+## for slack-desc
+langs=$(echo $langs|sed "s|.po||g")
 
 listdocs_fn
 
diff --git a/Apps/amarok/amarok.SlackBuild b/Apps/amarok/amarok.SlackBuild
index d18b653..9174f5d 100755
--- a/Apps/amarok/amarok.SlackBuild
+++ b/Apps/amarok/amarok.SlackBuild
@@ -114,7 +114,6 @@ cmake \
     -DWITH_NJB="OFF" \
     -DWITH_OPENGL="ON" \
     -DWITH_POSTGRESQL="OFF" \
-    -DWITH_RIOKARMA="OFF" \
     -DWITH_SYSTEM_SQLITE="ON" \
     -DWITH_XINE=${XINE:-"OFF"} \
     -DWITH_YAUAP=${YAUAP:-"OFF"} \
diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild
index d60729b..3e144d4 100755
--- a/Apps/dolphin/dolphin.SlackBuild
+++ b/Apps/dolphin/dolphin.SlackBuild
@@ -35,10 +35,9 @@ untar_fn
 
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
-langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-## this GLOB overrides the one in po/CMakeLists.txt:
-sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake
-langs=$(echo $langs | sed "s|.po||g")
+langs="";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")
 [[ $langs != "" ]] && TRANS=ON
 
 listdocs_fn
diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/filelight/filelight.SlackBuild
index e7bd2f2..e42d467 100755
--- a/Apps/filelight/filelight.SlackBuild
+++ b/Apps/filelight/filelight.SlackBuild
@@ -34,28 +34,28 @@ getsource_fn
 
 untar_fn
 
-## remove help documentation build instruction from all [non-en] locales ...
-sed -i '/tde_create_handbook/,+3d' doc/??{,_??}/CMakeLists.txt || true
-#
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs="" # the *.po file list
-ldocs="" # the help docs
+ldocs="en man" # the help docs - en and man always
 for Lang in $I18N
 do
-[[ -d po/$Lang ]] && {
-langs="$langs $Lang/$PRGNAM.po"
-## ... and restore help documentation for the selected and available locales
-[[ -e doc/$Lang/CMakeLists.txt ]] && {
-echo "tde_create_handbook( LANG $Lang DESTINATION $PRGNAM )" >> doc/$Lang/CMakeLists.txt
+[[ -s translations/messages/$Lang.po ]] && {
+langs="$langs $Lang.po"
+## ... and within that loop as doc locale only exists where translation exists
+[[ -d doc/$Lang ]] && {
 ldocs="$ldocs $Lang"
 }
 }
 done
 #
-sed -i "s|\${po_files}|$langs|" po/CMakeLists.txt
-langs=$(echo $langs|sed "s|/$PRGNAM.po||g")
+sed -i "s|\${po_files}|$langs|" translations/messages/CMakeLists.txt
 [[ $langs != "" ]] && TRANS=ON
+#
+sed -i "s|\${_dirs}|$ldocs|" doc/CMakeLists.txt
+## for slack-desc
+langs=$(echo $langs|sed 's|.po||g')
+ldocs=$(echo $ldocs|sed 's| man||')
 
 listdocs_fn
 
@@ -107,7 +107,7 @@ $PRGNAM: With language support for:
 $PRGNAM: en $langs
 $PRGNAM:
 $PRGNAM: With help documentation for:
-$PRGNAM: en$ldocs
+$PRGNAM: $ldocs
 $PRGNAM:
 $PRGNAM:
 " > $PKG/install/slack-desc
diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild
index a18fff4..921b380 100755
--- a/Apps/kaffeine/kaffeine.SlackBuild
+++ b/Apps/kaffeine/kaffeine.SlackBuild
@@ -33,8 +33,6 @@ getsource_fn
 
 untar_fn
 
-[[ $TDEVERSION != 14.0.7 ]] && {
-
 # 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
@@ -74,35 +72,6 @@ cmake \
     -Wno-dev \
     ..
 
-: # don't go to autotools build if this fails - set exit 0 always
-
-} || {
-
-# set support for additional language(s) as per I18N variable
-# but only for languages available with this package
-langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
-langs=$(echo $langs | sed "s|.po||g")
-
-listdocs_fn
-
-ltoolupdate_fn
-
-chown_fn
-
-cd_builddir_fn
-
-CFLAGS="$SLKRCFLAGS" \
-CXXFLAGS="$SLKRCFLAGS" \
-CC=$COMPILER \
-CXX=$COMPILER_CXX \
-../configure \
-   --prefix=$INSTALL_TDE \
-   --disable-rpath \
-   --enable-closure
-
-}
-
 make_fn
 
 installdocs_fn
diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild
index 40eb1a3..d5247ba 100755
--- a/Apps/kbfx/kbfx.SlackBuild
+++ b/Apps/kbfx/kbfx.SlackBuild
@@ -40,10 +40,10 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po
 sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake
 langs=$(echo $langs | sed "s|.po||g")
 [[ $langs != "" ]] && TRANS=ON
-## only install html docs
-echo 'add_subdirectory( en )' > doc/CMakeLists.txt
 
-cd doc;listdocs_fn;cd ../
+## listdocs_fn - not required
+## install misc docs to ..
+sed -i '/SHARE_INSTALL_PREFIX/d;s|DESTINATION|& ${CMAKE_INSTALL_PREFIX}/doc/${PROJECT_NAME}-$ENV{TDEVERSION}|' doc/CMakeLists.txt
 
 chown_fn
 
@@ -83,17 +83,17 @@ echo "
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
        |-----handy-ruler------------------------------------------------------|
-$PRGNAM: KBFX is an alternative to the classical K-Menu button and its menu
+$PRGNAM: KBFX is an alternative to the classical K-Menu button and its menu.
+$PRGNAM: It enables the user to set a bigger (and thus more visible) start
+$PRGNAM: button and replaces the Win95-like K-Menu with the Spinx bar.
+$PRGNAM: The old menu is still available as an option.
+$PRGNAM:
 $PRGNAM:
 $PRGNAM: With language support for:
 $PRGNAM: en $langs
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
-$PRGNAM:
-$PRGNAM:
-$PRGNAM:
-$PRGNAM:
 " > $PKG/install/slack-desc
 
 makepkg_fn
diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild
index 3819de5..08e7d40 100755
--- a/Apps/kbookreader/kbookreader.SlackBuild
+++ b/Apps/kbookreader/kbookreader.SlackBuild
@@ -35,10 +35,9 @@ untar_fn
 
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
-langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-## this GLOB overrides the one in po/CMakeLists.txt:
-sed -i "s|\*.po|$langs|" cmake/modules/TDEMacros.cmake
-langs=$(echo $langs | sed "s|.po||g")
+langs="";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")
 [[ $langs != "" ]] && TRANS=ON
 
 listdocs_fn
diff --git a/Apps/kkbswitch/kkbswitch.SlackBuild b/Apps/kkbswitch/kkbswitch.SlackBuild
index 982102a..0148d5d 100755
--- a/Apps/kkbswitch/kkbswitch.SlackBuild
+++ b/Apps/kkbswitch/kkbswitch.SlackBuild
@@ -41,10 +41,8 @@ sed -i "s|/usr/share/doc/.*/HTML/en/kkbswitch/|$INSTALL_TDE/share/doc/tde/HTML/e
 
 # 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 the one 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 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")
 [[ $langs == *ru* || $langs == *uk* ]] && RU_UA=ON
 
diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild
index d641839..3e24fae 100755
--- a/Apps/knemo/knemo.SlackBuild
+++ b/Apps/knemo/knemo.SlackBuild
@@ -67,6 +67,9 @@ cmake \
     -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+    -DWITH_GCC_VISIBILITY="OFF" \
+    -DWITH_LIBIW="OFF" \
+    -DBUILD_DOC="ON" \
     -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
     -Wno-dev \
     ..
diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild
index 405f2a8..d921111 100755
--- a/Apps/knights/knights.SlackBuild
+++ b/Apps/knights/knights.SlackBuild
@@ -41,7 +41,7 @@ cp $SRCDIR/es.po po || true
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-## this GLOB overrides the one in po/CMakeLists.txt:
+## 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
diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild
index 1c4068f..0bbd063 100755
--- a/Apps/knmap/knmap.SlackBuild
+++ b/Apps/knmap/knmap.SlackBuild
@@ -33,6 +33,14 @@ getsource_fn
 
 untar_fn
 
+# set support for additional language(s) as per I18N variable
+# but only for languages available with this package
+langs="";for Lang in $I18N;do [[ -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")
+[[ $langs != "" ]] && TRANS=ON
+
 listdocs_fn
 
 chown_fn
@@ -48,6 +56,9 @@ cmake \
     -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+    -DWITH_GCC_VISIBILITY="OFF" \
+    -DBUILD_DOC="ON" \
+    -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
     -Wno-dev \
     ..
 
@@ -79,8 +90,8 @@ $PRGNAM:
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
-$PRGNAM:
-$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM: en $langs
 $PRGNAM:
 " > $PKG/install/slack-desc
 
diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild
index 1424a2b..e52ac6b 100755
--- a/Apps/ksensors/ksensors.SlackBuild
+++ b/Apps/ksensors/ksensors.SlackBuild
@@ -36,7 +36,7 @@ untar_fn
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-## this GLOB overrides the one in po/CMakeLists.txt:
+## 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
diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild
index 42067da..38f0f58 100755
--- a/Apps/kshutdown/kshutdown.SlackBuild
+++ b/Apps/kshutdown/kshutdown.SlackBuild
@@ -36,7 +36,7 @@ untar_fn
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-## this GLOB overrides the one in po/CMakeLists.txt:
+## 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
diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild
index 6d0bc83..bc5db95 100755
--- a/Apps/kvkbd/kvkbd.SlackBuild
+++ b/Apps/kvkbd/kvkbd.SlackBuild
@@ -33,8 +33,13 @@ getsource_fn
 
 untar_fn
 
-## set installation directory for kvkbd.desktop file
-[[ $TDEVERSION == 14.0.7 ]] && sed -i 's|DESTINATION ${APPS_INSTALL_DIR}/Utilities|DESTINATION ${XDG_APPS_INSTALL_DIR}|' src/CMakeLists.txt
+# 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")
+[[ $langs != "" ]] && TRANS=ON
 
 listdocs_fn
 
@@ -49,9 +54,9 @@ cmake \
     -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-    -DBUILD_DOC="ON" \
-    -DBUILD_TRANSLATIONS="OFF" \
     -DWITH_GCC_VISIBILITY="OFF" \
+    -DBUILD_DOC="ON" \
+    -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
     -Wno-dev \
     ..
 
@@ -81,8 +86,8 @@ $PRGNAM:               You should Add : HOME=/root kvkbd --loginhelper &
 $PRGNAM:               to Xsetup to run in xdm/tdm
 $PRGNAM:
 $PRGNAM:
-$PRGNAM:
-$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM: en $langs
 $PRGNAM:
 " > $PKG/install/slack-desc
 
diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild
index 986eb2c..f971418 100755
--- a/Apps/kvpnc/kvpnc.SlackBuild
+++ b/Apps/kvpnc/kvpnc.SlackBuild
@@ -36,21 +36,33 @@ untar_fn
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-## this GLOB overrides the one in po/CMakeLists.txt:
+## 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
 
-## set up doc/CMakeLists.txt as per all others
-## and make compatible with the following edit
-[[ $TDEVERSION == cgit ]] && echo "tde_auto_add_subdirectories( )" > doc/CMakeLists.txt
+## 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 ...
-langdoc="en man tdeioslave"
+ldocs="en tdeioslave man misc"
 ## ... 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
+sed -i "s|} \* )|} $ldocs )|" cmake/modules/TDEMacros.cmake
+## .. then set ldocs for slack-desc
+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
+INSTALL(
+    FILES $MISC_FILES
+    DESTINATION \${CMAKE_INSTALL_PREFIX}/doc/\${PROJECT_NAME}-\$ENV{TDEVERSION}
+    COMPONENT doc
+)
+EOF
 
 chown_fn
 
@@ -99,7 +111,7 @@ $PRGNAM: With language support for:
 $PRGNAM: en $langs
 $PRGNAM:
 $PRGNAM: and help documentation for:
-$PRGNAM: $(echo $langdoc | sed 's| man||')
+$PRGNAM: $ldocs
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild
index bd4a58f..21c8c44 100755
--- a/Apps/potracegui/potracegui.SlackBuild
+++ b/Apps/potracegui/potracegui.SlackBuild
@@ -38,7 +38,7 @@ patch -p0 < $SRCDIR/reformat-message.patch
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-## this GLOB overrides the one in po/CMakeLists.txt:
+## 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
diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild
index bd7c0e6..2aa59f8 100755
--- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild
+++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild
@@ -33,6 +33,13 @@ getsource_fn
 
 untar_fn
 
+# set support for additional language(s) as per I18N variable
+# but only for languages available with this package
+langs="";for Lang in $I18N;do [[ -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")
+[[ $langs != "" ]] && TRANS=ON
+
 listdocs_fn
 
 chown_fn
@@ -48,8 +55,8 @@ cmake \
     -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-    -DBUILD_TRANSLATIONS="ON" \
     -DWITH_GCC_VISIBILITY="OFF" \
+    -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
     -Wno-dev \
     ..
 
@@ -71,8 +78,8 @@ echo "
        |-----handy-ruler------------------------------------------------------|
 $PRGNAM: lipstik style for TDE
 $PRGNAM:
-$PRGNAM:
-$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM: en $langs
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild
index 78bf9a9..6c70e48 100755
--- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild
+++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild
@@ -36,7 +36,7 @@ untar_fn
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-## this GLOB overrides the one in po/CMakeLists.txt:
+## 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
@@ -79,8 +79,8 @@ echo "
        |-----handy-ruler------------------------------------------------------|
 $PRGNAM: QtCurve theme
 $PRGNAM:
-$PRGNAM:
-$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM: en $langs
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild
index ad96135..19622a2 100755
--- a/Apps/tdesudo/tdesudo.SlackBuild
+++ b/Apps/tdesudo/tdesudo.SlackBuild
@@ -35,8 +35,8 @@ untar_fn
 
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
-langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
-## this GLOB overrides the one in po/CMakeLists.txt:
+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")
 [[ $langs != "" ]] && TRANS=ON
diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild
index e2005e7..351506f 100755
--- a/Apps/tdmtheme/tdmtheme.SlackBuild
+++ b/Apps/tdmtheme/tdmtheme.SlackBuild
@@ -33,6 +33,14 @@ getsource_fn
 
 untar_fn
 
+# set support for additional language(s) as per I18N variable
+# but only for languages available with this package
+langs="";for Lang in $I18N;do [[ -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")
+[[ $langs != "" ]] && TRANS=ON
+
 listdocs_fn
 
 chown_fn
@@ -49,6 +57,9 @@ cmake \
     -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+    -DWITH_GCC_VISIBILITY="OFF" \
+    -DBUILD_DOC="ON" \
+    -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
     -Wno-dev \
     ..
 
@@ -75,8 +86,8 @@ $PRGNAM:
 $PRGNAM: Currently this module is installed in TDE Components found in the
 $PRGNAM: Trinity Control Center, under System Administration.
 $PRGNAM:
-$PRGNAM:
-$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM: en $langs
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh
index 9a1c823..da4f5fb 100755
--- a/BUILD-TDE.sh
+++ b/BUILD-TDE.sh
@@ -98,7 +98,7 @@ Set the version of TDE to be built.
  
 " \
 12 75 2 \
-"14.0.7" "the R14.0.7 release - source from archives" \
+"14.0.8" "the R14.0.8 release - source from archives" \
 "cgit" "R14.1.0 development - source from Trinity git" \
 2> $TMPVARS/TDEVERSION
 
@@ -257,7 +257,7 @@ dialog --cr-wrap --nocancel --no-shadow --colors --help-button --help-label "REA
 "
 The source unpacked is ~950MB, so to save on build space, the SlackBuild script extracts, builds, and removes source for each language package one at a time.
 
-If you can see the two 'y' like characters, then you've probably got a suitable terminal font installed and can choose \Zr\Z4\ZbUtf-8\Zb\Zn to display the language codes, otherwise choose \Z1A\Zb\Z0scii\Zn.
+If you can see the two 'y' like characters [che and gamma], then you've probably got a suitable terminal font installed and can choose \Zr\Z4\ZbUtf-8\Zb\Zn to display the language codes, otherwise choose \Z1A\Zb\Z0scii\Zn.
 
                             <<\Z3\Zb ҷ ɣ \Zn>>
 
@@ -440,17 +440,19 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TQt options " --item-
 "
 A minimal packaging of tqt3 will install only the run-time library required for TDE, and the headers and binaries required to build most of TDE.
 
-But tdepim, ksquirrel, and tdevelop need additional libraries. If you select minimal packaging and intend to build any of those at any time, select keeping their required libs now.
+But tdepim, ksquirrel, tdevelop, and ktorrent need additional libraries.
+If you select minimal packaging and intend to build any of those at any time, select keeping their required libs now.
 
 TQt html documentation is ~21M, and can be excluded from the package.
 
 mkspecs is only required for linux-g++
  
 " \
-25 75 5 \
+25 75 6 \
 " minimal" "Minimal packaging" off "\Zb\Z6 Exclude libs and binaries not required for TDE \Zn" \
 " pim_ksq" " ├─ Keep lib for tdepim and/or ksquirrel" off "\Zb\Z6 Only required if minimal build selected \Zn" \
-" tdevel" " └─ Keep libs for tdevelop" off "\Zb\Z6 Only required if minimal build selected \Zn" \
+" tdevel" " ├─ Keep libs for tdevelop" off "\Zb\Z6 Only required if minimal build selected \Zn" \
+" ktorrent" " └─ Keep designer libs for ktorrent" off "\Zb\Z6 Only required if minimal build selected \Zn" \
 " nodocs" "Exclude html documentation" on "\Zb\Z6  \Zn" \
 " mkspecs" "linux-g++ only" on "\Zb\Z6 Uncheck for the complete set \Zn" \
 2> $TMPVARS/TQT_OPTS
@@ -626,9 +628,9 @@ 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.7 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded."
+[[ $(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
-## testing for cgit!=no will allow =yes or null, which is the 14.0.7 build case
+## 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 \
 "
@@ -685,7 +687,7 @@ export COMPILER=$(cat $TMPVARS/COMPILER)
 [[ $COMPILER == gcc ]] && export COMPILER_CXX="g++" || export COMPILER_CXX="clang++"
 export SET_march=$(cat $TMPVARS/SET_MARCH)
 export ARCH=$(cat $TMPVARS/ARCH)	# set again for the 'continue' option
-export TDE_MIRROR=mirror.ppa.trinitydesktop.org/trinity
+export TDE_MIRROR=${TDE_MIRROR:-https://mirror.ppa.trinitydesktop.org/trinity}
 export NUMJOBS=$(cat $TMPVARS/NUMJOBS)
 export I18N=$(cat $TMPVARS/I18N)
 export TQT_OPTS=$(cat $TMPVARS/TQT_OPTS)
diff --git a/Core/tde-i18n/tde-i18n-en_GB-patch b/Core/tde-i18n/tde-i18n-en_GB-patch
index 25dd2ce..c5f8920 100644
--- a/Core/tde-i18n/tde-i18n-en_GB-patch
+++ b/Core/tde-i18n/tde-i18n-en_GB-patch
@@ -2,3 +2,12 @@
 +++ tde-i18n-en_GB/messages/tdebase/libkickermenu_prefmenu.po
 @@ -35 +34,0 @@
 -#, fuzzy
+--- tde-i18n-en_GB/messages/tdebase/khelpcenter.po
++++ tde-i18n-en_GB/messages/tdebase/khelpcenter.po
+@@ -36 +35,0 @@
+-#, fuzzy
+@@ -41 +39,0 @@
+-#, fuzzy
+@@ -43 +41 @@
+-msgstr "The TDE Control Centre"
++msgstr "The TDE Help Centre"
diff --git a/Core/tdeedu/README b/Core/tdeedu/README
index bd40ea0..d566ac1 100644
--- a/Core/tdeedu/README
+++ b/Core/tdeedu/README
@@ -1,7 +1,10 @@
-Building with cmake, Kig doesn't run with the python scripting option.
-Until that is resolved, the preference is an autotools build.
+The Kalzium Chemical Equation Solver needs OCaml, and the FaCiLe module.
 
-For both, the Kalzium Chemical Equation Solver needs OCaml, and the FaCiLe module.
+tdeedu.SlackBuild checks whether ocaml *and* facile are installed. If not, and the source archives are in the 'src' directory, they are then built, packages created, and installed.
 
-If you DO want to build with cmake, run 'USE_CMAKE_EDU=yes ./BUILD-TDE.sh'
+As I'm not aware of any other uses, the builds have not been added to the build list and the source archives will have to be downloaded manually prior to the build. I believe that ocaml and facile are only build-time requirements and if so can be removed when the tdeedu build has completed - but won't know for sure until the crash has been fixed.
+
+If kalzium crashes when trying to use the equation solver, there is an open issue @ https://mirror.git.trinitydesktop.org/gitea/TDE/tdeedu/issues/8.
+
+If it works for you, or the crash is caused by a problem with the build, please raise an issue here to let me know.
  
diff --git a/Core/tdeedu/tdeedu.SlackBuild b/Core/tdeedu/tdeedu.SlackBuild
index b923145..8a2c7eb 100755
--- a/Core/tdeedu/tdeedu.SlackBuild
+++ b/Core/tdeedu/tdeedu.SlackBuild
@@ -36,72 +36,77 @@ untar_fn
 ## patch for kig python scripting error:
 ## kig: /usr/include/boost/python/object_core.hpp:422: boost::python::api::object_base::~object_base(): Assertion `Py_REFCNT(m_ptr) > 0' failed.
 ## Re: https://bugs.kde.org/show_bug.cgi?id=401512#c5
-echo $'
+patch -N -p0 << EOF || true
 --- kig/scripting/python_scripter.cc
 +++ kig/scripting/python_scripter.cc
 @@ -493,0 +494 @@
 +      Py_XINCREF((objectvect.begin() +i)->ptr());
-' | while read line
-do
-patch -N -p0
-done || true
+EOF
 
-## for 14.0.7, already done in cgit
+## for 14.0.8, already done in cgit
 sed -i 's|Nome del file di input|Input filename|' kig/pykig/pykig.py
 
-listdocs_fn
-
-## There are issues building with cmake - see README
-USE_CMAKE_EDU=${USE_CMAKE_EDU:-no}
-
-[[ $USE_CMAKE_EDU == no ]] && {
-
-## patch for the libboost_python soname as used in Slackware
-sed -i 's|for bplib in|& "-lboost_python${PYVERSHORT%.*}${PYVERSHORT#*.}"|' kig/configure.in.in
-## and for kig python scripting support with cgit build
-[[ $TDEVERSION == cgit ]] && \
-sed -i 's|$qt_libraries|$tqt_libraries|' kig/configure.in.in
-
-## include all keyboards for ktouch
-(cd ktouch/keyboards/
-sed -i '/keyboard_DATA/q' Makefile.am
-echo $(ls *keyboard) >> Makefile.am)
+## add some files to html docs
+sed -i 's|*.png|& *.svgz README|' cmake/modules/TDEMacros.cmake
 
-## add sk data to klatin
-cat klatin/klatin/data/vocab/pl/Makefile.am | sed 's|pl|sk|g' > klatin/klatin/data/vocab/sk/Makefile.am
-
-## install kig examples
-sed -i 's|noinst_DATA|examplesdir = $(kde_datadir)/kig/examples\nexamples_DATA|' kig/examples/Makefile.am
-
-## /usr/bin/ld: cannot find -ltqt-mt/-ltqt - for kstars/indi build
-[[ $TDEVERSION == cgit ]] && \
-sed -i 's|(QT_LDFLAGS|(TQT_LDFLAGS|' kstars/kstars/indi/Makefile.am
-
-ltoolupdate_fn
+listdocs_fn
 
 chown_fn
 
 cd_builddir_fn
 
-CFLAGS="$SLKRCFLAGS" \
-CXXFLAGS="$SLKRCFLAGS" \
-CC=$COMPILER \
-CXX=$COMPILER_CXX \
-../configure \
-   --prefix=$INSTALL_TDE \
-   --disable-rpath \
-   --enable-closure
-
-true # don't go to cmake if ./configure fails
-
-} || {
-
-chown_fn
-
-cd_builddir_fn
+# ### Kalzium Chemical Equation Solver - start
+## Needs OCaml and facile
+ocaml_installed_fn () { [[ -s /usr/local/lib$LIBDIRSUFFIX/libnums.a ]] && \
+[[ -s /usr/local/lib$LIBDIRSUFFIX/facile/facile.a ]] ;}
+## If they are already installed, go to OCAML="ON"
+ocaml_installed_fn || {
+## otherwise, if the source archives are in 'src' ..
+[[ -s $BUILD_TDE_ROOT/src/4.05.0.tar.gz ]] && \
+[[ -s $BUILD_TDE_ROOT/src/facile-1.1.3.tar.gz ]] && {
+## .. build, package, and install them
+(
+## ocaml:
+echo -e "\n building ocaml \n"
+
+cd /$TMP_BUILD
+tar xf $BUILD_TDE_ROOT/src/4.05.0.tar.gz
+cd ocaml-4.05.0/
+
+./configure -cc $COMPILER -libdir /usr/local/lib$LIBDIRSUFFIX
+## finish build with -j1 if there are race condition errors
+make ${NUMJOBS:-} world.opt || make world.opt
+DESTDIR=$TMP_BUILD/package-ocaml make install
+
+cd $TMP_BUILD/package-ocaml
+makepkg -l y -c n $OUTPUT/ocaml-4.05.0-x86_64-1.txz
+installpkg $OUTPUT/ocaml-4.05.0-x86_64-1.txz
+
+## facile:
+echo -e "\n building facile \n"
+
+cd /$TMP_BUILD
+tar xf $BUILD_TDE_ROOT/src/facile-1.1.3.tar.gz
+cd facile-1.1.3/
+
+sed -i 's|mkdir|& -p|' Makefile
+./configure
+make
+make FACILEDIR=$TMP_BUILD/package-facile/usr/local/lib$LIBDIRSUFFIX/facile install
+
+cd $TMP_BUILD/package-facile
+makepkg -l y -c n $OUTPUT/facile-1.1.3-x86_64-1.txz
+installpkg $OUTPUT/facile-1.1.3-x86_64-1.txz
+)
+echo -e "\n returning to building tdeedu \n"
+ocaml_installed_fn || { echo -e " installation of ocaml/facile failed \n" ; exit 1 ; }
+}
+} && \
+OCAML="ON"
+# ### Kalzium Chemical Equation Solver - end
 
-## The Kalzium Chemical Equation Solver needs OCaml
-OCAML=OFF
+## kig python scripting support
+[[ $(ls -1 /usr/lib$LIBDIRSUFFIX/libboost_python*.so) ]] && KIG_PS="ON"
 
 cmake \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@@ -113,10 +118,11 @@ cmake \
     -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-    -DWITH_GCC_VISIBILITY="OFF" \
     -DWITH_ARTS="ON" \
-    -DWITH_OCAML_SOLVER=$OCAML \
+    -DWITH_GCC_VISIBILITY="OFF" \
+    -DWITH_KIG_PYTHON_SCRIPTING=${KIG_PS:-"OFF"} \
     -DWITH_LIBUSB="ON" \
+    -DWITH_OCAML_SOLVER=${OCAML:-"OFF"} \
     -DWITH_V4L="ON" \
     -DBUILD_BLINKEN="ON" \
     -DBUILD_KALZIUM="ON" \
@@ -141,8 +147,6 @@ cmake \
     -Wno-dev \
     ..
 
-}
-
 ## remove obsolete tags
 doxygen -u doc/kig/scripting-api/Doxyfile.scripting-api
 
diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild
index 945e232..e03eec2 100755
--- a/Core/tdegraphics/tdegraphics.SlackBuild
+++ b/Core/tdegraphics/tdegraphics.SlackBuild
@@ -37,7 +37,6 @@ untar_fn
 ##/tmp/build/tmp-tdegraphics/tdegraphics/build-tdegraphics/kmrml/kmrml/kcontrol/serverconfigwidget.cpp:37:61: error: invalid use of incomplete type ‘class KComboBox’
 ## .. and more ..
 ## patch based on solution for similar amarok errors, issue #16
-[[ $TDEVERSION == cgit ]] && {
 echo $'
 --- kmrml/kmrml/kcontrol/serverconfigwidget.ui
 +++ kmrml/kmrml/kcontrol/serverconfigwidget.ui
@@ -48,7 +47,6 @@ echo $'
 +    <include location="global" impldecl="in implementation">klineedit.h</include>
 +</includes>
 ' | patch -N -p0 || true
-}
 
 listdocs_fn
 
diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild
index b0be7c1..6330bb4 100755
--- a/Core/tdelibs/tdelibs.SlackBuild
+++ b/Core/tdelibs/tdelibs.SlackBuild
@@ -33,21 +33,7 @@ getsource_fn
 
 untar_fn
 
-## 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
-+++ tdecmshell/main.cpp
-@@ -106,2 +106,2 @@
--    if ( module.left( 4 ) != "kde-" && service->library().isEmpty() )
--        return locateModule( "kde-" + module );
-+    if ( module.left( 4 ) != "tde-" && service->library().isEmpty() )
-+        return locateModule( "tde-" + module );
-' | while read line
-do
-patch -N -p0
-done || true
-#
-## further patch to make error message more user friendly
+## TDE bug 2821 - further patch to make error message more user friendly
 echo $'--- tdecmshell/main.cpp
 +++ tdecmshell/main.cpp
 @@ -98,0 +99,6 @@
diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild
index a920285..0bf6ff5 100755
--- a/Core/tdenetwork/tdenetwork.SlackBuild
+++ b/Core/tdenetwork/tdenetwork.SlackBuild
@@ -58,7 +58,7 @@ cmake \
     -DWITH_SPEEX=${SPX:-"OFF"} \
     -DWITH_GSM="OFF" \
     -DWITH_LIBXSLT="OFF" \
-    -DWITH_XMMS="OFF" \
+    -DWITH_XMMS="ON" \
     -DWITH_SLP="OFF" \
     -DWITH_WEBCAM="OFF" \
     -DBUILD_DCOPRSS="ON" \
diff --git a/Core/tdewebdev/README b/Core/tdewebdev/README
new file mode 100644
index 0000000..f1869ab
--- /dev/null
+++ b/Core/tdewebdev/README
@@ -0,0 +1,2 @@
+The build hasn't been updated to cmake because that doesn't yet include Kommander, KXSLDbg, KImageMapEditor, KLinkStatus
+ 
diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild
index c1409ea..6b3b3a6 100755
--- a/Core/tdewebdev/tdewebdev.SlackBuild
+++ b/Core/tdewebdev/tdewebdev.SlackBuild
@@ -64,7 +64,7 @@ mkdir_install_fn
 doinst_sh_fn
 
 ## TDEFileReplace has been moved to tdeutils for R14.1.0
-[[ $TDEVERSION == 14.0.7 ]] && TDEFileReplace=" * TDEFileReplace: powerful search and replace in multiple files"
+[[ $TDEVERSION == 14.0.? ]] && TDEFileReplace=" * TDEFileReplace: powerful search and replace in multiple files"
 echo "
 # HOW TO EDIT THIS FILE:
 # The 'handy ruler' below makes it easier to edit a package description.  Line
diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild
index 5b417ea..c3363ce 100755
--- a/Deps/tqt3/tqt3.SlackBuild
+++ b/Deps/tqt3/tqt3.SlackBuild
@@ -149,7 +149,7 @@ rm lib$LIBDIRSUFFIX/libtqt[de]*
 }
 rm bin/???????*
 rm bin/tqm2ts
-rm -rf plugins/designer
+[[ $TQT_OPTS != *ktorrent* ]] && rm -rf plugins/designer
 )}
 
 installdocs_fn
diff --git a/README.md b/README.md
index fd6c8de..fab1f65 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@
 ---
 ***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. Native building for Raspberry Pi3 [[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. 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.
 
-Build the release version R14.0.7 from tar archives; or the development version R14.1.0 from trinitydesktop cgit.  
+Build the release version R14.0.8 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.  
 
 [<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png)
@@ -19,7 +19,7 @@ This is a global option so can't be used where the build list includes packages
 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.7 source archives will be downloaded from a geoIP located mirror site, or the development sources [R14.1.0] cloned or updated from cgit.  
+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.  
 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).
@@ -27,8 +27,8 @@ If you're curious about what this might involve, [take a look at a sample build
 ---
 
 There are 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_EDU=yes - to build tdeedu with cmake - see Core/tdeedu/README.
 * USE_CMAKE_MM=yes - to build tdemultimedia with cmake - see Core/tdemultimedia/README.
 * VERBOSE=1 - show command lines during cmake builds
 
@@ -74,7 +74,7 @@ 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.
 
 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.  
+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.
 
 ---
@@ -102,7 +102,7 @@ or @ https://ray-v.github.io/tde-slackbuilds/cross-compiling-TDE-for-the-RPi3.ht
 
 Includes:
 * Setting parameters for a 32-bit [armv7 hard float], or 64-bit [aarch64], build,  
-   and building ..
+   .. and building ..
 *  a cross compiler toolchain
 *  a 64-bit kernel which can be used for the 32-bit system
 *  qemu to run the TDE binaries built and used during compilation
@@ -122,3 +122,7 @@ See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more infor
 [2] The i18n downloads with wget can't be updated because cgit produces 'current time' timestamps. The consequence is that if tde-i18n-$lang is a part of the build after its initial download, it will be downloaded again. As updates are infrequent, once built, there will probably be no need to do so again and so tde-i18n for a particular language will probably only be run once. On that basis I don't see this being a significant issue.
 
 [3] 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.  
+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
diff --git a/get-source.sh b/get-source.sh
index 0b7b063..c33bcdd 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -101,7 +101,7 @@ 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"}
 # SRCURL for non-TDE archives, set in the SB, will override the Trinity default *tar.xz URL
-SRCURL=${SRCURL:-"https://$TDE_MIRROR/releases/R$VERSION/main$TDEMIR_SUBDIR/$PRGNAM-trinity-$VERSION.tar.xz"}
+SRCURL=${SRCURL:-"$TDE_MIRROR/releases/R$VERSION/main$TDEMIR_SUBDIR/$PRGNAM-trinity-$VERSION.tar.xz"}
 # Source file availability:
 [[ -f $SOURCE ]] && [[ $PRE_DOWNLOAD == yes ]] && echo "  $(basename $SOURCE) already downloaded ..."