From 3c1471c1a45471f941cf90df09c34a52112ef3bb Mon Sep 17 00:00:00 2001
From: Ray-V <ray-v@inbox.lv>
Date: Sun, 29 Oct 2023 09:35:32 +0000
Subject: [PATCH] Updates 29 October 2023 for R14.1.1  libksquirrel - cmake
 build  tdegraphics - kmrml option changes  Misc builds version updates -
 clamav, graphviz, and imlib2  admin patch for visibility support check for
 digikam, gwenview, krusader, ksquirrel, soundkonverter, kipi-plugins

---
 Apps/digikam/digikam.SlackBuild               |  3 +
 Apps/gwenview/gwenview.SlackBuild             |  3 +
 Apps/k9copy/k9copy.SlackBuild                 | 49 +---------
 Apps/klamav/README                            |  5 +-
 Apps/klamav/klamav.SlackBuild                 |  2 +-
 Apps/koffice/README                           | 18 ----
 Apps/koffice/koffice.SlackBuild               | 17 ----
 Apps/krusader/krusader.SlackBuild             |  3 +
 Apps/ksquirrel/ksquirrel.SlackBuild           |  3 +
 Apps/soundkonverter/soundkonverter.SlackBuild |  3 +
 Apps/tdebluez/tdebluez.SlackBuild             |  3 +-
 BUILD-TDE.sh                                  | 10 +--
 Core/tde-i18n/tde-i18n.SlackBuild             |  6 +-
 Core/tdeadmin/tdeadmin.SlackBuild             |  2 +-
 Core/tdegraphics/tdegraphics.SlackBuild       | 16 ++--
 Deps/tqt3/tqt3.SlackBuild                     |  1 -
 Libs/kipi-plugins/kipi-plugins.SlackBuild     |  3 +
 Libs/libksquirrel/libksquirrel.SlackBuild     | 90 +++++++++++++++----
 Misc/graphviz/graphviz.SlackBuild             |  4 +-
 Misc/imlib2/imlib2.SlackBuild                 |  2 +-
 README.md                                     | 10 +--
 get-source.sh                                 | 12 +--
 22 files changed, 129 insertions(+), 136 deletions(-)

diff --git a/Apps/digikam/digikam.SlackBuild b/Apps/digikam/digikam.SlackBuild
index c6ecf37..bf8729f 100755
--- a/Apps/digikam/digikam.SlackBuild
+++ b/Apps/digikam/digikam.SlackBuild
@@ -43,6 +43,9 @@ langdocdk="digikam";for Lang in $langs;do [[ -d doc/$Lang"_digikam" ]] && langdo
 langdocsf="showfoto";for Lang in $langs;do [[ -d doc/$Lang"_showfoto" ]] && langdocsf=$(echo $Lang"_showfoto" $langdocsf);done
 sed -i "s|SUBDIRS =.*$|SUBDIRS =. $langdocdk $langdocsf|" doc/Makefile.am
 
+## fix check for visibility support - tde-common-admin pull #20
+sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in
+
 listdocs_fn
 
 ltoolupdate_fn
diff --git a/Apps/gwenview/gwenview.SlackBuild b/Apps/gwenview/gwenview.SlackBuild
index c0b1f24..68aa829 100755
--- a/Apps/gwenview/gwenview.SlackBuild
+++ b/Apps/gwenview/gwenview.SlackBuild
@@ -34,6 +34,9 @@ getsource_fn
 
 untar_fn
 
+## fix check for visibility support - tde-common-admin pull #20
+sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in
+
 listdocs_fn
 
 ltoolupdate_fn
diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild
index f9e77dc..cc7a33e 100755
--- a/Apps/k9copy/k9copy.SlackBuild
+++ b/Apps/k9copy/k9copy.SlackBuild
@@ -33,64 +33,23 @@ getsource_fn
 
 untar_fn
 
