From e178dbcd0d3ddac279d5d342781a5a05ccb97612 Mon Sep 17 00:00:00 2001
From: Ray-V <ray-v@inbox.lv>
Date: Thu, 5 Nov 2020 09:38:04 +0000
Subject: [PATCH] Fix for issue #22 Fixed tqt3 minimal build failure

---
 BUILD-TDE.sh                    | 29 ++++-------------------------
 Core/tdelibs/tdelibs.SlackBuild | 14 +++++++++-----
 Deps/tqt3/tqt3.SlackBuild       |  6 +++---
 3 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh
index 84eb7cf..f89d78b 100755
--- a/BUILD-TDE.sh
+++ b/BUILD-TDE.sh
@@ -451,9 +451,9 @@ mkspecs is only required for linux-g++
 " \
 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" \
-" ktorrent" " └─ Keep designer libs for ktorrent" off "\Zb\Z6 Only required if minimal build selected \Zn" \
+" pim_ksq" " ├─ Keep lib for tdepim and/or ksquirrel" off "\Zb\Z6 Only required if minimal packaging selected \Zn" \
+" tdevel" " ├─ Keep libs for tdevelop" off "\Zb\Z6 Only required if minimal packaging selected \Zn" \
+" ktorrent" " └─ Keep designer libs for ktorrent" off "\Zb\Z6 Only required if minimal packaging 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
@@ -484,27 +484,6 @@ ${DLG_BOX:-0 0}
 [[ $? == 1 ]] && echo leave >  $TMPVARS/PKG_CONFIG_PATH_MOD
 }
 
-
-## only run this if tdelibs has been selected
-rm -f $TMPVARS/SPELL
-[[ $(grep -o tdelibs $TMPVARS/TDEbuilds) ]] && {
-dialog --cr-wrap --nocancel --no-shadow --colors --title " Spell checker " --menu \
-"
-Choose a Spell checker.
-If you chose a spell checker it must be installed, or the build will exit.
-
-This won't affect any Spell checker being installed later, it's just a work-around for a mandatory selection being forced in the source.
- 
-" \
-19 75 4 \
-" Aspell" "" \
-" Hspell" "" \
-" Ispell" "" \
-" None" "Don't have one installed" \
-2> $TMPVARS/SPELL
-}
-
-
 ## only run this if tdebase has been selected
 rm -f $TMPVARS/RUNLEVEL
 [[ $(grep -o tdebase $TMPVARS/TDEbuilds) ]] && {
@@ -848,7 +827,7 @@ Compiler                                \Zb\Z6$COMPILER\Zn
 gcc cpu optimization                    \Zb\Z6$SET_march\Zn
 Number of parallel jobs                 \Zb\Z6$(echo $NUMJOBS|sed 's|-j||')\Zn
 Additional languages                    \Zb\Z6${I18N:-none}\Zn
-Minimal tqt build                       \Zb\Z6${TQT_BLD:-\Z0\Zbn/a}\Zn
+Minimal tqt packaging                   \Zb\Z6${TQT_BLD:-\Z0\Zbn/a}\Zn
 Include tqt html docs                   \Zb\Z6${TQT_DOCS:-\Z0\Zbn/a}\Zn
 Action on failure                       \Zb\Z6${AOF:-continue}\Zn
 Keep the temporary build files          \Zb\Z6$KEEP_BUILD\Zn
diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild
index 6e7a084..357284d 100755
--- a/Core/tdelibs/tdelibs.SlackBuild
+++ b/Core/tdelibs/tdelibs.SlackBuild
@@ -126,10 +126,13 @@ cd_builddir_fn
 sed -i 's|TQT_INCLUDE_DIRS}|&\n  ${AVAHI_TQT_INCLUDE_DIRS}|' ../dnssd/CMakeLists.txt
 }
 
-[[ $(grep Aspell $TMPVARS/SPELL) ]] && ASPELL=ON || {
-[[ $(grep Hspell $TMPVARS/SPELL) ]] && HSPELL=ON ; } || {
-[[ $(grep Ispell $TMPVARS/SPELL) ]] && ISPELL=ON ; } || \
-sed -i 's|^.*Spell checker selected as default.*$|message( STATUS " ## no spell checker selected ##" )|' ../CMakeLists.txt
+## Slackware doesn't include Hspell
+## Prioritise Aspell according to its slack-desc:
+# GNU Aspell is a spell checker designed to eventually replace Ispell.
+[[ -d /usr/lib$LIBDIRSUFFIX/ispell ]] && ISPELL=ON && DEF_SP_CHKR=ISPELL
+[[ -d /usr/lib$LIBDIRSUFFIX/aspell ]] && ASPELL=ON && DEF_SP_CHKR=ASPELL # override ISPELL if both installed
+## just show message without failing if no spell checker is installed
+sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLists.txt
 
 cmake \
     -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@@ -141,6 +144,7 @@ cmake \
     -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \
     -DLIB_SUFFIX=$LIBDIRSUFFIX \
     -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+    -DDEFAULT_SPELL_CHECKER=${DEF_SP_CHKR:-"ASPELL"} \
     -DTDE_MALLOC="OFF" \
     -DTDE_MALLOC_DEBUG="OFF" \
     -DTDE_MALLOC_FULL="OFF" \
@@ -156,7 +160,7 @@ cmake \
     -DWITH_GAMIN="OFF" \
     -DWITH_GCC_VISIBILITY="OFF" \
     -DWITH_HAL="OFF" \
-    -DWITH_HSPELL=${HSPELL:-"OFF"} \
+    -DWITH_HSPELL="OFF" \
     -DWITH_INOTIFY="ON" \
     -DWITH_ISPELL=${ISPELL:-"OFF"} \
     -DWITH_JASPER="OFF" \
diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild
index c3363ce..b4607a0 100755
--- a/Deps/tqt3/tqt3.SlackBuild
+++ b/Deps/tqt3/tqt3.SlackBuild
@@ -140,7 +140,7 @@ echo "yes" | \
 make -i $NUMJOBS symlinks src-qmake src-moc sub-src sub-tools || exit 1
 make install INSTALL_ROOT=$PKG || exit 1
 
-## for a minimal build
+## for a minimal packaging
 [[ $TQT_OPTS == *minimal* ]] && {
 (cd $PKG$TQTDIR/
 rm lib$LIBDIRSUFFIX/libtqt[de]*
@@ -149,8 +149,8 @@ rm lib$LIBDIRSUFFIX/libtqt[de]*
 }
 rm bin/???????*
 rm bin/tqm2ts
-[[ $TQT_OPTS != *ktorrent* ]] && rm -rf plugins/designer
-)}
+[[ $TQT_OPTS != *ktorrent* ]] && rm -rf lib$LIBDIRSUFFIX/tqt/plugins/designer
+)} || true # otherwise will exit 1 if [[ $TQT_OPTS == *ktorrent* ]]
 
 installdocs_fn