From bd373bad7f92d9706665d7e84dfe766c06abf821 Mon Sep 17 00:00:00 2001
From: Ray-V <ray-v@inbox.lv>
Date: Sun, 30 Apr 2023 11:04:16 +0100
Subject: [PATCH] Updates 30 April 2023 for R14.1.0  removed options for
 14.0.13 builds  added kplayer and tdebluez SlackBuilds  tdeedu - set paper
 size according to locale  Misc builds version updates - clamav, graphviz,
 imlib2, mp4v2, xmedcon  tdegraphics - optional patch to omit the duplicated
 ksnapshot button for KolourPaint  get-source.sh - cmake directory change on
 gitea

---
 Apps/filelight/filelight.SlackBuild       | 20 -----
 Apps/k3b/k3b.SlackBuild                   | 12 ---
 Apps/kbfx/kbfx.SlackBuild                 | 14 +---
 Apps/kile/kile.SlackBuild                 | 14 ----
 Apps/klamav/README                        |  2 +-
 Apps/klamav/klamav.SlackBuild             |  4 +-
 Apps/knights/README                       |  7 --
 Apps/knights/knights.SlackBuild           | 25 +------
 Apps/koffice-i18n/koffice-i18n.SlackBuild | 18 ++++-
 Apps/kvkbd/README                         | 10 +--
 Apps/tdebluez/tdebluez.SlackBuild         | 91 +++++++++++++++++++++++
 BUILD-TDE.sh                              | 66 ++++------------
 Core/tde-i18n/tde-i18n-en_GB-patch        | 83 +++++++++++----------
 Core/tde-i18n/tde-i18n.SlackBuild         | 12 ++-
 Core/tdebase/tdebase.SlackBuild           |  7 +-
 Core/tdeedu/README                        |  4 +
 Core/tdeedu/tdeedu.SlackBuild             |  9 +++
 Core/tdegraphics/README                   | 10 +++
 Core/tdegraphics/tdegraphics.SlackBuild   | 67 ++++++++++++++++-
 Core/tdelibs/README                       |  4 +-
 Core/tdelibs/tdelibs.SlackBuild           | 36 ---------
 Core/tdeutils/tdeutils.SlackBuild         |  7 +-
 Core/tdewebdev/tdewebdev.SlackBuild       |  8 +-
 Deps/tqt3/tqt3.SlackBuild                 | 10 +--
 Deps/tqtinterface/tqtinterface.SlackBuild |  7 +-
 Misc/graphviz/graphviz.SlackBuild         |  5 +-
 Misc/imlib2/imlib2.SlackBuild             |  2 +-
 Misc/mp4v2/mp4v2.SlackBuild               |  9 ++-
 Misc/xmedcon/xmedcon.SlackBuild           |  2 +-
 README.md                                 | 10 +--
 apps-list                                 |  4 +-
 get-source.sh                             | 58 +++++++--------
 32 files changed, 336 insertions(+), 301 deletions(-)
 create mode 100644 Apps/tdebluez/tdebluez.SlackBuild
 create mode 100644 Core/tdegraphics/README

diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/filelight/filelight.SlackBuild
index 65fa3e3..ad0185f 100755
--- a/Apps/filelight/filelight.SlackBuild
+++ b/Apps/filelight/filelight.SlackBuild
@@ -34,26 +34,6 @@ getsource_fn
 
 untar_fn
 
-[[ $TDEVERSION == 14.0.13 ]] && {
-patch -p0 << EOF
---- src/part/radialMap/widget.cpp
-+++ src/part/radialMap/widget.cpp
-@@ -44,3 +44,11 @@
- {
--   return KURL::fromPathOrURL( file ? file->fullPath() : m_tree->fullPath() );
-+   if (file)
-+   {
-+      return KURL::fromPathOrURL(file->fullPath());
-+   }
-+   if (m_tree)
-+   {
-+      return KURL::fromPathOrURL(m_tree->fullPath());
-+   }
-+   return KURL::fromPathOrURL(TQString::null);
- }
-EOF
-}
-
 ## for slack-desc
 langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
 ldocs="en";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
diff --git a/Apps/k3b/k3b.SlackBuild b/Apps/k3b/k3b.SlackBuild
index 3221f5a..7c067f7 100755
--- a/Apps/k3b/k3b.SlackBuild
+++ b/Apps/k3b/k3b.SlackBuild
@@ -173,17 +173,6 @@ mv FAQ doc/misc/
 ## build fails with gcc visibility support
 sed -i 's|tde_setup_gcc_visibility|#&|' ConfigureChecks.cmake
 
-[[ $TDEVERSION == 14.0.13 ]] && {
-patch -p0 << EOF
---- plugins/decoder/libsndfile/CMakeLists.txt
-+++ plugins/decoder/libsndfile/CMakeLists.txt
-@@ -20,2 +20,3 @@
-   \${TQT_INCLUDE_DIRS}
-+  \${SNDFILE_INCLUDE_DIRS}
- )
-EOF
-}
-
 listdocs_fn
 
 chown_fn
@@ -194,7 +183,6 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DWITH_LIBDVDREAD="ON" \
     -DWITH_MUSICBRAINZ=${MUSICBRAINZ:-"OFF"} \
     -DWITH_SYSTEM_LIBSAMPLERATE="ON" \
-    -DWITH_HAL="OFF" \
     -DWITH_DEBUG="OFF" \
     -DWITH_ALSA="ON" \
     -DWITH_ARTS="ON" \
diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild
index a549200..7be6859 100755
--- a/Apps/kbfx/kbfx.SlackBuild
+++ b/Apps/kbfx/kbfx.SlackBuild
@@ -36,16 +36,11 @@ untar_fn
 ## build fails with gcc visibility support
 sed -i 's|tde_setup_gcc_visibility|#&|' ConfigureChecks.cmake
 
-# 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 != "" ]] && TRANS=ON
+## for slack-desc
+langs="en";for Lang in $I18N;do [[ -s translations/messages/kbfxconfigapp/$Lang.po ]] && langs="$langs $Lang";done
 
 ## listdocs_fn - not required
-## install misc docs to ..
+## install misc docs to where those for other packages are installed
 sed -i '/SHARE_INSTALL_PREFIX/d;s|DESTINATION|& ${CMAKE_INSTALL_PREFIX}/doc/${PROJECT_NAME}-$ENV{TDEVERSION}|' doc/CMakeLists.txt
 
 chown_fn
@@ -53,7 +48,6 @@ chown_fn
 cd_builddir_fn
 
 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-    -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
     -DUSE_STRIGI="OFF" \
     -DUSE_MENUDRAKE="OFF"
 
@@ -82,7 +76,7 @@ $PRGNAM: The old menu is still available as an option.
 $PRGNAM:
 $PRGNAM:
 $PRGNAM: With language support for:
-$PRGNAM: en $langs
+$PRGNAM: $langs
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild
index cbfe4de..6c3ff60 100755
--- a/Apps/kile/kile.SlackBuild
+++ b/Apps/kile/kile.SlackBuild
@@ -33,20 +33,6 @@ getsource_fn
 
 untar_fn
 
-## fix build error for clang/i586
-[[ $TDEVERSION == 14.0.13 ]] && \
-[[ $COMPILER == clang ]] && \
-[[ $ARCH == i586 ]] && \
-patch -p0 << EOF
---- src/kile/kilejscript.cpp
-+++ src/kile/kilejscript.cpp
-@@ -70,2 +70,2 @@
--      { i_ms / 1000, (i_ms % 1000) * 1000 },
--      { ms / 1000, (ms % 1000) * 1000 }
-+      { static_cast<time_t>( i_ms / 1000 ), static_cast<suseconds_t>( (i_ms % 1000) * 1000 ) },
-+      { static_cast<time_t>( ms / 1000 ), static_cast<suseconds_t>( (ms % 1000) * 1000 ) }
-EOF
-
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
 langs=""
diff --git a/Apps/klamav/README b/Apps/klamav/README
index 1c6d3fd..87358ca 100644
--- a/Apps/klamav/README
+++ b/Apps/klamav/README
@@ -1,5 +1,5 @@
 klamav needs clamav as a build time requirement
 
 Download from:
-https://www.clamav.net/downloads/production/clamav-0.105.1.tar.gz
+https://www.clamav.net/downloads/production/clamav-1.0.1.tar.gz
  
diff --git a/Apps/klamav/klamav.SlackBuild b/Apps/klamav/klamav.SlackBuild
index 49fa388..48e3ec0 100755
--- a/Apps/klamav/klamav.SlackBuild
+++ b/Apps/klamav/klamav.SlackBuild
@@ -33,7 +33,7 @@ source ../../get-source.sh
 ## klamav needs clamav as a build time requirement
 [[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && {
 # ### clamav  - start
-clamav_VERS=0.105.1
+clamav_VERS=1.0.1
 clamav_installed_fn () { pkg-config libclamav ;}
 ## If it's already installed, go to end
 clamav_installed_fn || {
@@ -54,7 +54,7 @@ tar xf $BUILD_TDE_ROOT/src/clamav-$clamav_VERS.tar.gz
 cd clamav-$clamav_VERS/
 
 ## set RPATH relative to ORIGIN always
-sed -i 's|CMAKE_INSTALL_RPATH.*$|CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")|' CMakeLists.txt
+sed -i 's|set(CMAKE_INSTALL_RPATH.*$|set(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}")|' CMakeLists.txt
 
 [[ -s /usr/lib$LIBDIRSUFFIX/libmilter.a ]] && MILTER="ON"
 
diff --git a/Apps/knights/README b/Apps/knights/README
index bd5331f..883bc67 100755
--- a/Apps/knights/README
+++ b/Apps/knights/README
@@ -3,11 +3,4 @@ There is a Spanish language file in the source, but it has no translations in it
 Any involvement from a Spanish speaker to check and correct will be welcome. Kbabel is not necessary, it will display in a text editor just fine.
 
 Tested with gnuchess-6.2.2, stockfish-7-linux, and komodo-7, in UCI mode.
-
------------
-A themepack is available and will be included if pre-downloaded to the 'src' directory or downloaded during the build:
-
-https://downloads.sourceforge.net/project/knights/knights-themepack/0.5.9/knights-themepack-0.5.9.tar.gz
-
-If it's not in 'src', the build will continue with the default theme.
  
diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild
index 854ac12..9086232 100755
--- a/Apps/knights/knights.SlackBuild
+++ b/Apps/knights/knights.SlackBuild
@@ -31,22 +31,6 @@ TAG=${TAG:-_tde}
 source ../../get-source.sh
 getsource_fn
 
-## run getsource_fn for the theme-pack ... in a sub-shell so that the variables don't leak into the build
-(ARCHIVE_TYPE="tar.gz"
-PRGNAM=knights-themepack
-VERSION=0.5.9
-SRCURL="https://downloads.sourceforge.net/project/knights/knights-themepack/0.5.9/$PRGNAM-$VERSION.$ARCHIVE_TYPE"
-getsource_fn
-)
-[[ -s $SRCDIR/knights-themepack-0.5.9.tar.gz ]] || \
-echo '
- ##########
-
- The build will continue without additional boards and chessman themes
- being added to the package.
-
- ##########'
-
 untar_fn
 
 # there is a Spanish language file in the source which has a limited number of translations in it ..
@@ -62,16 +46,11 @@ chown_fn
 
 cd_builddir_fn
 
-## BUILD_EXTRA_THEME is a 14.1.0 option and will be ignored for 14.0.n builds
 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DBUILD_EXTRA_THEME="ON"
 
 make_fn
 
-## if the theme-pack exists, install the themes
-[[ -s $SRCDIR/knights-themepack-0.5.9.tar.gz ]] && \
-tar xf $SRCDIR/knights-themepack-0.5.9.tar.gz --exclude=??????? -C $PKG$INSTALL_TDE/share/apps/knights/themes --strip-components=1
-
 installdocs_fn
 
 mangzip_fn
@@ -82,8 +61,6 @@ mkdir_install_fn
 
 doinst_sh_fn
 
-[[ -s $PKG$INSTALL_TDE/share/apps/knights/themes/KBBrushed_Liquid.tar.gz ]] && \
-ADDL_THEMES="Includes additional boards and chessman themes"
 echo "
 # HOW TO EDIT THIS FILE:
 # The 'handy ruler' below makes it easier to edit a package description.  Line
@@ -94,7 +71,7 @@ echo "
        |-----handy-ruler------------------------------------------------------|
 $PRGNAM: A graphical chess interface for the Trinity Desktop Environment
 $PRGNAM:
-$PRGNAM: ${ADDL_THEMES:-"A themepack is available for additional boards and chessman themes"}
+$PRGNAM: Includes additional boards and chessman themes
 $PRGNAM:
 $PRGNAM:
 $PRGNAM: Needs separate chess engines, for example gnuchess, stockfish, komodo.
diff --git a/Apps/koffice-i18n/koffice-i18n.SlackBuild b/Apps/koffice-i18n/koffice-i18n.SlackBuild
index ec3af8f..b0e206a 100755
--- a/Apps/koffice-i18n/koffice-i18n.SlackBuild
+++ b/Apps/koffice-i18n/koffice-i18n.SlackBuild
@@ -39,7 +39,17 @@ untar_fn
 
 # set support for additional language(s) as per I18N variable
 # but only for languages available with this package
-langdir="";for Lang in $I18N;do [[ -d koffice-i18n-$Lang ]] && langdir="${langdir}koffice-i18n-$Lang ";done
+langdir=""
+ldocdir="" ## for slack-desc
+for Lang in $I18N
+do
+[[ -d koffice-i18n-$Lang ]] && {
+langdir="${langdir}koffice-i18n-$Lang "
+[[ -d koffice-i18n-$Lang/docs ]] && {
+ldocdir="${ldocdir} $Lang "
+}
+}
+done
 
 for dir in $langdir
 do
@@ -59,7 +69,6 @@ mv docs/koffice/chalk docs/koffice/krita || true
 mv docs/koffice/krita/toolbar-chalk.png docs/koffice/krita/toolbar-krita.png || true
 sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' ../template/messages/koffice/{kofficefilters,krita}.pot
 sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' messages/koffice/{kofficefilters,krita,desktop_koffice}.po
-sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' configure.in
 find docs/koffice -type f -exec sed -i -e 's/chalk/krita/g;s/Chalk/Krita/g' {} \; || true
 }
 
@@ -76,6 +85,7 @@ make_fn
 cd ../../
 done
 langs=$(echo $langdir | sed 's|koffice-i18n-||g')
+ldocs=$(echo $ldocdir | sed 's|koffice-i18n-||g')
 
 mkdir_install_fn
 
@@ -92,8 +102,8 @@ $PRGNAM:
 $PRGNAM: For languages:
 $PRGNAM: $langs
 $PRGNAM:
-$PRGNAM:
-$PRGNAM:
+$PRGNAM: With help documentation for:
+$PRGNAM: $ldocs
 $PRGNAM:
 $PRGNAM:
 $PRGNAM:
diff --git a/Apps/kvkbd/README b/Apps/kvkbd/README
index 58794ed..748d474 100644
--- a/Apps/kvkbd/README
+++ b/Apps/kvkbd/README
@@ -11,14 +11,14 @@ Build-time options to be hard-coded into the app are:
 
 [2] Alternative text on the num pad keys.
 
-For example:
-|Ho|
-|me| can be replaced with |H←|, which is a better fit on the keys.
+    For example:
+    |Ho|
+    |me| can be replaced with |H←|, which is a better fit on the keys.
 
 [3] Small icons are a better fit on the buttons if the keyboard is to be used at the default size.
 
 [4] Show blank keys where AltGr doesn't produce a character.
 
-Usually, not all keys have 3rd and 4th level characters assigned.
-Select this option to see only those characters which AltGr or AltGr+Shift generate.
+    Usually, not all keys have 3rd and 4th level characters assigned.
+    Select this option to see only those characters which AltGr or AltGr+Shift generate.
  
diff --git a/Apps/tdebluez/tdebluez.SlackBuild b/Apps/tdebluez/tdebluez.SlackBuild
new file mode 100644
index 0000000..b84378d
--- /dev/null
+++ b/Apps/tdebluez/tdebluez.SlackBuild
@@ -0,0 +1,91 @@
+#!/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=tdebluez
+VERSION=$TDEVERSION
+BUILD=${BUILD:-1}
+TAG=${TAG:-_tde}
+
+source ../../get-source.sh
+getsource_fn
+
+untar_fn
+
+## path to configuration file
+sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" {README.md,doc/en/tdebluez.docbook}
+
+## User set paper size or as per locale ..
+[[ ! ${PS:-} ]] && {
+[[ $(locale LC_PAPER) == 297* ]] && PS=a4 || PS=letter
+}
+sed -i "s|^PAPER_TYPE.*$|PAPER_TYPE             = $PS|" Doxyfile
+
+## for slack-desc
+langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
+
+listdocs_fn
+
+chown_fn
+
+cd_builddir_fn
+
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+    -DBUILD_LIBTDEBLUEZ="ON" \
+    -DBUILD_TDEIOSLAVE="ON"
+
+make_fn
+
+installdocs_fn
+
+#mangzip_fn
+
+strip_fn
+
+mkdir_install_fn
+
+doinst_sh_fn
+
+echo "
+# HOW TO EDIT THIS FILE:
+# The 'handy ruler' below makes it easier to edit a package description.  Line
+# 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: tdebluez - A set of applications to provide Bluetooth Bluez5
+$PRGNAM: functionality to TDE.
+$PRGNAM:
+$PRGNAM: Requires bluez >= 5.43
+$PRGNAM: openobex support works with v1.5 only
+$PRGNAM:
+$PRGNAM: With language support for:
+$PRGNAM: $langs
+$PRGNAM:
+$PRGNAM:
+$PRGNAM:
+" > $PKG/install/slack-desc
+
+makepkg_fn
diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh
index fb790ef..f391d79 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.0.x/14.1.0, turn off cgit downloads
+## .. and if building 14.1.x/14.2.0, turn off cgit downloads
 [[ $(cat $TMPVARS/DL_CGIT) == yes ]] && echo \\Z0\\Zbno > $TMPVARS/DL_CGIT
 
 
@@ -100,10 +100,10 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Version " --menu
 Set the version of TDE to be built.
  
 " \
-12 75 2 \
-"14.0.13" "the R14.0.13 release - source from archives" \
-"14.1.0" "R14.1.0 release preview - source from Trinity git" \
-" [14.0.x]" " [14.0.14 release preview - currently not planned]" \
+13 75 3 \
+"14.1.0" "the R14.1.0 release - source from archives" \
+"14.1.x" "next release preview - source from Trinity git" \
+"14.2.0" "R14.2.0 development - source from Trinity git" \
 2> $TMPVARS/TDEVERSION
 
 
@@ -312,43 +312,6 @@ If following the build method on the previous screen, the answer here should pro
 [[ $? == 1 ]] && echo no > $TMPVARS/KEEP_BUILD
 
 
-## new apps for 14.0.11 & 14.1.0
-# Use non-breaking space - U00a0 - in strings for this to work with 'dialog'
-# nbsp prefixing Misc avoids double quote in TDEbuilds list
-app_1="Apps/codeine"
-about_1="Simple multimedia player"
-status_1=off
-comment_1="\Zb\Z6 \Zn"
-
-app_2="Apps/klamav"
-about_2="Antivirus manager for ClamAV"
-status_2=off
-comment_2="\Zb\Z6 ClamAV is a build time requirement, included in klamav.Slackbuild \Zn"
-## if ClamAV isn't installed, the klamav.SlackBuild will show the download URL, and build and install ClamAV from the downloaded archive.
-
-app_3=" Misc/imlib2"
-about_3="An image loading and rendering library"
-status_3=off
-comment_3="\Zb\Z6 Build-time requirement for kompose \Zn"
-
-app_4="Apps/kompose"
-about_4="Full-screen window/desktop manager"
-status_4=off
-comment_4="\Zb\Z6 Imlib2 is a build time requirement \Zn"
-
-## there is no 14.0.* port for this
-[[ $(cat $TMPVARS/TDEVERSION) == 14.1.0 ]] && {
-app_5="Apps/kplayer"
-about_5="Multimedia player with MPlayer backend"
-status_5=off
-comment_5="\Zb\Z6 MPlayer is a run time requirement \Zn"
-}
-
-app_6="Apps/twin-style-suse2"
-about_6="SUSE window decorations"
-status_6=off
-comment_6="\Zb\Z6 \Zn"
-
 rm -f $TMPVARS/TDEbuilds
 dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Packages Selection " --item-help --checklist \
 "
@@ -403,7 +366,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
 " Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Requires gstreamer-1.x. Runtime option for Amarok \Zn" \
 " Misc/yauap" "A simple commandline audio player" off "\Zb\Z6 Provides an optional engine for Amarok \Zn" \
 "Apps/amarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, mp4v2, speex, moodbar, akode, yauap \Zn" \
-${app_1:-} ${about_1:-} ${status_1:-} ${comment_1:-} \
+"Apps/codeine" "Simple multimedia player" off "\Zb\Z6 \Zn" \
 "Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins libkdcraw libkexiv2 libkipi.  \Zn" \
 "Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6 A d3lphin.desktop file is included - see dolphin.SlackBuild.  \Zn" \
 "Apps/filelight" "Graphical diskspace display" off "\Zb\Z6 Runtime requirement x/xdpyinfo \Zn" \
@@ -421,7 +384,7 @@ ${app_1:-} ${about_1:-} ${status_1:-} ${comment_1:-} \
 "Apps/kdbusnotification" "A DBUS notification to TDE interface" off "\Zb\Z6   \Zn" \
 "Apps/kile" "A TEX and LATEX source editor and shell" off "\Zb\Z6   \Zn" \
 "Apps/kkbswitch" "A keyboard layout indicator" off "\Zb\Z6   \Zn" \
-${app_2:-} ${about_2:-} ${status_2:-} ${comment_2:-} \
+"Apps/klamav" "Antivirus manager for ClamAV" off "\Zb\Z6 ClamAV is a build time requirement, included in klamav.Slackbuild \Zn" \
 "Apps/knemo" "The TDE Network Monitor" off "\Zb\Z6   \Zn" \
 "Apps/knetstats" "A network monitor that shows rx/tx LEDs" off "\Zb\Z6   \Zn" \
 "Apps/knights" "A graphical chess interface" off "\Zb\Z6   \Zn" \
@@ -429,9 +392,9 @@ ${app_2:-} ${about_2:-} ${status_2:-} ${comment_2:-} \
 " Misc/GraphicsMagick" "Swiss army knife of image processing" off "\Zb\Z6 Buildtime option for chalk[krita] in koffice, and inkscape \Zn" \
 "Apps/koffice" "Office Suite" off "\Zb\Z6 Optional build-time dependency - GraphicsMagick \Zn" \
 "Apps/koffice-i18n" "Internationalization files for koffice" off "\Zb\Z6 Provides \Zb\Z3Additional language support\Zb\Z6 for koffice \Zn" \
-${app_3:-} ${about_3:-} ${status_3:-} ${comment_3:-} \
-${app_4:-} ${about_4:-} ${status_4:-} ${comment_4:-} \
-${app_5:-} ${about_5:-} ${status_5:-} ${comment_5:-} \
+" Misc/imlib2" "An image loading and rendering library" off "\Zb\Z6 Build-time requirement for kompose \Zn" \
+"Apps/kompose" "Full-screen window/desktop manager" off "\Zb\Z6 Imlib2 is a build time requirement \Zn" \
+"Apps/kplayer" "Multimedia player with MPlayer backend" off "\Zb\Z6 MPlayer is a run time requirement \Zn" \
 "Apps/krusader" "File manager for TDE" off "\Zb\Z6   \Zn" \
 "Apps/kscope" "A source-editing environment for C and C-style languages." off "\Zb\Z6 Runtime options cscope [d/cscope], ctags [ap/vim], dot [graphviz] \Zn" \
 "Apps/ksensors" "A graphical interface for sensors" off "\Zb\Z6 Runtime requirement ap/lm_sensors \Zn" \
@@ -447,12 +410,13 @@ ${app_5:-} ${about_5:-} ${status_5:-} ${comment_5:-} \
 "Apps/soundkonverter" "Frontend to various audio converters" off "\Zb\Z6   \Zn" \
 "Apps/tde-style-lipstik" "Lipstik theme" off "\Zb\Z6   \Zn" \
 "Apps/tde-style-qtcurve" "QtCurve theme" off "\Zb\Z6   \Zn" \
+"Apps/tdebluez" "Bluetooth Bluez5 functionality" off "\Zb\Z6   \Zn" \
 "Apps/tdeio-locate" "TDE frontend for the locate command" off "\Zb\Z6   \Zn" \
 "Apps/tdepowersave" "Set power consumption and conservation options" off "\Zb\Z6   \Zn" \
 "Apps/tdesudo" "Graphical frontend for the sudo command" off "\Zb\Z6   \Zn" \
 "Apps/tdmtheme" "TDM theme editor module" off "\Zb\Z6   \Zn" \
 "Apps/twin-style-crystal" "Twin theme" off "\Zb\Z6   \Zn" \
-${app_6:-} ${about_6:-} ${status_6:-} ${comment_6:-} \
+"Apps/twin-style-suse2" "SUSE window decorations" off "\Zb\Z6 \Zn" \
 "Apps/yakuake" "Quake-style terminal emulator" off "\Zb\Z6   \Zn" \
 " Misc/inkscape" "SVG editor - an alternative to potracegui [and GraphicsMagick]." off "\Zb\Z6 potrace is a build-time dependency. \Zn" \
 2> $TMPVARS/TDEbuilds
@@ -761,7 +725,7 @@ to avoid confusion with identical packages which might be installed for KDE.
 
 
 rm -f $TMPVARS/DL_CGIT  # place this here to facilitate testing for summary screen
-[[ $(cat $TMPVARS/TDEVERSION) == 14.1.0 || $(cat $TMPVARS/TDEVERSION) == 14.0.x ]] && \
+[[ $(cat $TMPVARS/TDEVERSION) == 14.2.0 || $(cat $TMPVARS/TDEVERSION) == 14.1.x ]] && \
 [[ $(grep -o [ACDLM][a-z]*/ $TMPVARS/TDEbuilds | sort | head -n1) != Misc/ ]] && {
 dialog --cr-wrap --no-shadow --colors --defaultno --title " TDE development build " --yesno \
 "
@@ -788,8 +752,8 @@ 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.13 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." || 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'."
-## testing for cgit!=no will allow =yes, or null, which is the 14.0.13 build case
+[[ $(cat $TMPVARS/TDEVERSION) == 14.1.0 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." || 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'."
+## testing for cgit!=no will allow =yes, or null, which is the 14.1.0 build case
 [[ $(cat $TMPVARS/DL_CGIT) != no ]] &&  {
 dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \
 "
diff --git a/Core/tde-i18n/tde-i18n-en_GB-patch b/Core/tde-i18n/tde-i18n-en_GB-patch
index 30f5772..2dcc94f 100644
--- a/Core/tde-i18n/tde-i18n-en_GB-patch
+++ b/Core/tde-i18n/tde-i18n-en_GB-patch
@@ -1,34 +1,3 @@
-## In the Configure Panel|Taskbar window, the Alt-c shortcut is assigned
-## to the Cancel button, which takes priority over 'custom colors'
-## which becomes "Us&e custom colours", so force &Use ..
---- tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
-+++ tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
-@@ -378,3 +378,3 @@
- msgid "Use &custom colors"
--msgstr ""
-+msgstr "&Use custom colours"
- 
-@@ -383,3 +383,3 @@
- msgid "Inacti&ve task text color:"
--msgstr ""
-+msgstr "Inacti&ve task text colour:"
- 
-@@ -388,3 +388,3 @@
- msgid "Active task te&xt color:"
--msgstr ""
-+msgstr "Active task te&xt colour:"
- 
-@@ -393,3 +393,3 @@
- msgid "&Background color:"
--msgstr ""
-+msgstr "&Background colour:"
- 
-@@ -413,3 +413,3 @@
- msgid "Right b&utton:"
--msgstr "Right b&utton:"
-+msgstr "&Right button:"
- 
-
 --- tde-i18n-en_GB/messages/tdebase/tderandr.po
 +++ tde-i18n-en_GB/messages/tdebase/tderandr.po
 @@ -188,3 +188,3 @@
@@ -91,40 +60,76 @@
 
 --- tde-i18n-en_GB/messages/tdebase/kcmlayout.po
 +++ tde-i18n-en_GB/messages/tdebase/kcmlayout.po
-@@ -1239,3 +1239,3 @@
+@@ -1325,3 +1325,3 @@
  msgid "Use &theme colors"
 -msgstr ""
 +msgstr "Use &theme colours"
  
-@@ -1244,3 +1244,3 @@
+@@ -1330,3 +1330,3 @@
  msgid "Use c&ustom colors"
 -msgstr ""
 +msgstr "Use c&ustom colours"
  
-@@ -1249,3 +1249,3 @@
+@@ -1335,3 +1335,3 @@
  msgid "Background color:"
 -msgstr ""
 +msgstr "Background colour:"
  
-@@ -1256,4 +1256,4 @@
+@@ -1342,4 +1342,4 @@
  "was set to display a flag."
 -msgstr ""
 -
 +msgstr "This colour will be used as the indicator's background unless the indicator "
 +"was set to display a flag."
- #: kcmlayoutwidget.ui:617
-@@ -1261,3 +1261,3 @@
+ #: kcmlayoutwidget.ui:807
+@@ -1347,3 +1347,3 @@
  msgid "Text color:"
 -msgstr ""
 +msgstr "Text colour:"
  
-@@ -1266,3 +1266,3 @@
+@@ -1352,3 +1352,3 @@
  msgid "This color will be used to draw the language label on the indicator."
 -msgstr ""
 +msgstr "This colour will be used to draw the language label on the indicator."
  
-@@ -1307,3 +1307,3 @@
+@@ -1393,3 +1393,3 @@
  msgid "The drop shadow behind the language label will be of this color."
 -msgstr ""
 +msgstr "The drop shadow behind the language label will be of this colour."
  
+
+## In the Configure Panel|Taskbar window, the Alt-c shortcut is assigned
+## to the Cancel button, which takes priority over 'custom colors'
+## which becomes "Us&e custom colours", so force &Use ..
+--- tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
++++ tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po
+@@ -382,3 +382,3 @@
+ msgid "Colors"
+-msgstr ""
++msgstr "Colours"
+ 
+@@ -387,3 +387,3 @@
+ msgid "Use &custom colors"
+-msgstr ""
++msgstr "&Use custom colours"
+ 
+@@ -392,3 +392,3 @@
+ msgid "Active task te&xt color:"
+-msgstr ""
++msgstr "Active task te&xt colour:"
+ 
+@@ -397,3 +397,3 @@
+ msgid "&Background color:"
+-msgstr ""
++msgstr "&Background colour:"
+ 
+@@ -402,3 +402,3 @@
+ msgid "Inacti&ve task text color:"
+-msgstr ""
++msgstr "Inacti&ve task text colour:"
+ 
+@@ -525,3 +525,3 @@
+ msgid "Right b&utton:"
+-msgstr "Right b&utton:"
++msgstr "&Right button:"
+ 
diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild
index 683b659..3daa74b 100755
--- a/Core/tde-i18n/tde-i18n.SlackBuild
+++ b/Core/tde-i18n/tde-i18n.SlackBuild
@@ -38,7 +38,7 @@ getsource_fn
 ## extract, build, and remove source for each language package one at a time
 
 cd $TMP_BUILD/tmp-$PRGNAM
-[[ $TDEVERSION == 14.0.13 ]] && {
+[[ $TDEVERSION == 14.1.0 ]] && {
 # extract the template source once only
 echo -e "\033[39;1m
   Extracting the template source from $(basename $SOURCE) ...
@@ -57,7 +57,7 @@ echo -e "\033[39;1m
 \033[0m"
 (cd $PRGNAM-trinity-$TDEVERSION
 tar xf $SRCDIR/cmake-$TDEVERSION.tar.xz
-mv cmake-trinity-$TDEVERSION cmake)
+mv tde-cmake-trinity-$TDEVERSION cmake)
 ## prevent copying from cgit if this fails
 cd tde-i18n-trinity-$TDEVERSION
 [[ ! -d cmake || ! -d template || ! -d translations ]] && exit
@@ -71,7 +71,7 @@ cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/)
 
 for lang in $I18N
 do
-[[ $TDEVERSION == 14.0.13 ]] && {
+[[ $TDEVERSION == 14.1.0 ]] && {
 # extract the source for one language at a time for each iteration of the loop
 echo -e "\033[39;1m
   Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ...
@@ -96,7 +96,11 @@ ln -s ../cmake cmake)
 }
 
 ## language specific patches
-patch -N -p0 < $SB_SRCDIR/tde-i18n-$lang-patch || true # continue if patch file doesn't exist
+echo -e "\033[39;1m"
+[[ -e $SB_SRCDIR/tde-i18n-$lang-patch ]] && {
+patch -N -p0 < $SB_SRCDIR/tde-i18n-$lang-patch
+}
+echo -e "\033[0m"
 
 chown_fn
 
diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild
index 501ac3f..2b85905 100755
--- a/Core/tdebase/tdebase.SlackBuild
+++ b/Core/tdebase/tdebase.SlackBuild
@@ -106,17 +106,17 @@ sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdeioslave/trash/testtrash.cpp || true
 patch -N -p0 << EOF || true
 --- translations/desktop_files/kcontrol-desktops/en_GB.po
 +++ translations/desktop_files/kcontrol-desktops/en_GB.po
-@@ -1338,3 +1338,3 @@
+@@ -1355,3 +1355,3 @@
  msgid "Configure display ICC color profile"
 -msgstr ""
 +msgstr "Configure display ICC colour profile"
  
-@@ -1343,3 +1343,3 @@
+@@ -1360,3 +1360,3 @@
  msgid "ICC;display;color;profile;"
 -msgstr ""
 +msgstr "ICC;display;colour;profile;"
  
-@@ -1348,3 +1348,3 @@
+@@ -1365,3 +1365,3 @@
  msgid "Color Profile"
 -msgstr ""
 +msgstr "Colour Profile"
@@ -157,7 +157,6 @@ sed -i "s|/opt/.*/share/doc/tdm/README.gz|$INSTALL_TDE/share/config/tdm/README-c
 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DWITH_ARTS="ON" \
     -DWITH_ELFICON="OFF" \
-    -DWITH_HAL="OFF" \
     -DWITH_I8K="OFF" \
     -DWITH_LDAP="OFF" \
     -DWITH_LIBART="ON" \
diff --git a/Core/tdeedu/README b/Core/tdeedu/README
index 7d05880..fb9b8bd 100644
--- a/Core/tdeedu/README
+++ b/Core/tdeedu/README
@@ -11,4 +11,8 @@ As I'm not aware of any other uses, the builds have not been added to the build
 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.
+
+------------------------------
+
+The page/paper size can be set with the command line option PS= or will default to the size set for the system locale.
  
diff --git a/Core/tdeedu/tdeedu.SlackBuild b/Core/tdeedu/tdeedu.SlackBuild
index 671b048..f57a928 100755
--- a/Core/tdeedu/tdeedu.SlackBuild
+++ b/Core/tdeedu/tdeedu.SlackBuild
@@ -54,6 +54,7 @@ cd ocaml-4.05.0/
 ##       https://github.com/dra27/ocaml/[pull/56]
 ##         └ 0d2c1fd77b4715c70d0ffc4348f1bc2d3eaacbf7 refs/remotes/origin/alt-signal-stack-4.05
 ##           └ commit 50c2d1275e537906ea144bd557fde31e0bf16e5f
+echo -e "\033[39;1m"
 patch -p0 << EOF
 --- asmrun/fail.c
 +++ asmrun/fail.c
@@ -185,6 +186,7 @@ patch -p0 << EOF
 -        .section    .rodata.cst8,"a",@progbits
 +        .section    .rodata.cst16,"aM",@progbits,16
 EOF
+echo -e "\033[0m"
 
 ## config.guess uses uname to identify the system so incorrectly identifies
 ## a 32 bit system using a 64 bit kernel as 64 bit
@@ -241,6 +243,13 @@ sed -i 's|      PyTuple_SetItem|      Py_XINCREF((objectvect.begin() +i)->ptr())
 ## add some files to html docs
 sed -i 's|*.png|& *.svgz README|' cmake/modules/TDEMacros.cmake
 
+## User set paper size or as per locale ..
+[[ ! ${PS:-} ]] && {
+[[ $(locale LC_PAPER) == 297* ]] && PS=a4 || PS=letter
+}
+sed -i "s|^PAPER_TYPE.*$|PAPER_TYPE             = $PS|" doc/kig/scripting-api/Doxyfile.scripting-api.in
+sed -i "s|^PAPER_TYPE.*$|PAPER_TYPE             = $PS|" admin/Doxyfile.global
+
 listdocs_fn
 
 chown_fn
diff --git a/Core/tdegraphics/README b/Core/tdegraphics/README
new file mode 100644
index 0000000..f332ade
--- /dev/null
+++ b/Core/tdegraphics/README
@@ -0,0 +1,10 @@
+For 14.1.0 the option to edit the image created with ksnapshot [PrtSc] has been added with an emphasis on KolourPaint which has been assigned its own button as well as being available in the 'Open with...' drop-down menu.
+
+See the PR for details - https://mirror.git.trinitydesktop.org/gitea/TDE/tdegraphics/pulls/50
+
+If you DON'T want this extra button, use KP_BTN as a command line build option:
+KP_BTN=n ./BUILD-TDE.sh
+KolourPaint will still be available from the drop-down menu.
+
+The default build will be with the upstream source to include the extra KolourPaint button.
+ 
diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild
index 01eeab7..342f010 100755
--- a/Core/tdegraphics/tdegraphics.SlackBuild
+++ b/Core/tdegraphics/tdegraphics.SlackBuild
@@ -36,6 +36,72 @@ untar_fn
 ## build fails with gcc visibility support
 sed -i 's|tde_setup_gcc_visibility|#&|' ConfigureChecks.cmake
 
+## option to build without the dedicated KolourPaint button in ksnapshot
+[[ ${KP_BTN:-} == [nN0] ]] && {
+echo -e "\033[39;1m"
+patch -p0 << EOF
+--- ksnapshot/ksnapshot.cpp
++++ ksnapshot/ksnapshot.cpp
+@@ -84 +83,0 @@
+-    connect(mainWidget, TQT_SIGNAL(openWithKPClicked()), TQT_SLOT(slotOpenWithKP()));
+@@ -135,6 +133,0 @@
+-    // Check for KolourPaint availability
+-    KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint");
+-    if (!kpaint) {
+-        mainWidget->btnOpenWithKP->hide();
+-    }
+-
+@@ -395,7 +388,0 @@
+-void KSnapshot::slotOpenWithKP() {
+-    KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint");
+-    if (kpaint) {
+-        openWithExternalApp(*kpaint);
+-    }
+-}
+-
+--- ksnapshot/ksnapshot.h
++++ ksnapshot/ksnapshot.h
+@@ -114 +113,0 @@
+-  void slotOpenWithKP();
+--- ksnapshot/ksnapshotwidget.ui
++++ ksnapshot/ksnapshotwidget.ui
+@@ -245,14 +244,0 @@
+-                <widget class="KPushButton">
+-                    <property name="name">
+-                        <cstring>btnOpenWithKP</cstring>
+-                    </property>
+-                    <property name="text">
+-                        <string>Open in &amp;KolourPaint</string>
+-                    </property>
+-                    <property name="whatsThis" stdset="0">
+-                        <string>Click this button to edit the snapshot in KolourPaint.</string>
+-                    </property>
+-                    <property name="iconSet">
+-                        <iconset>"kolourpaint"</iconset>
+-                    </property>
+-                </widget>
+@@ -320,6 +305,0 @@
+-    <connection>
+-        <sender>btnOpenWithKP</sender>
+-        <signal>clicked()</signal>
+-        <receiver>KSnapshotWidget</receiver>
+-        <slot>slotOpenWithKPClicked()</slot>
+-    </connection>
+@@ -365 +344,0 @@
+-    <signal>openWithKPClicked()</signal>
+@@ -375 +353,0 @@
+-    <slot access="protected" specifier="non virtual">slotOpenWithKPClicked()</slot>
+--- ksnapshot/ksnapshotwidget.ui.h
++++ ksnapshot/ksnapshotwidget.ui.h
+@@ -140,4 +139,0 @@
+-void KSnapshotWidget::slotOpenWithKPClicked()
+-{
+-    emit openWithKPClicked();
+-}
+EOF
+echo -e "\033[0m"
+}
+
 listdocs_fn
 
 chown_fn
@@ -48,7 +114,6 @@ sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/g
 pkg-config imlib && KUICKSHOW=ON
 
 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-    -DWITH_T1LIB="OFF" \
     -DWITH_PAPER="OFF" \
     -DWITH_TIFF="ON" \
     -DWITH_OPENEXR="OFF" \
diff --git a/Core/tdelibs/README b/Core/tdelibs/README
index 1ff2891..22eba55 100644
--- a/Core/tdelibs/README
+++ b/Core/tdelibs/README
@@ -6,6 +6,6 @@ Some formatting for help pages has been changed by a patch in the SlackBuild - i
 
 ---
 
-Markdown syntax highlighting for kate has been added for 14.0.13.
-There is a patch in the SlackBuild to revert the diff highlighting - comment out if not required.
+Markdown syntax highlighting for kate ...
+There is a patch in the SlackBuild to revert the diff highlighting introduced for R14.0.13 - comment out if not required.
  
diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild
index 9fbbf13..ab1e447 100755
--- a/Core/tdelibs/tdelibs.SlackBuild
+++ b/Core/tdelibs/tdelibs.SlackBuild
@@ -136,33 +136,6 @@ patch -N -p0 << EOF || true
 +			<itemData name="difflineadd" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#0000FF" />
 EOF
 
-[[ $TDEVERSION == 14.0.13 ]] && {
-patch -p0 << EOF
---- CMakeLists.txt
-+++ CMakeLists.txt
-@@ -376,2 +376,5 @@
-     set ( HAVE_BACKTRACE 1 )
-+  else ()
-+    set ( Backtrace_LIBRARY "" )
-+    set ( Backtrace_HEADER "" )
-   endif ()
-EOF
-}
-
-## fix build error for clang/i586
-[[ $TDEVERSION == 14.0.13 ]] && \
-[[ $COMPILER == clang ]] && \
-[[ $ARCH == i586 ]] && \
-patch -p0 << EOF
---- tdehtml/ecma/kjs_proxy.cpp
-+++ tdehtml/ecma/kjs_proxy.cpp
-@@ -390,2 +390,2 @@
--      { i_ms / 1000, (i_ms % 1000) * 1000 },
--      { ms / 1000, (ms % 1000) * 1000 }
-+      { static_cast<time_t>( i_ms / 1000 ), static_cast<suseconds_t>( (i_ms % 1000) * 1000 ) },
-+      { static_cast<time_t>( ms / 1000 ), static_cast<suseconds_t>( (ms % 1000) * 1000 ) }
-EOF
-
 listdocs_fn
 
 chown_fn
@@ -182,14 +155,6 @@ pkg-config jasper && JASPER="ON"
 ## just show message without failing if no spell checker is installed
 sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLists.txt
 
-<<'comment'
-    WITH_CRYPTSETUP
-    WITH_PCSC
-    WITH_PKCS
-    WITH_UDEVIL
-are 14.1.0 options and will be ignored by 14.0.* builds
-comment
-
 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DDEFAULT_SPELL_CHECKER=${DEF_SP_CHKR:-"ASPELL"} \
     -DTDE_MALLOC="OFF" \
@@ -205,7 +170,6 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DWITH_DEVKITPOWER="ON" \
     -DWITH_ELFICON="OFF" \
     -DWITH_GAMIN="OFF" \
-    -DWITH_HAL="OFF" \
     -DWITH_HSPELL="OFF" \
     -DWITH_IMAGETOPS_BINARY="OFF" \
     -DWITH_INOTIFY="ON" \
diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild
index 994d929..f2da404 100755
--- a/Core/tdeutils/tdeutils.SlackBuild
+++ b/Core/tdeutils/tdeutils.SlackBuild
@@ -41,8 +41,6 @@ cd_builddir_fn
 
 sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1
 
-## TDEFileReplace has been moved from tdewebdev for R14.1.0
-[[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DWITH_DPMS="ON" \
     -DWITH_XSCREENSAVER="OFF" \
@@ -75,7 +73,7 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DBUILD_KTIMER="ON" \
     -DBUILD_TDEWALLET="ON" \
     -DBUILD_SUPERKARAMBA="ON" \
-    ${TDEFileReplace:-}
+    -DBUILD_TDEFILEREPLACE="ON"
 
 make_fn
 
@@ -89,7 +87,6 @@ mkdir_install_fn
 
 doinst_sh_fn
 
-[[ $TDEVERSION == 14.1.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
@@ -119,7 +116,7 @@ $PRGNAM: * ktimer: execute programs after some time
 $PRGNAM: * superkaramba: a version of Karamba with python scripting
 $PRGNAM: * tdelirc: a TDE frontend for the Linux Infrared Remote Control system
 $PRGNAM: * tdewallet: a convenient and secure way to manage all your passwords
-$PRGNAM:${TDEFileReplace:-}
+$PRGNAM: * TDEFileReplace: powerful search and replace in multiple files
 " > $PKG/install/slack-desc
 
 makepkg_fn
diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild
index 5e29580..4a507ea 100755
--- a/Core/tdewebdev/tdewebdev.SlackBuild
+++ b/Core/tdewebdev/tdewebdev.SlackBuild
@@ -50,8 +50,6 @@ chown_fn
 
 cd_builddir_fn
 
-## TDEFileReplace has been moved to tdeutils for R14.1.0
-[[ $TDEVERSION != 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DWITH_OTHER_EDITORS="ON" \
     -DWITH_QUANTA_CVSSERVICE="ON" \
@@ -59,8 +57,7 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DBUILD_KLINKSTATUS="ON" \
     -DBUILD_KOMMANDER="ON" \
     -DBUILD_KXSLDBG="ON" \
-    -DBUILD_QUANTA="ON" \
-    ${TDEFileReplace:-}
+    -DBUILD_QUANTA="ON"
 
 make_fn
 
@@ -74,7 +71,6 @@ mkdir_install_fn
 
 doinst_sh_fn
 
-[[ $TDEVERSION != 14.1.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
@@ -92,7 +88,7 @@ $PRGNAM: * Kommander: a GUI script builder and executor tool.
 $PRGNAM: * KXSLDbg: XSL debugger
 $PRGNAM: * KImageMapEditor: image map editor
 $PRGNAM: * KLinkStatus: link checker
-$PRGNAM:${TDEFileReplace:-}
+$PRGNAM:
 $PRGNAM:
 " > $PKG/install/slack-desc
 
diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild
index 9d9e69c..cff76e6 100755
--- a/Deps/tqt3/tqt3.SlackBuild
+++ b/Deps/tqt3/tqt3.SlackBuild
@@ -57,17 +57,17 @@ echo $'--- mkspecs/linux-g++/qmake.conf
 +QMAKE_CXX		= $(COMPILER_CXX)
 @@ -40 +40 @@
 -QMAKE_INCDIR		=
-+QMAKE_INCDIR		= $('"${QTDIR_PFX:-}"$'QTDIR)/include/tqt
++QMAKE_INCDIR		= $(TQTDIR)/include/tqt
 @@ -42,2 +42,2 @@
 -QMAKE_INCDIR_X11	= /usr/X11R6/include
 -QMAKE_LIBDIR_X11	= /usr/X11R6/lib
 +QMAKE_INCDIR_X11	= /usr/include/X11
 +QMAKE_LIBDIR_X11	= /usr/lib'"$LIBDIRSUFFIX"$'
 @@ -45,3 +45,3 @@
--QMAKE_LIBDIR_'"${QTDIR_PFX:-}"$'QT		= $('"${QTDIR_PFX:-}"$'QTDIR)/lib
+-QMAKE_LIBDIR_TQT		= $(TQTDIR)/lib
 -QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
 -QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
-+QMAKE_LIBDIR_'"${QTDIR_PFX:-}"$'QT		= $('"${QTDIR_PFX:-}"$'QTDIR)/lib'"$LIBDIRSUFFIX"$'
++QMAKE_LIBDIR_TQT		= $(TQTDIR)/lib'"$LIBDIRSUFFIX"$'
 +QMAKE_INCDIR_OPENGL	= /usr/include/GL
 +QMAKE_LIBDIR_OPENGL	= /usr/lib'"$LIBDIRSUFFIX"$'
 @@ -49,2 +49,2 @@
@@ -190,12 +190,12 @@ mkdir -p $PKG/etc/profile.d
 #
 echo '#!'"/bin/sh
 # Environment path variable for the tQt package.
-export ${QTDIR_PFX:-}QTDIR=$TQTDIR
+export TQTDIR=$TQTDIR
 " > $PKG/etc/profile.d/tqt3.sh
 #
 echo '#!'"/bin/csh
 # Environment path variable for the tQt package:
-setenv ${QTDIR_PFX:-}QTDIR $TQTDIR
+setenv TQTDIR $TQTDIR
 " > $PKG/etc/profile.d/tqt3.csh
 #
 chmod 755 $PKG/etc/profile.d/*
diff --git a/Deps/tqtinterface/tqtinterface.SlackBuild b/Deps/tqtinterface/tqtinterface.SlackBuild
index ec6e4c7..e7124ec 100755
--- a/Deps/tqtinterface/tqtinterface.SlackBuild
+++ b/Deps/tqtinterface/tqtinterface.SlackBuild
@@ -39,13 +39,10 @@ chown_fn
 
 cd_builddir_fn
 
-[[ $TDEVERSION == 14.1.0 ]] && QTINC_PFX=T
 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DQT_PREFIX_DIR=$TQTDIR \
-    -D${QTINC_PFX:-}QT_INCLUDE_DIR=$TQTDIR/include/tqt \
-    -DQT_VERSION=3 \
-    -DWITH_QT3="OFF" \
-    -DWITH_QT4="OFF"
+    -DTQT_INCLUDE_DIR=$TQTDIR/include/tqt \
+    -DQT_VERSION=3
 
 make_fn
 
diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild
index 6af7dc1..f938f99 100755
--- a/Misc/graphviz/graphviz.SlackBuild
+++ b/Misc/graphviz/graphviz.SlackBuild
@@ -26,7 +26,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=graphviz
-VERSION=7.0.5
+VERSION=7.1.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-}
 
@@ -39,6 +39,7 @@ getsource_fn
 untar_fn
 
 # ghostscript918.patch from Arch (thanks!)
+echo -e "\033[39;1m"
 patch -p0 << EOF
 --- plugin/gs/gvloadimage_gs.c
 +++ plugin/gs/gvloadimage_gs.c
@@ -86,7 +87,7 @@ sed -i '/(PS2PDF)/d' $file
 sed -i 's|psfile=$${pdffile%pdf}ps; ||' $file
 sed -i 's|$(GROFF) -Tps.*$|sed "s^.PP^^;s^\.SH^\\n\&^" $< \| $(GROFF) -man -Tpdf -fH -rS10 -rIN=4n -dpaper='"$PS"' -P-p'"$PS"' > $$pdffile|' $file
 done
-#
+echo -e "\033[0m"
 ## the pdfs are installed in the same directory as index.html
 sed -i 's|../doc/||;s|../pdf/||' doc/index.html
 ## add the cgraph tutorial
diff --git a/Misc/imlib2/imlib2.SlackBuild b/Misc/imlib2/imlib2.SlackBuild
index 1316b61..6a5bbe5 100755
--- a/Misc/imlib2/imlib2.SlackBuild
+++ b/Misc/imlib2/imlib2.SlackBuild
@@ -21,7 +21,7 @@
 #   SUCH DAMAGE.
 
 PRGNAM=imlib2
-VERSION=1.10.0
+VERSION=1.11.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-}
 
diff --git a/Misc/mp4v2/mp4v2.SlackBuild b/Misc/mp4v2/mp4v2.SlackBuild
index 2ec5602..ac4ce8e 100755
--- a/Misc/mp4v2/mp4v2.SlackBuild
+++ b/Misc/mp4v2/mp4v2.SlackBuild
@@ -24,7 +24,7 @@
 #   SUCH DAMAGE.
 
 PRGNAM=mp4v2
-VERSION=2.1.1
+VERSION=2.1.2
 BUILD=${BUILD:-1}
 TAG=${TAG:-}
 
@@ -38,6 +38,7 @@ untar_fn
 
 ## patch for gcc10 - error: narrowing conversion of ‘mp4v2::util::SubtitleUtility::LC_LIST’ from ‘unsigned int’ to ‘int’, etc..
 ## thanks to https://bugs.gentoo.org/723098
+echo -e "\033[39;1m"
 patch -N -p0 << EOF || true
 --- libutil/Utility.cpp
 +++ libutil/Utility.cpp
@@ -70,6 +71,7 @@ patch -N -p0 << EOF || true
 -    switch( code ) {
 +    switch( static_cast<unsigned int>( code ) ) {
 EOF
+echo -e "\033[0m"
 
 listdocs_fn
 
@@ -77,13 +79,14 @@ listdocs_fn
 sed -i '/^configure_pkg_config_file/d' CMakeLists.txt
 sed -i 's|install.*mp4v2.pc.*$|configure_pkg_config_file(mp4v2.pc.in)\n&|' CMakeLists.txt
 
-## cmake build needs to be in top level directory for created project.h file installation
+cd_builddir_fn
+
 cmake ${G_NINJA:-} \
     -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
     -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
     -DBUILD_SHARED="ON" \
     -DBUILD_UTILS="ON" \
-    .
+    ..
 
 make_fn
 
diff --git a/Misc/xmedcon/xmedcon.SlackBuild b/Misc/xmedcon/xmedcon.SlackBuild
index 0105c5b..c62895a 100755
--- a/Misc/xmedcon/xmedcon.SlackBuild
+++ b/Misc/xmedcon/xmedcon.SlackBuild
@@ -25,7 +25,7 @@
 #
 # 
 PRGNAM=xmedcon
-VERSION=0.22.0
+VERSION=0.23.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-}
 
diff --git a/README.md b/README.md
index 691481c..8d4c840 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 See [*Cross compiling for RPi3*](#xcompiling) for building for arm_hf and aarch64.
 
 For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series of screens for user input,  
-which will build the release version 14.0.13, or the development versions 14.0.x [\[see note \[5\]\]](#5), or 14.1.0.
+which will build the release version 14.1.0, or the development versions 14.1.x/14.2.0.
 
 [<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png "TDE version")  
 ... select TDE version
@@ -19,7 +19,7 @@ Information about dependencies for some packages has been added at the bottom of
 
 Only building the packages is a global option. It therefore can't be used where the build list includes packages which will need to be installed as dependencies for other packages in the build list [for example tdesdk needs tdepim to be installed].
 
-14.0.13 source archives will be downloaded from a geoIP located mirror site, or the development sources [14.0.x/14.1.0] cloned or updated from trinitydesktop gitea.  
+14.1.0 source archives will be downloaded from a geoIP located mirror site, or the development sources 14.1.x/14.2.0 cloned or updated from trinitydesktop gitea.  
 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).
@@ -35,6 +35,7 @@ URLs for this and other locations are @ https://www.trinitydesktop.org/mirrorsta
 * FEAT= - for development builds - see get-source.sh
 * build_regextester=[yp] - build the regex tester from the tqt3 example - see the tqt3 README
 * mailmerge=n - build kword without mailmerge - see the koffice README and SlackBuild
+* KP_BTN=n - build ksnapshot without the dedicated KolourPaint button - see the tdegraphics README and SlackBuild
 
 ---
 
@@ -76,7 +77,7 @@ Deps/libart-lgpl
 Core/tdelibs
 Core/tdebase
 ```
-The newly introduced cmake-trinity package for R14.0.11+ is downloaded with the first archive, usually tqt3.
+The cmake-trinity package is downloaded with the first archive, usually tqt3.
 
 ---
 
@@ -133,9 +134,6 @@ Includes:
 
 [4] The README for a [native build for Raspberry Pi3](./README-Raspberry-Pi3.md) is out-of-date and cross compiling is a better option.
 
-<a id="5"></a>
-[5] There are no plans for a 14.0.14 release and so the 14.0.x branch is effectively frozen at 14.0.13 - go to [new target...](https://mail.trinitydesktop.org/mailman3/hyperkitty/list/users@trinitydesktop.org/thread/JKKMYZUAFMG4HT2EMKFSZHVSNSUTED27/) for more information.
-
 ---
 
 See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more information
diff --git a/apps-list b/apps-list
index 6e697d0..e950ba4 100644
--- a/apps-list
+++ b/apps-list
@@ -1,4 +1,4 @@
-This file is a work-around for applications [Apps] download URLs, for 14.0.11+, for BUILD-TDE.sh to identify which applications sub-directory a program source archive is in.
+This file is for applications [Apps] download URLs, for BUILD-TDE.sh to identify which applications sub-directory a program source archive is in.
 
 development-Apps/kdbg
 development-Apps/kscope
@@ -18,6 +18,7 @@ multimedia-Apps/k3b
 multimedia-Apps/k3b-i18n
 multimedia-Apps/k9copy
 multimedia-Apps/kaffeine
+multimedia-Apps/kplayer
 multimedia-Apps/rosegarden
 multimedia-Apps/soundkonverter
 office-Apps/kbookreader
@@ -35,6 +36,7 @@ system-Apps/knetstats
 system-Apps/krusader
 system-Apps/kshutdown
 system-Apps/kvkbd
+system-Apps/tdebluez
 system-Apps/tdepowersave
 system-Apps/yakuake
 tdeio-Apps/tdeio-locate
diff --git a/get-source.sh b/get-source.sh
index 3e74b5f..eb5e455 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -48,10 +48,10 @@ getsource_fn ()
 #   SUCH DAMAGE.
 
 # Place to build (TMP_BUILD) package (PKG) and output (OUTPUT) the program:
-## ### moved to BUILD-TDE.sh to export variables for ocaml, facile, and double-conversion builds
-# ### TMP_BUILD=/tmp/build
+ ### moved to BUILD-TDE.sh to export variables for ocaml, facile, and double-conversion builds
+ ### TMP_BUILD=/tmp/build
 PKG=$TMP_BUILD/package-$PRGNAM
-# ### OUTPUT=/tmp
+ ### OUTPUT=/tmp
 
 # remove any previous builds if option chosen
 [[ $KEEP_BUILD != "yes" ]] && [[ $PRE_DOWNLOAD != yes ]] && echo -e "\n removing previous build data .." && rm -rf $TMP_BUILD/{tmp,package}*
@@ -71,14 +71,14 @@ SRCDIR=$BUILD_TDE_ROOT/src
 SB_SRCDIR=$(cd $(dirname $0); pwd)
 
 ## for 14.0.11 onwards, check for cmake archive ..
-[[ $TDEVERSION == 14.0.13 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && (
+[[ $TDEVERSION == 14.1.0 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && (
     echo -e "\nDownloading to $SRCDIR"
-    wget -T 20 -O $SRCDIR/cmake-$TDEVERSION.tar.xz $TDE_MIRROR/releases/R$TDEVERSION/main/common/cmake-trinity-$TDEVERSION.tar.xz
+    wget -T 20 -O $SRCDIR/cmake-$TDEVERSION.tar.xz $TDE_MIRROR/releases/R$TDEVERSION/main/dependencies/tde-cmake-trinity-$TDEVERSION.tar.xz
     echo -e "----\n"
 )
 
-## if 14.0.13 or misc, download archive:
-[[ $TDEVERSION == 14.0.13 || $TDEMIR_SUBDIR == misc ]] && {
+## if 14.1.0 or misc, download archive:
+[[ $TDEVERSION == 14.1.0 || $TDEMIR_SUBDIR == misc ]] && {
 ## check for and remove any zero byte archive files
 [[ ! -s $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \
 rm $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true
@@ -114,7 +114,7 @@ if [ "$P1" == "--download" ]; then
   exit 0
 fi
 } || {
-## otherwise, not R14.0.13 or misc, and we are creating/updating git,
+## otherwise, not R14.1.0 nor misc, and we are creating/updating git,
 ## so [1] start with admin/cmake:
 [[ $(cat $TMPVARS/DL_CGIT) == yes ]] && {
 cd $BUILD_TDE_ROOT/src/cgit
@@ -128,19 +128,19 @@ cd admin
 rm -rf .git/worktrees/*
 git checkout -- *
 git pull
-## repo is in master - update r14.0.x to latest revision
-git fetch origin r14.0.x:r14.0.x)
+## repo is in master - update r14.1.x to latest revision
+git fetch origin r14.1.x:r14.1.x)
 [[ -d cmake ]] && \
 (echo "Updating cmake ..."
 cd cmake
 rm -rf .git/worktrees/*
 git checkout -- *
 git pull
-git fetch origin r14.0.x:r14.0.x)
+git fetch origin r14.1.x:r14.1.x)
 
 ## if admin and cmake don't exist, clone them
 [[ ! -d admin ]] && git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-admin admin
-[[ ! -d cmake ]] && git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-cmake cmake
+[[ ! -d cmake ]] && git clone https://mirror.git.trinitydesktop.org/gitea/TDE/tde-cmake cmake
 
 ## place a marker so that admin/cmake update or clone only once per run of BUILD-TDE.sh
 touch $TMPVARS/admin-cmake-done
@@ -157,7 +157,7 @@ cd $PRGNAM
 rm -rf .git/worktrees/*
 git checkout -- *
 git pull
-[[ $PRGNAM != kplayer ]] && git fetch origin r14.0.x:r14.0.x)
+git fetch origin r14.1.x:r14.1.x)
 ## if the local repository for PRGNAM doesn't exist, clone it ..
 [[ ! -d $PRGNAM ]] && \
 git clone https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM
@@ -170,13 +170,13 @@ cd libltdl
 rm -rf .git/worktrees/*
 git checkout -- *
 git pull
-git fetch origin r14.0.x:r14.0.x)
+git fetch origin r14.1.x:r14.1.x)
 
 [[ ! -d libltdl ]] && \
 git clone https://mirror.git.trinitydesktop.org/gitea/TDE/libltdl
 }
 
-## if tdenetwork, need libtdevnc, but not yet for 14.0.x or 14.0.13 which use krfb/libvncserver
+## if tdenetwork, need libtdevnc
 [[ " tdenetwork " == *$PRGNAM* ]] && {
 [[ -d libtdevnc ]] && \
 (echo "Updating libtdevnc ..."
@@ -184,7 +184,7 @@ cd libtdevnc
 rm -rf .git/worktrees/*
 git checkout -- *
 git pull
-# git fetch origin r14.0.x:r14.0.x
+git fetch origin r14.1.x:r14.1.x
 )
 
 [[ ! -d libtdevnc ]] && \
@@ -200,8 +200,8 @@ true # prevent the following i18n download (attempts) if this routine fails
 ## - same for both creating and updating
 
 cd tdei18n
-# ### will download the template, translations, and tde-i18n-$lang modules to:
-# ### $BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/...
+ ### will download the template, translations, and tde-i18n-$lang modules to:
+ ### $BUILD_TDE_ROOT/src/cgit/tdei18n/cgit/tde-i18n/plain/...
 wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/translations/desktop_files/entry.desktop/entry.desktop.pot
 rm -rf cgit/tde-i18n/plain/template
 wget -m --no-parent --no-host-directories https://mirror.git.trinitydesktop.org/cgit/tde-i18n/plain/template/
@@ -252,22 +252,22 @@ cd $TMP_BUILD/tmp-$PRGNAM
 ##
 ## [1] firstly test for R14 or misc ..
 ##
-[[ $TDEVERSION == 14.0.13 || $TDEMIR_SUBDIR == misc ]] && {
+[[ $TDEVERSION == 14.1.0 || $TDEMIR_SUBDIR == misc ]] && {
 ## unpack R14 or misc
 echo -e "\n unpacking $(basename $SOURCE) ... \n"
 tar -xf $SOURCE
 [[ $TDEMIR_SUBDIR != misc ]] && [[ -e $(ls $PRGNAM*/CMakeLists.txt) ]] && (
 cd $PRGNAM*
 tar -xf $SRCDIR/cmake-$TDEVERSION.tar.xz
-mv cmake-trinity-$TDEVERSION cmake
+mv tde-cmake-trinity-$TDEVERSION cmake
 )
 
 : # if this fails, don't try a git build, and go to [3]
 
 } || {
 
-## [2] not 14.0.13 nor misc, so must be git ..
-[[ $TDEVERSION == 14.1.0 ]] && DEV_BRANCH=master || DEV_BRANCH=r14.0.x
+## [2] not 14.1.0 nor misc, so must be git ..
+[[ $TDEVERSION == 14.2.0 ]] && DEV_BRANCH=master || DEV_BRANCH=r14.1.x
 
 ## copy git content to build area:
 (
@@ -279,14 +279,12 @@ rm -rf .git/worktrees/*
 ## .. plus FEATa for admin, FEATc for cmake if required
 git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/ ${FEAT:-$DEV_BRANCH}
 
-## 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/ ${FEATa:-$DEV_BRANCH}
-}
+
 
 cd ../cmake
 echo -e "\n copying cmake git sources to build area ... \n"
@@ -300,7 +298,7 @@ rm -rf .git/worktrees/*
 git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/libltdl/ $DEV_BRANCH
 }
 
-[[ " tdenetwork " == *$PRGNAM* && $TDEVERSION != 14.0.x ]] && {
+[[ " tdenetwork " == *$PRGNAM* ]] && {
 cd ../libtdevnc/
 echo -e "\n copying libtdevnc git sources to build area ... \n"
 rm -rf .git/worktrees/*
@@ -314,9 +312,9 @@ echo # if this fails, SlackBuild will fail from [3]
 #
 cd $PRGNAM*
 
-## The path to the TDE cmake modules is added for 14.0.11+ & 14.1.0
-##  which otherwise assume a cmake-trinity package is installed to the CMake system directories
-## Create an initial cache file for TDE cmake builds:
+## Create an initial cache file of common options for TDE cmake builds:
+## The path to the TDE cmake modules is added instead of
+## a cmake-trinity package being installed to the CMake system directories
 [[ $VERSION == 14.* ]] && [[ -e CMakeLists.txt ]] && {
 [[ $PRGNAM == libart-lgpl ]] && SLKRCFLAGS=$SLKCFLAGS
 echo 'set ( CMAKE_C_COMPILER '"$(which $COMPILER)"' CACHE FILEPATH "" )