-## clang build - C++11 requires a space between literal and identifier
-sed -i 's|%%"REG_b|%%" REG_b|;s|%%"REG_S|%%" REG_S|' k9vamps/cputest.cpp
-## clang build - fix error for development builds
-[[ ! $(grep sFileName.local8Bit\(\).data\(\) libk9copy/k9saveimage.cpp) ]] && \
-sed -i 's|sFileName.local8Bit()|&.data()|' libk9copy/k9saveimage.cpp
-
-[[ $TDEVERSION == 14.1.0 ]] && {
-
-# 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 != "" ]] && langs=" $(echo $langs | sed 's|.po||g')"
-
-## config.guess uses uname to identify the system so incorrectly identifies
-## a 32 bit system using a 64 bit kernel as 64 bit
-## Could use --build=, but this way configure gets to choose the triple
-[[ $(getconf LONG_BIT) == 32 && $(uname -m) == *64 ]] && \
-sed -i 's|^UNAME_MACHINE=.*$|UNAME_MACHINE=i586|' admin/config.guess
-
-} || {
-
 ## for slack-desc
 langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done
 
-}
-
 listdocs_fn
 
-[[ $TDEVERSION == 14.1.0 ]] && ltoolupdate_fn
-
 chown_fn
 
 cd_builddir_fn
 
-[[ $TDEVERSION == 14.1.0 ]] && {
-
-[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility"
-
-CFLAGS="$SLKRCFLAGS" \
-CXXFLAGS="$SLKRCFLAGS" \
-CC=$COMPILER \
-CXX=$COMPILER_CXX \
-../configure \
-   --prefix=$INSTALL_TDE \
-   --mandir=$INSTALL_TDE/man \
-   --disable-rpath \
-   ${EN_GCC_VIS:-} \
-   --enable-closure \
-   --enable-k3bdevices # do not activate hal/dbus support (use k3bdevice instead)
-
-} || {
+##${CMAKE_SYSTEM_PROCESSOR} is identified as x86_64 when using a 64 bit kernel on a 32 bit system
+## which incorrectly sets the OS as 64 bit
+[[ $(getconf LONG_BIT) == 32 && $(uname -m) == *64 ]] && \
+sed -i 's|# architecture|&\n set ( CMAKE_SYSTEM_PROCESSOR i686 )|' ../ConfigureChecks.cmake
 
 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
     -DWITH_OPENGL="ON"
 
-}
-
 make_fn
 
 installdocs_fn
diff --git a/Apps/klamav/README b/Apps/klamav/README
index 87358ca..8dff31f 100644
--- a/Apps/klamav/README
+++ b/Apps/klamav/README
@@ -1,5 +1,4 @@
-klamav needs clamav as a build time requirement
+klamav needs clamav as a build time requirement.
 
-Download from:
-https://www.clamav.net/downloads/production/clamav-1.0.1.tar.gz
+If it's not installed or the source isn't available, running the SlackBuild will show the download URL and exit.
  
diff --git a/Apps/klamav/klamav.SlackBuild b/Apps/klamav/klamav.SlackBuild
index 1f4f2b0..86bfa4f 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=1.1.0
+clamav_VERS=1.2.0
 clamav_installed_fn () { pkg-config libclamav ;}
 ## If it's already installed, go to end
 clamav_installed_fn || {
diff --git a/Apps/koffice/README b/Apps/koffice/README
index 5d096a2..6dcda6b 100644
--- a/Apps/koffice/README
+++ b/Apps/koffice/README
@@ -1,24 +1,6 @@
-Chalk/krita will crash trying to load PNGs it saved if it is built with libpng-1.6.
-
-The patch included with the SlackBuild is a workaround until koffice issue 20 has been fixed.
-
-If it is necessary to convert the image to the RGB working space, there are a number of profiles installed with {chalk,krita} in <TDE-installation-directory>/share/apps/{chalk,krita}/profiles/ which can be installed with Imagemagick's 'convert', or GraphicsMagick's 'gm convert'
-
-Example:
-"""""""
-in=<path-to>/original.png    # existing
-out=<path-to>/converted.png  # will be created
-profile=<TDE-installation-directory>/share/apps/{chalk,krita}/profiles/srgb_color_space_profile.icm
-convert='gm convert'
-
-($convert $in -profile $profile $out)
-
--------------
-
 kword/mailmerge requires kspread/libkspreadcommon so if kword is chosen to be built, the SlackBuild will add kspread to the build list if not already selected.
 
 Or, to build kword without mailmerge and the kspread dependency, run:
 
 mailmerge=n ./BUILD-TDE.sh
  
- 
diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild
index 4cce63d..e455cf8 100755
--- a/Apps/koffice/koffice.SlackBuild
+++ b/Apps/koffice/koffice.SlackBuild
@@ -33,23 +33,6 @@ getsource_fn
 
 untar_fn
 
-[[ $TDEVERSION == 14.1.0 ]] && {
-## Workaround to prevent chalk/krita crashing when loading PNGs it has saved
-## Awaiting fix for koffice issue 20 - done for 14.1.x/14.1.1
-patch -p0 << EOF
---- filters/chalk/png/kis_png_converter.cpp
-+++ filters/chalk/png/kis_png_converter.cpp
-@@ -202,4 +202,7 @@
-     // read all PNG info up to image data
-     png_read_info(png_ptr, info_ptr);
-+#if PNG_LIBPNG_VER >= 10600
-+    png_set_invalid(png_ptr, info_ptr, PNG_INFO_iCCP);
-+#endif
- 
-     // Read information about the png
-EOF
-}
-
 ## fix chalk crashing -
 ## - set liblcms as a direct dependency - see TI issue 37 for details
 sed -i '23iKDE_CXXFLAGS = $(LCMS_LIBS)' chalk/Makefile.am
diff --git a/Apps/krusader/krusader.SlackBuild b/Apps/krusader/krusader.SlackBuild
index 5cd08f6..edea739 100755
--- a/Apps/krusader/krusader.SlackBuild
+++ b/Apps/krusader/krusader.SlackBuild
@@ -72,6 +72,9 @@ langs=$(echo $langs | sed 's|.po||g')
 ldocs="en tdeioslave/{krarc,virt}"
 [[ $I18N != *ru* ]] && sed -i 's| ru||' doc/Makefile.am || ldocs="$ldocs ru"
 
+## fix check for visibility support - tde-common-admin pull #20
+sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in
+
 listdocs_fn
 
 ltoolupdate_fn
diff --git a/Apps/ksquirrel/ksquirrel.SlackBuild b/Apps/ksquirrel/ksquirrel.SlackBuild
index 477edb5..2802e0d 100755
--- a/Apps/ksquirrel/ksquirrel.SlackBuild
+++ b/Apps/ksquirrel/ksquirrel.SlackBuild
@@ -48,6 +48,9 @@ langs=$(echo $langs | sed 's|.po||g')
 ldocs="ru"
 [[ $I18N != *ru* ]] && sed -i "s| ru||" doc/Makefile.am && ldocs=""
 
+## fix check for visibility support - tde-common-admin pull #20
+sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in
+
 listdocs_fn
 
 ltoolupdate_fn
diff --git a/Apps/soundkonverter/soundkonverter.SlackBuild b/Apps/soundkonverter/soundkonverter.SlackBuild
index 8df242f..e276b7c 100755
--- a/Apps/soundkonverter/soundkonverter.SlackBuild
+++ b/Apps/soundkonverter/soundkonverter.SlackBuild
@@ -39,6 +39,9 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po
 sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
 langs=$(echo $langs | sed "s|.po||g")
 
+## fix check for visibility support - tde-common-admin pull #20
+sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in
+
 listdocs_fn
 
 ltoolupdate_fn
diff --git a/Apps/tdebluez/tdebluez.SlackBuild b/Apps/tdebluez/tdebluez.SlackBuild
index 28fcb33..741cbf7 100755
--- a/Apps/tdebluez/tdebluez.SlackBuild
+++ b/Apps/tdebluez/tdebluez.SlackBuild
@@ -40,8 +40,7 @@ sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" {README.md,doc/en/tdebluez.docbook}
 [[ ! ${PS:-} ]] && {
 [[ $(locale LC_PAPER) == 297* ]] && PS=a4 || PS=letter
 }
-[[ $TDEVERSION == 14.1.0 ]] && DXYFILE=Doxyfile || DXYFILE=tdebluez.Doxyfile.cmake
-sed -i "s|^PAPER_TYPE.*$|PAPER_TYPE             = $PS|" $DXYFILE
+sed -i "s|^PAPER_TYPE.*$|PAPER_TYPE             = $PS|" tdebluez.Doxyfile.cmake
 
 ## for slack-desc
 langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh
index f391d79..5889c46 100755
--- a/BUILD-TDE.sh
+++ b/BUILD-TDE.sh
@@ -101,7 +101,7 @@ Set the version of TDE to be built.
  
 " \
 13 75 3 \
-"14.1.0" "the R14.1.0 release - source from archives" \
+"14.1.1" "the R14.1.1 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
@@ -339,7 +339,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
 "Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 Optional build-time dependencies -> akode + tdemultimedia \Zn" \
 "Core/tdeadmin" "System admin packages" off "\Zb\Z6  \Zn" \
 "Core/tdeartwork" "Extra artwork/themes/wallpapers for TDE" off "\Zb\Z6   \Zn" \
-" Misc/graphviz" "Graph Visualization" off "\Zb\Z6 Runtime option for kscope. pdf/html docs not installed by default  \Zn" \
+" Misc/graphviz" "Graph Visualization" off "\Zb\Z6 Runtime option for kscope. Build-time option for tdeedu. \Zn" \
 "Core/tdeedu" "Educational software" off "\Zb\Z6 Build-time option -> dot [graphviz] \Zn" \
 "Core/tdegames" "Games for TDE - atlantik, kasteroids, katomic, etc." off "\Zb\Z6   \Zn" \
 " Misc/imlib" "An image loading and rendering library" off "\Zb\Z6 Build-time option for tdegraphics - needed for kuickshow \Zn" \
@@ -422,7 +422,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
 2> $TMPVARS/TDEbuilds
 # successful builds are removed from the TDEbuilds list as '$dir ' so add a space to the last entry
 # and the " needs to be removed because the Misc entries are double-quoted,
-## and if they're not, they have a non-breaking space prefixed
+## or, they have a non-breaking space prefixed
 sed -i 's|$| |;s|" M|M|g;s|"||g;s| ||g' $TMPVARS/TDEbuilds
 ##                                ^ == nbsp
 
@@ -752,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.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/TDEVERSION) == 14.1.1 ]] && 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.1 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.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild
index 3daa74b..063ae2f 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.1.0 ]] && {
+[[ $TDEVERSION == 14.1.1 ]] && {
 # extract the template source once only
 echo -e "\033[39;1m
   Extracting the template source from $(basename $SOURCE) ...
@@ -71,7 +71,7 @@ cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/)
 
 for lang in $I18N
 do
-[[ $TDEVERSION == 14.1.0 ]] && {
+[[ $TDEVERSION == 14.1.1 ]] && {
 # 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) ...
@@ -107,7 +107,7 @@ chown_fn
 mkdir -p $PRGNAM-$lang/build
 cd $PRGNAM-$lang/build
 
-## The path to the TDE cmake modules is added for 14.0.11+ & 14.1.0 which assume a cmake-trinity package is installed to the CMake system directories
+## The path to the TDE cmake modules is added for 14.0.11+ & 14.1.0+ which assume a cmake-trinity package is installed to the CMake system directories
 cmake ${G_NINJA:-} \
     -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
diff --git a/Core/tdeadmin/tdeadmin.SlackBuild b/Core/tdeadmin/tdeadmin.SlackBuild
index fe03084..0683e8d 100755
--- a/Core/tdeadmin/tdeadmin.SlackBuild
+++ b/Core/tdeadmin/tdeadmin.SlackBuild
@@ -72,7 +72,7 @@ $PRGNAM: System admin packages
 $PRGNAM:
 $PRGNAM: * kcron: Editor for the cron command scheduler.
 $PRGNAM: * kdat: Tape backup tool.
-$PRGNAM: * tdefile-plugins: Make Konquerer display info about *.dep/rpm files.
+$PRGNAM: * tdefile-plugins: Make Konquerer display info about *.deb/rpm files.
 $PRGNAM: * kpackage: Manager for DEB, RPM and similar software packages.
 $PRGNAM: * ksysv: An editor for System V startup schemes.
 $PRGNAM: * kuser: An user manager.
diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild
index fe984f0..a78ca52 100755
--- a/Core/tdegraphics/tdegraphics.SlackBuild
+++ b/Core/tdegraphics/tdegraphics.SlackBuild
@@ -102,20 +102,13 @@ EOF
 echo -e "\033[0m"
 }
 
-## _OBJECT_NAME_STRING defines have been removed from tqt.h for 14.1.x [aka 14.1.1] and 14.2.0,
-## but KMRML remains an option for 14.1.x
-[[ $TDEVERSION == 14.1.x ]] && {
-sed -i 's|TQSTRINGLIST_OBJECT_NAME_STRING|"TQStringList"|' kmrml/kmrml/lib/watcher_stub.cpp
-## and Q_OBJECT has been replaced with TQ_OBJECT
-find kmrml/kmrml/ -type f -exec sed -i -e 's|Q_OBJECT|T&|' {} \;
-}
-
 listdocs_fn
 
 chown_fn
 
 cd_builddir_fn
 
+## change the bug reporting URL
 sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1
 
 # If imlib is installed, include Kuickshow:
@@ -162,7 +155,9 @@ mkdir_install_fn
 
 doinst_sh_fn
 
-echo "
+## KMRML removed from 14.2.0
+[[ $TDEVERSION != 14.2.0 ]] && kmrml=\\n$PRGNAM': * kmrml: Connects to a MRML server and find similar images'
+echo -e "
 # 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 '|'
@@ -179,8 +174,7 @@ $PRGNAM: * kdvi: Program (and embeddable KPart) to display *.DVI files from TeX
 $PRGNAM: * kfax: Display raw and tiffed fax images (g3, g3-2d, g4).
 $PRGNAM: * kfaxview: An embeddable KPart to display tiffed fax images.
 $PRGNAM: * kgamma: set monitor gamma
-$PRGNAM: * kghostview: Program (and embeddable KPart) to display *.pdf and *.ps
-$PRGNAM: * kmrml: Connects to a MRML server and find similar images
+$PRGNAM: * kghostview: Program (and embeddable KPart) to display *.pdf and *.ps${kmrml:-}
 $PRGNAM: * kolourpaint: An easy-to-use paint program designed for drawing
 $PRGNAM:                simple diagrams/logos/icons and editing screenshots.
 $PRGNAM: * kooka: A raster image scan program, based on SANE and libkscan.
diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild
index cff76e6..4a85fc9 100755
--- a/Deps/tqt3/tqt3.SlackBuild
+++ b/Deps/tqt3/tqt3.SlackBuild
@@ -44,7 +44,6 @@ sed -i "s|CONFIG.*$|& ${NO_WARN:+warn_off}|" mkspecs/linux-g++/qmake.conf
 ## and added during configure with the -R option
 ## lib suffix might be 64
 ## add -headerdir as set in configure
-[[ $TDEVERSION == 14.1.0 ]] && QTDIR_PFX=T || QTDIR=$TQTDIR
 ## allow building with clang, either build-time or run-time
 [[ ! $(grep COMPILER mkspecs/linux-g++/qmake.conf) ]] && {
 echo $'--- mkspecs/linux-g++/qmake.conf
diff --git a/Libs/kipi-plugins/kipi-plugins.SlackBuild b/Libs/kipi-plugins/kipi-plugins.SlackBuild
index dd307df..0cc0267 100755
--- a/Libs/kipi-plugins/kipi-plugins.SlackBuild
+++ b/Libs/kipi-plugins/kipi-plugins.SlackBuild
@@ -48,6 +48,9 @@ done
 sed -i "s|SUBDIRS =.*$|SUBDIRS =$langs|" po/Makefile.am
 sed -i "s|SUBDIRS =.*$|SUBDIRS =$langdoc|" doc/Makefile.am
 
+## fix check for visibility support - tde-common-admin pull #20
+sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in
+
 listdocs_fn
 
 ltoolupdate_fn
diff --git a/Libs/libksquirrel/libksquirrel.SlackBuild b/Libs/libksquirrel/libksquirrel.SlackBuild
index 22075ef..4e9e825 100755
--- a/Libs/libksquirrel/libksquirrel.SlackBuild
+++ b/Libs/libksquirrel/libksquirrel.SlackBuild
@@ -34,27 +34,87 @@ getsource_fn
 untar_fn
 
 ## don't install 'sources' docs
-sed -i 's|sources ||' doc/Makefile.am
+sed -i '13,18d' doc/CMakeLists.txt
 
 listdocs_fn
 
-ltoolupdate_fn
-
 chown_fn
 
-#cd_builddir_fn - don't use
-
 ## don't include man pages, they're a waste of space
-sed -i 's|SUBDIRS =.*$|SUBDIRS =. html sources|' doc/Makefile.in
-
-CFLAGS="$SLKRCFLAGS" \
-CXXFLAGS="$SLKRCFLAGS" \
-CC=$COMPILER \
-CXX=$COMPILER_CXX \
-./configure \
-   --prefix=$INSTALL_TDE \
-   --disable-rpath \
-   --enable-closure
+sed -i '7,12d' doc/CMakeLists.txt
+
+## These tests are for codecs that don't have native Slackware support
+## and are therefore turned on only if the required dependencies are found
+[[ $(which medcon) ]] 2>/dev/null && DICOM=ON || echo " ## the dicom codec won't be built because medcon not found";echo
+[[ $(which vec2web) ]] 2>/dev/null && DXF=ON || echo " ## the dxf codec won't be built because vec2web not found";echo
+
+## These codecs all require dependencies which are found in the l/netpbm package
+[[ $(which ilbmtoppm) ]] 2>/dev/null && NETPBM=ON || echo " ## the iff, leaf, mac, neo, pi1, pi3, pict, utah, xim codecs
+ ## won't be built - the l/netpbm package is needed";echo
+
+cd_builddir_fn
+
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+    -DWITH_JPEG="ON" \
+    -DWITH_LCMS="ON" \
+    -DBUILD_AVS="ON" \
+    -DBUILD_BMP="ON" \
+    -DBUILD_CAMERA="ON" \
+    -DBUILD_CUT="ON" \
+    -DBUILD_DDS="ON" \
+    -DBUILD_DICOM=${DICOM:-OFF} \
+    -DBUILD_DJVU="ON" \
+    -DBUILD_DXF=${DXF:-OFF} \
+    -DBUILD_EPS="ON" \
+    -DBUILD_FIG="ON" \
+    -DBUILD_FLI="ON" \
+    -DBUILD_GIF="ON" \
+    -DBUILD_HDR="ON" \
+    -DBUILD_ICO="ON" \
+    -DBUILD_IFF=${NETPBM:-OFF} \
+    -DBUILD_JBIG="ON" \
+    -DBUILD_JPEG2000="ON" \
+    -DBUILD_JPEG="ON" \
+    -DBUILD_KOALA="ON" \
+    -DBUILD_LEAF=${NETPBM:-OFF} \
+    -DBUILD_LIF="ON" \
+    -DBUILD_LJPEG="ON" \
+    -DBUILD_MAC=${NETPBM:-OFF} \
+    -DBUILD_MDL="ON" \
+    -DBUILD_MNG="ON" \
+    -DBUILD_MSP="ON" \
+    -DBUILD_MTV="ON" \
+    -DBUILD_NEO=${NETPBM:-OFF} \
+    -DBUILD_OPENEXR="ON" \
+    -DBUILD_PCX="ON" \
+    -DBUILD_PI1=${NETPBM:-OFF} \
+    -DBUILD_PI3=${NETPBM:-OFF} \
+    -DBUILD_PICT=${NETPBM:-OFF} \
+    -DBUILD_PIX="ON" \
+    -DBUILD_PNG="ON" \
+    -DBUILD_PNM="ON" \
+    -DBUILD_PSD="ON" \
+    -DBUILD_PSP="ON" \
+    -DBUILD_PXR="ON" \
+    -DBUILD_RAS="ON" \
+    -DBUILD_RAWRGB="ON" \
+    -DBUILD_SCT="ON" \
+    -DBUILD_SGI="ON" \
+    -DBUILD_SUN="ON" \
+    -DBUILD_SVG="ON" \
+    -DBUILD_TGA="ON" \
+    -DBUILD_TIFF="ON" \
+    -DBUILD_TTF="ON" \
+    -DBUILD_UTAH=${NETPBM:-OFF} \
+    -DBUILD_WAL="ON" \
+    -DBUILD_WBMP="ON" \
+    -DBUILD_WMF="ON" \
+    -DBUILD_XBM="ON" \
+    -DBUILD_XCF="ON" \
+    -DBUILD_XCUR="ON" \
+    -DBUILD_XIM=${NETPBM:-OFF} \
+    -DBUILD_XPM="ON" \
+    -DBUILD_XWD="ON"
 
 make_fn
 
diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild
index b09f886..527dee2 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=8.1.0
+VERSION=9.0.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-}
 
@@ -73,7 +73,7 @@ patch -p0 << EOF
  }
 EOF
 
-## .. output man pages to pdf, sans-serif [helvetica] font, 10pt, indentation, page size, paper size
+## The groff options will output man pages to pdf, sans-serif [helvetica] font, 10pt, indentation, page size, paper size
 ## with at least one line before a section heading
 ## User set paper size or as per locale - see groff_font for valid sizes
 [[ ! ${PS:-} ]] && {
diff --git a/Misc/imlib2/imlib2.SlackBuild b/Misc/imlib2/imlib2.SlackBuild
index 5457a8d..3f174c5 100755
--- a/Misc/imlib2/imlib2.SlackBuild
+++ b/Misc/imlib2/imlib2.SlackBuild
@@ -21,7 +21,7 @@
 #   SUCH DAMAGE.
 
 PRGNAM=imlib2
-VERSION=1.11.1
+VERSION=1.12.1
 BUILD=${BUILD:-1}
 TAG=${TAG:-}
 
diff --git a/README.md b/README.md
index 8d4c840..011d601 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.1.0, or the development versions 14.1.x/14.2.0.
+which will build the release version 14.1.1, 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.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.  
+14.1.1 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).
@@ -32,7 +32,7 @@ If you're curious about what this might involve, [take a look at a sample build
 URLs for this and other locations are @ https://www.trinitydesktop.org/mirrorstatus.php
 * BUILD= - sets the package build identifier, overriding the SlackBuild default of 1
 * GCC_VIS=0 - override setting gcc visibility if it has been set ON in tdelibs
-* FEAT= - for development builds - see get-source.sh
+* FEAT= - test a pre-merge feature 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
@@ -97,7 +97,7 @@ Because of its position in the Slackbuild and the patch -p0 option, the path to
 
 The build is set up to clone the individual TDE apps from trinitydesktop gitea - except for individual language packs of tde-i18n. The whole tde-i18n download is ~1x10^6 bytes, so to reduce that, wget is used to download individual tde-i18n-$lang packs as they are not git repositories.
 
-Once any git repository has been cloned, further downloads are updates only[2], giving the best options - only fetching what is needed, and incremental updates.
+Once any git repository has been cloned, further downloads are updates only [*[2]*](#git_updates), giving the best options - only fetching what is needed, and incremental updates.
 
 The git repositories are cloned to 'src/cgit'
 
@@ -128,7 +128,7 @@ Includes:
 
 [1] TDM may need some manual setting up - see Core/tdebase/README, which can also be viewed while running ./BUILD-TDE.sh if tdebase is selected.
 
-[2] The i18n downloads with wget can't be updated because cgit produces 'current time' timestamps. The consequence is that if tde-i18n-$lang is a part of the build after its initial download, it will be downloaded again. As updates are infrequent, once built, there will probably be no need to do so again and so tde-i18n for a particular language will probably only be run once. On that basis I don't see this being a significant issue.
+<a id="git_updates"></a>[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.
 
diff --git a/get-source.sh b/get-source.sh
index eb5e455..c4b372b 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -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.1.0 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && (
+[[ $TDEVERSION == 14.1.1 && ! -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/dependencies/tde-cmake-trinity-$TDEVERSION.tar.xz
     echo -e "----\n"
 )
 
-## if 14.1.0 or misc, download archive:
-[[ $TDEVERSION == 14.1.0 || $TDEMIR_SUBDIR == misc ]] && {
+## if 14.1.1 or misc, download archive:
+[[ $TDEVERSION == 14.1.1 || $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.1.0 nor misc, and we are creating/updating git,
+## otherwise, not R14.1.1 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
@@ -252,7 +252,7 @@ cd $TMP_BUILD/tmp-$PRGNAM
 ##
 ## [1] firstly test for R14 or misc ..
 ##
-[[ $TDEVERSION == 14.1.0 || $TDEMIR_SUBDIR == misc ]] && {
+[[ $TDEVERSION == 14.1.1 || $TDEMIR_SUBDIR == misc ]] && {
 ## unpack R14 or misc
 echo -e "\n unpacking $(basename $SOURCE) ... \n"
 tar -xf $SOURCE
@@ -266,7 +266,7 @@ mv tde-cmake-trinity-$TDEVERSION cmake
 
 } || {
 
-## [2] not 14.1.0 nor misc, so must be git ..
+## [2] not 14.1.1 nor misc, so must be git ..
 [[ $TDEVERSION == 14.2.0 ]] && DEV_BRANCH=master || DEV_BRANCH=r14.1.x
 
 ## copy git content to build area: