diff --git a/Apps/abakus/abakus.SlackBuild b/Apps/abakus/abakus.SlackBuild
index 76e1fa9..ebd61e1 100755
--- a/Apps/abakus/abakus.SlackBuild
+++ b/Apps/abakus/abakus.SlackBuild
@@ -42,19 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/amarok/amarok.SlackBuild b/Apps/amarok/amarok.SlackBuild
index 79e14b4..cf1db31 100755
--- a/Apps/amarok/amarok.SlackBuild
+++ b/Apps/amarok/amarok.SlackBuild
@@ -45,10 +45,8 @@ sed -i -e 's|wav )|wav )\nadd_subdirectory( speex )|' \
-e 's|tagaac-static|tagaac-static tagspeex-static|' amarok/src/metadata/CMakeLists.txt
## 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
+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
listdocs_fn
@@ -69,21 +67,11 @@ pkg-config libxine && XINE="ON"
## Build aKode-engine?
pkg-config akode && AKODE="ON"
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_AKODE=${AKODE:-"OFF"} \
-DWITH_AMAZON="ON" \
-DWITH_DAAP="OFF" \
-DWITH_EMBEDDED_SQLITE="OFF" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_IFP="OFF" \
-DWITH_INOTIFY="OFF" \
-DWITH_IPOD="OFF" \
@@ -97,11 +85,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_POSTGRESQL="OFF" \
-DWITH_SYSTEM_SQLITE="ON" \
-DWITH_XINE=${XINE:-"OFF"} \
- -DWITH_YAUAP=${YAUAP:-"OFF"} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+ -DWITH_YAUAP=${YAUAP:-"OFF"}
make_fn
diff --git a/Apps/codeine/codeine.SlackBuild b/Apps/codeine/codeine.SlackBuild
index dc56805..c392a90 100755
--- a/Apps/codeine/codeine.SlackBuild
+++ b/Apps/codeine/codeine.SlackBuild
@@ -43,21 +43,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/dolphin/dolphin.SlackBuild b/Apps/dolphin/dolphin.SlackBuild
index e772006..94876d1 100755
--- a/Apps/dolphin/dolphin.SlackBuild
+++ b/Apps/dolphin/dolphin.SlackBuild
@@ -42,20 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/filelight/filelight.SlackBuild b/Apps/filelight/filelight.SlackBuild
index 3caa980..65fa3e3 100755
--- a/Apps/filelight/filelight.SlackBuild
+++ b/Apps/filelight/filelight.SlackBuild
@@ -34,6 +34,26 @@ 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
@@ -44,21 +64,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild
index 7147004..53fa242 100755
--- a/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild
+++ b/Apps/gtk-qt-engine/gtk-qt-engine.SlackBuild
@@ -34,10 +34,7 @@ getsource_fn
untar_fn
## for slack-desc
-langs=""
-for Lang in $I18N
-do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang"
-done
+langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
listdocs_fn
@@ -46,20 +43,7 @@ chown_fn
cd_builddir_fn
## BONOBO will be included in the build if installed
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
@@ -86,7 +70,7 @@ $PRGNAM: Styles and Fonts' section in the TDE control center and select
$PRGNAM: 'Use my TDE style in GTK applications'.
$PRGNAM:
$PRGNAM: With language support for:
-$PRGNAM: en$langs
+$PRGNAM: $langs
$PRGNAM:
$PRGNAM:
$PRGNAM:
diff --git a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild
index 08eb465..5467d09 100755
--- a/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild
+++ b/Apps/gtk3-tqt-engine/gtk3-tqt-engine.SlackBuild
@@ -39,18 +39,8 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_TESTS="OFF" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+ -DBUILD_TESTS="OFF"
make_fn
diff --git a/Apps/gwenview-i18n/gwenview-i18n.SlackBuild b/Apps/gwenview-i18n/gwenview-i18n.SlackBuild
index bbfffb1..7f5161f 100755
--- a/Apps/gwenview-i18n/gwenview-i18n.SlackBuild
+++ b/Apps/gwenview-i18n/gwenview-i18n.SlackBuild
@@ -78,17 +78,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/k3b-i18n/k3b-i18n.SlackBuild b/Apps/k3b-i18n/k3b-i18n.SlackBuild
index c1f3aca..7b4ff40 100755
--- a/Apps/k3b-i18n/k3b-i18n.SlackBuild
+++ b/Apps/k3b-i18n/k3b-i18n.SlackBuild
@@ -48,15 +48,8 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DBUILD_DOC="ON" \
- -DBUILD_MESSAGES="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+ -DBUILD_MESSAGES="ON"
make_fn
diff --git a/Apps/k3b/k3b.SlackBuild b/Apps/k3b/k3b.SlackBuild
index 7befb82..37fad82 100755
--- a/Apps/k3b/k3b.SlackBuild
+++ b/Apps/k3b/k3b.SlackBuild
@@ -170,22 +170,27 @@ untar_fn
mkdir doc/misc
mv FAQ doc/misc/
+## build fails with gcc visibility support
+sed -i '/check for gcc visibility support/,+4d' 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
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_LIBDVDREAD="ON" \
-DWITH_MUSICBRAINZ=${MUSICBRAINZ:-"OFF"} \
-DWITH_SYSTEM_LIBSAMPLERATE="ON" \
@@ -202,10 +207,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_MUSEPACK=${MUSEPACK:-"OFF"} \
-DWITH_VORBIS="ON" \
-DWITH_LAME=${LAME:-"OFF"} \
- -DBUILD_K3BSETUP="ON" \
- -DBUILD_DOC="ON" \
- -Wno-dev \
- ..
+ -DBUILD_K3BSETUP="ON"
make_fn
diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild
index ec06e42..b22b97e 100755
--- a/Apps/k9copy/k9copy.SlackBuild
+++ b/Apps/k9copy/k9copy.SlackBuild
@@ -42,6 +42,12 @@ langs="";for Lang in $I18N;do [[ -e po/$Lang.po ]] && langs="$langs $Lang.po";do
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
+
listdocs_fn
ltoolupdate_fn
diff --git a/Apps/kaffeine/kaffeine.SlackBuild b/Apps/kaffeine/kaffeine.SlackBuild
index b8030a9..b5c4b28 100755
--- a/Apps/kaffeine/kaffeine.SlackBuild
+++ b/Apps/kaffeine/kaffeine.SlackBuild
@@ -46,19 +46,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_DPMS="ON" \
-DWITH_XTEST="ON" \
-DWITH_XINERAMA="ON" \
@@ -68,9 +56,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_LAME="ON" \
-DWITH_DVB="ON" \
-DUSE_TQT_ONLY="OFF" \
- -DWITH_XINIT_WORKAROUND="OFF" \
- -Wno-dev \
- ..
+ -DWITH_XINIT_WORKAROUND="OFF"
make_fn
diff --git a/Apps/kbfx/kbfx.SlackBuild b/Apps/kbfx/kbfx.SlackBuild
index 7b6aa3e..eafcc62 100755
--- a/Apps/kbfx/kbfx.SlackBuild
+++ b/Apps/kbfx/kbfx.SlackBuild
@@ -33,6 +33,9 @@ getsource_fn
untar_fn
+## build fails with gcc visibility support
+sed -i '/check for gcc visibility support/,+4d' 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
@@ -49,21 +52,10 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DBUILD_DOC="ON" \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
-DUSE_STRIGI="OFF" \
- -DUSE_MENUDRAKE="OFF" \
- -Wno-dev \
- ..
+ -DUSE_MENUDRAKE="OFF"
make_fn
diff --git a/Apps/kbookreader/kbookreader.SlackBuild b/Apps/kbookreader/kbookreader.SlackBuild
index 7d5e0ff..ad563fd 100755
--- a/Apps/kbookreader/kbookreader.SlackBuild
+++ b/Apps/kbookreader/kbookreader.SlackBuild
@@ -33,6 +33,9 @@ getsource_fn
untar_fn
+## Set default encoding to utf8
+sed -i 's|This is a default encoding.*$|&\n 17|' src/kbookreader.kcfg
+
## for slack-desc
langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
@@ -42,19 +45,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/kdbg/kdbg.SlackBuild b/Apps/kdbg/kdbg.SlackBuild
index d044328..04e1ae8 100755
--- a/Apps/kdbg/kdbg.SlackBuild
+++ b/Apps/kdbg/kdbg.SlackBuild
@@ -46,22 +46,10 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_TRACE_OUTPUT="ON" \
-DWITH_GDB_TRANSCRIPT="ON" \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -DBUILD_TESTPROGS="OFF" \
- -Wno-dev \
- ..
+ -DBUILD_TESTPROGS="OFF"
make_fn
diff --git a/Apps/kdbusnotification/kdbusnotification.SlackBuild b/Apps/kdbusnotification/kdbusnotification.SlackBuild
index f91adbf..7cd08ba 100755
--- a/Apps/kdbusnotification/kdbusnotification.SlackBuild
+++ b/Apps/kdbusnotification/kdbusnotification.SlackBuild
@@ -44,17 +44,8 @@ chown_fn
cd_builddir_fn
## The BUILD_TRANSLATIONS option is set in CMakeLists.txt but there are none available yet
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_TRANSLATIONS="OFF" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+ -DBUILD_TRANSLATIONS="OFF"
make_fn
diff --git a/Apps/kile/kile.SlackBuild b/Apps/kile/kile.SlackBuild
index 3af9654..cbfe4de 100755
--- a/Apps/kile/kile.SlackBuild
+++ b/Apps/kile/kile.SlackBuild
@@ -33,6 +33,20 @@ 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( i_ms / 1000 ), static_cast( (i_ms % 1000) * 1000 ) },
++ { static_cast( ms / 1000 ), static_cast( (ms % 1000) * 1000 ) }
+EOF
+
# set support for additional language(s) as per I18N variable
# but only for languages available with this package
langs=""
@@ -48,19 +62,7 @@ cd_builddir_fn
sed -i '/If the TDE/,+2d' ../doc/man/kile.1
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/kkbswitch/kkbswitch.SlackBuild b/Apps/kkbswitch/kkbswitch.SlackBuild
index e59a058..1295a0c 100755
--- a/Apps/kkbswitch/kkbswitch.SlackBuild
+++ b/Apps/kkbswitch/kkbswitch.SlackBuild
@@ -47,21 +47,8 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -DWITH_RU_UA_LAYOUT=${RU_UA:-"OFF"} \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+ -DWITH_RU_UA_LAYOUT=${RU_UA:-"OFF"}
make_fn
diff --git a/Apps/klamav/klamav.SlackBuild b/Apps/klamav/klamav.SlackBuild
index fc27e14..49fa388 100755
--- a/Apps/klamav/klamav.SlackBuild
+++ b/Apps/klamav/klamav.SlackBuild
@@ -56,9 +56,9 @@ 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
-[[ -s /usr/lib64/libmilter.a ]] && MILTER="ON"
+[[ -s /usr/lib$LIBDIRSUFFIX/libmilter.a ]] && MILTER="ON"
-[[ $GCC_VIS == 0 ]] && unset GCC_VIS # needs to be unset for parameter expansion for CMAKE_CXX_FLAGS
+[[ $GCC_VIS == 0 ]] && unset GCC_VIS # needs to be null or unset for parameter expansion for CMAKE_CXX_FLAGS
mkdir build
cd build/
@@ -135,21 +135,9 @@ cd_builddir_fn
! pkg-config sqlite3 && EMB_SQL="ON"
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_EMBEDDED_SQLITE=${EMB_SQL:-"OFF"} \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_KLAMMAIL="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+ -DBUILD_KLAMMAIL="ON"
make_fn
diff --git a/Apps/knemo/knemo.SlackBuild b/Apps/knemo/knemo.SlackBuild
index f39f1d2..ff399e3 100755
--- a/Apps/knemo/knemo.SlackBuild
+++ b/Apps/knemo/knemo.SlackBuild
@@ -51,22 +51,9 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_LIBIW="OFF" \
- -DWITH_NETTOOLS="OFF" \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+ -DWITH_NETTOOLS="OFF"
make_fn
diff --git a/Apps/knetstats/knetstats.SlackBuild b/Apps/knetstats/knetstats.SlackBuild
index 1fe6848..b0b7011 100755
--- a/Apps/knetstats/knetstats.SlackBuild
+++ b/Apps/knetstats/knetstats.SlackBuild
@@ -42,20 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/knights/knights.SlackBuild b/Apps/knights/knights.SlackBuild
index badd1f2..854ac12 100755
--- a/Apps/knights/knights.SlackBuild
+++ b/Apps/knights/knights.SlackBuild
@@ -31,7 +31,7 @@ TAG=${TAG:-_tde}
source ../../get-source.sh
getsource_fn
-## run getsource_fn for the theme-pack ... in a shell so that the variables don't leak into the build
+## 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
@@ -63,20 +63,8 @@ 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:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -DBUILD_EXTRA_THEME="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+ -DBUILD_EXTRA_THEME="ON"
make_fn
diff --git a/Apps/knmap/knmap.SlackBuild b/Apps/knmap/knmap.SlackBuild
index 0d29fba..67a7f8e 100755
--- a/Apps/knmap/knmap.SlackBuild
+++ b/Apps/knmap/knmap.SlackBuild
@@ -42,20 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/koffice-i18n/koffice-i18n.SlackBuild b/Apps/koffice-i18n/koffice-i18n.SlackBuild
index 0923c56..ec3af8f 100755
--- a/Apps/koffice-i18n/koffice-i18n.SlackBuild
+++ b/Apps/koffice-i18n/koffice-i18n.SlackBuild
@@ -67,16 +67,9 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DBUILD_DOC="ON" \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DBUILD_DATA="ON" \
- -DBUILD_MESSAGES="ON" \
- -Wno-dev \
- ..
+ -DBUILD_MESSAGES="ON"
make_fn
diff --git a/Apps/kompose/kompose.SlackBuild b/Apps/kompose/kompose.SlackBuild
index 1642849..fb16cc3 100755
--- a/Apps/kompose/kompose.SlackBuild
+++ b/Apps/kompose/kompose.SlackBuild
@@ -44,20 +44,8 @@ chown_fn
cd_builddir_fn
pkg-config xdamage && pkg-config xcomposite && XCOMP="ON"
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DWITH_XCOMPOSITE=${XCOMP:-"OFF"} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+ -DWITH_XCOMPOSITE=${XCOMP:-"OFF"}
make_fn
diff --git a/Apps/kplayer/kplayer.SlackBuild b/Apps/kplayer/kplayer.SlackBuild
index d6b32d2..60a8b54 100755
--- a/Apps/kplayer/kplayer.SlackBuild
+++ b/Apps/kplayer/kplayer.SlackBuild
@@ -33,22 +33,6 @@ getsource_fn
untar_fn
-## set up use of cmake common rules for translations/messages
-mkdir translations
-mv po translations/messages
-#
-find doc -name CMakeLists.txt | xargs rm
-find translations -name CMakeLists.txt | xargs rm
-#
-sed -i '/tde_conditional_add_subdirectory/d' CMakeLists.txt
-sed -i 's|add_subdirectory( icons )|&\
-\
-\
-##### other data\
-\
-tde_conditional_add_project_docs( BUILD_DOC )\
-tde_conditional_add_project_translations( BUILD_TRANSLATIONS )|' CMakeLists.txt
-
## 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
@@ -59,20 +43,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/kscope/kscope.SlackBuild b/Apps/kscope/kscope.SlackBuild
index c207fb1..07b085f 100755
--- a/Apps/kscope/kscope.SlackBuild
+++ b/Apps/kscope/kscope.SlackBuild
@@ -42,19 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/ksensors/ksensors.SlackBuild b/Apps/ksensors/ksensors.SlackBuild
index 147ca71..3770959 100755
--- a/Apps/ksensors/ksensors.SlackBuild
+++ b/Apps/ksensors/ksensors.SlackBuild
@@ -42,19 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/kshutdown/kshutdown.SlackBuild b/Apps/kshutdown/kshutdown.SlackBuild
index cfe10c7..95a17e7 100755
--- a/Apps/kshutdown/kshutdown.SlackBuild
+++ b/Apps/kshutdown/kshutdown.SlackBuild
@@ -43,22 +43,8 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -DBUILD_EXTRAS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+ -DBUILD_EXTRAS="ON"
make_fn
diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild
index eb30b27..8c392cc 100755
--- a/Apps/kvkbd/kvkbd.SlackBuild
+++ b/Apps/kvkbd/kvkbd.SlackBuild
@@ -216,18 +216,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/kvpnc/kvpnc.SlackBuild b/Apps/kvpnc/kvpnc.SlackBuild
index 185fee3..50bd09f 100755
--- a/Apps/kvpnc/kvpnc.SlackBuild
+++ b/Apps/kvpnc/kvpnc.SlackBuild
@@ -34,28 +34,14 @@ getsource_fn
untar_fn
## for slack-desc
-langs="en"
-for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
-ldocs="en tdeioslave"
-for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
+langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
+ldocs="en tdeioslave";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/potracegui/potracegui.SlackBuild b/Apps/potracegui/potracegui.SlackBuild
index 3c30820..0e3d7a3 100755
--- a/Apps/potracegui/potracegui.SlackBuild
+++ b/Apps/potracegui/potracegui.SlackBuild
@@ -45,19 +45,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/rosegarden/rosegarden.SlackBuild b/Apps/rosegarden/rosegarden.SlackBuild
index 4a82bf0..e88ba39 100755
--- a/Apps/rosegarden/rosegarden.SlackBuild
+++ b/Apps/rosegarden/rosegarden.SlackBuild
@@ -34,8 +34,8 @@ getsource_fn
untar_fn
## for slack-desc
-langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
-ldocs="";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
+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
## delete zero length files
find data/pixmaps/feta -type f -empty -delete
@@ -52,21 +52,7 @@ pkg-config jack && JACK="ON"
# Check for DSSI aka "Dizzy"
pkg-config dssi && DSSI="ON"
-## for cmake version 3.21.x?
-sed -i 's|PROJECT(ROSEGARDEN)|project(rosegarden)|' ../CMakeLists.txt
-
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWANT_SOUND="ON" \
-DWANT_DEBUG="OFF" \
-DWANT_FULLDBG="OFF" \
@@ -74,9 +60,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWANT_DSSI=${DSSI:-"OFF"} \
-DWANT_LIRC="OFF" \
-DWANT_PCH="OFF" \
- -DWANT_TEST="OFF" \
- -Wno-dev \
- ..
+ -DWANT_TEST="OFF"
make_fn
@@ -101,10 +85,10 @@ echo "
$PRGNAM: Rosegarden is a MIDI and audio sequencer and musical notation editor.
$PRGNAM:
$PRGNAM: With language support for:
-$PRGNAM: en$langs
+$PRGNAM: $langs
$PRGNAM:
$PRGNAM: With help documentation for:
-$PRGNAM: en$ldocs
+$PRGNAM: $ldocs
$PRGNAM:
$PRGNAM:
$PRGNAM:
diff --git a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild
index 220eadd..36afa48 100755
--- a/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild
+++ b/Apps/tde-style-lipstik/tde-style-lipstik.SlackBuild
@@ -42,19 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild
index 42cec89..d5856ec 100755
--- a/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild
+++ b/Apps/tde-style-qtcurve/tde-style-qtcurve.SlackBuild
@@ -33,13 +33,8 @@ 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 [[ -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 [[ -e translations/messages/qtcurve/$Lang.po ]] && langs="$langs $Lang";done
listdocs_fn
@@ -47,19 +42,8 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DBUILD_CONFIG_MODULE="ON" \
- -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+ -DBUILD_CONFIG_MODULE="ON"
make_fn
@@ -80,7 +64,7 @@ echo "
$PRGNAM: QtCurve theme
$PRGNAM:
$PRGNAM: With language support for:
-$PRGNAM: en $langs
+$PRGNAM: $langs
$PRGNAM:
$PRGNAM:
$PRGNAM:
diff --git a/Apps/tdeio-locate/tdeio-locate.SlackBuild b/Apps/tdeio-locate/tdeio-locate.SlackBuild
index 26c804d..86adccc 100755
--- a/Apps/tdeio-locate/tdeio-locate.SlackBuild
+++ b/Apps/tdeio-locate/tdeio-locate.SlackBuild
@@ -34,10 +34,7 @@ getsource_fn
untar_fn
## for slack-desc
-langs=""
-for Lang in $I18N
-do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang"
-done
+langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
listdocs_fn
@@ -45,19 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
@@ -78,7 +63,7 @@ echo "
$PRGNAM: tdeio-locate is a TDE I/O Slave for the locate command.
$PRGNAM:
$PRGNAM: With language support for:
-$PRGNAM: en$langs
+$PRGNAM: $langs
$PRGNAM:
$PRGNAM:
$PRGNAM:
diff --git a/Apps/tdepowersave/tdepowersave.SlackBuild b/Apps/tdepowersave/tdepowersave.SlackBuild
index 4c4d2b8..dd75458 100755
--- a/Apps/tdepowersave/tdepowersave.SlackBuild
+++ b/Apps/tdepowersave/tdepowersave.SlackBuild
@@ -34,8 +34,8 @@ getsource_fn
untar_fn
## for slack-desc
-langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done
-ldocs="";for Lang in $I18N;do [[ -d doc/$Lang ]] && ldocs="$ldocs $Lang";done
+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
listdocs_fn
@@ -43,20 +43,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
@@ -84,10 +71,10 @@ $PRGNAM: screen on a laptop can be configured to turn off if the computer is
$PRGNAM: not used for a specified amount of time, extending battery life.
$PRGNAM:
$PRGNAM: With language support for:
-$PRGNAM: en$langs
+$PRGNAM: $langs
$PRGNAM:
$PRGNAM: With help documentation for:
-$PRGNAM: en$ldocs
+$PRGNAM: $ldocs
$PRGNAM:
" > $PKG/install/slack-desc
diff --git a/Apps/tdesudo/tdesudo.SlackBuild b/Apps/tdesudo/tdesudo.SlackBuild
index 40d5a81..f67f550 100755
--- a/Apps/tdesudo/tdesudo.SlackBuild
+++ b/Apps/tdesudo/tdesudo.SlackBuild
@@ -42,19 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/tdmtheme/tdmtheme.SlackBuild b/Apps/tdmtheme/tdmtheme.SlackBuild
index 75105d1..6b1464b 100755
--- a/Apps/tdmtheme/tdmtheme.SlackBuild
+++ b/Apps/tdmtheme/tdmtheme.SlackBuild
@@ -42,20 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild
index c389595..263b333 100755
--- a/Apps/twin-style-crystal/twin-style-crystal.SlackBuild
+++ b/Apps/twin-style-crystal/twin-style-crystal.SlackBuild
@@ -42,19 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/twin-style-suse2/twin-style-suse2.SlackBuild b/Apps/twin-style-suse2/twin-style-suse2.SlackBuild
index 493820d..3f845c2 100755
--- a/Apps/twin-style-suse2/twin-style-suse2.SlackBuild
+++ b/Apps/twin-style-suse2/twin-style-suse2.SlackBuild
@@ -42,19 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Apps/yakuake/yakuake.SlackBuild b/Apps/yakuake/yakuake.SlackBuild
index ba022ef..c656633 100755
--- a/Apps/yakuake/yakuake.SlackBuild
+++ b/Apps/yakuake/yakuake.SlackBuild
@@ -42,20 +42,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh
index 471063d..1ce6060 100755
--- a/BUILD-TDE.sh
+++ b/BUILD-TDE.sh
@@ -100,10 +100,10 @@ dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Version " --menu
Set the version of TDE to be built.
" \
-13 75 3 \
+12 75 2 \
"14.0.13" "the R14.0.13 release - source from archives" \
-"14.0.x" "next release preview - source from Trinity git" \
-"14.1.0" "R14.1.0 development - source from Trinity git" \
+"14.1.0" "R14.1.0 release preview - source from Trinity git" \
+" [14.0.x]" " [14.0.14 release preview - currently not planned]" \
2> $TMPVARS/TDEVERSION
@@ -336,7 +336,7 @@ 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.x/12 port for this
+## 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"
@@ -911,7 +911,7 @@ export PATH
export ARM_FABI=$(readelf -Ah $(which bash)|grep -oE "soft|hard")
## override hard coded trinity plugins directory - used for:
## autotools: get-source.sh|ltoolupdate_fn
-## cmake: -DPLUGIN_INSTALL_DIR=
+## cmake: -DPLUGIN_INSTALL_DIR= --> removed from SB and set in get-source.sh
export PLUGIN_INSTALL_DIR=$(cat $TMPVARS/TDE_CNF_DIR | grep -o [a-z]*/share | cut -d/ -f1)
[[ $PLUGIN_INSTALL_DIR != tde ]] && PLUGIN_INSTALL_DIR=trinity
### set up variables for the summary list:
diff --git a/Core/tdeaccessibility/tdeaccessibility.SlackBuild b/Core/tdeaccessibility/tdeaccessibility.SlackBuild
index 8eb0fb1..41ab4e7 100755
--- a/Core/tdeaccessibility/tdeaccessibility.SlackBuild
+++ b/Core/tdeaccessibility/tdeaccessibility.SlackBuild
@@ -40,24 +40,14 @@ chown_fn
cd_builddir_fn
pkg-config akode && AKODE=ON
-pkg-config arts && FREEVERB=ON
+## freeverb support requires arts/artsmodules.h from tdemultimedia
+[[ -s $INSTALL_TDE/include/arts/artsmodules.h ]] && FREEVERB=ON
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ARTS="ON" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_AKODE="${AKODE:-OFF}" \
-DWITH_ALSA="ON" \
-DWITH_GSTREAMER="OFF" \
- -DBUILD_DOC="ON" \
-DBUILD_KBSTATEAPPLET="ON" \
-DBUILD_KMAG="ON" \
-DBUILD_KMOUSETOOL="ON" \
@@ -72,9 +62,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KTTSD_FREETTS="ON" \
-DBUILD_KTTSD_HADIFIX="ON" \
-DBUILD_KTTSD_KATE="ON" \
- -DBUILD_ICONTHEMES="ON" \
- -Wno-dev \
- ..
+ -DBUILD_ICONTHEMES="ON"
make_fn
diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild
index d09fead..9ac6e2e 100755
--- a/Core/tdeaddons/tdeaddons.SlackBuild
+++ b/Core/tdeaddons/tdeaddons.SlackBuild
@@ -60,23 +60,12 @@ cd_builddir_fn
sed -i 's|\\fI/opt/trinity/share/doc/ksig/README.Debian\\fP|the Ksig Handbook|' ../doc/man/ksig/ksig.1
sed -i 's|^done|& - in konqueror enter \\fI'\''help:/ksig'\''\\f - or on the command line run \\fI'\''khelpcenter help:/ksig'\''\\f|' ../doc/man/ksig/ksig.1
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ARTS="ON" \
-DWITH_SDL="ON" \
-DWITH_BERKELEY_DB="ON" \
-DWITH_XMMS="OFF" \
-DWITH_TEST="OFF" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
-DBUILD_ATLANTIKDESIGNER=${ATLANTIKDESIGNER:-"OFF"} \
-DBUILD_KADDRESSBOOK_PLUGINS=${KADDRESSBOOK_PLUGINS:-"OFF"} \
-DBUILD_NOATUN_PLUGINS=${NOATUN_PLUGINS:-"OFF"} \
@@ -87,9 +76,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KSIG="ON" \
-DBUILD_RENAMEDLG_PLUGINS="ON" \
-DBUILD_TDEFILE_PLUGINS="ON" \
- -DBUILD_TUTORIALS="OFF" \
- -Wno-dev \
- ..
+ -DBUILD_TUTORIALS="OFF"
make_fn
diff --git a/Core/tdeadmin/tdeadmin.SlackBuild b/Core/tdeadmin/tdeadmin.SlackBuild
index 4e30a02..fe03084 100755
--- a/Core/tdeadmin/tdeadmin.SlackBuild
+++ b/Core/tdeadmin/tdeadmin.SlackBuild
@@ -39,17 +39,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DBUILD_KCRON="ON" \
-DBUILD_KDAT="ON" \
-DBUILD_KNETWORKCONF="ON" \
@@ -58,9 +48,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_LILO_CONFIG="ON" \
-DBUILD_KPACKAGE="ON" \
-DBUILD_TDEFILE_PLUGINS="ON" \
- -DBUILD_SECPOLICY="OFF" \
- -Wno-dev \
- ..
+ -DBUILD_SECPOLICY="OFF"
make_fn
diff --git a/Core/tdeartwork/tdeartwork.SlackBuild b/Core/tdeartwork/tdeartwork.SlackBuild
index 4c0a9e3..aab4341 100755
--- a/Core/tdeartwork/tdeartwork.SlackBuild
+++ b/Core/tdeartwork/tdeartwork.SlackBuild
@@ -39,23 +39,12 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ALL_INCLUDED_XSCREENSAVERS="OFF" \
-DWITH_ARTS="ON" \
-DWITH_XSCREENSAVER="OFF" \
-DWITH_LIBART="ON" \
-DWITH_OPENGL="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_EMOTICONS="ON" \
-DBUILD_ICEWM_THEMES="ON" \
-DBUILD_ICON_THEMES="ON" \
@@ -65,9 +54,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_SOUNDS="ON" \
-DBUILD_STYLES="ON" \
-DBUILD_TDEASCIIQUARIUM="ON" \
- -DBUILD_WALLPAPERS="ON" \
- -Wno-dev \
- ..
+ -DBUILD_WALLPAPERS="ON"
make_fn
diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild
index 10a1b6c..501ac3f 100755
--- a/Core/tdebase/tdebase.SlackBuild
+++ b/Core/tdebase/tdebase.SlackBuild
@@ -154,19 +154,9 @@ endif( )
#
sed -i "s|/opt/.*/share/doc/tdm/README.gz|$INSTALL_TDE/share/config/tdm/README-config|" ../doc/man/tdm{,ctl}.1
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ARTS="ON" \
-DWITH_ELFICON="OFF" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_HAL="OFF" \
-DWITH_I8K="OFF" \
-DWITH_LDAP="OFF" \
@@ -197,7 +187,6 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_XTEST="ON" \
-DBUILD_APPLNK="ON" \
-DBUILD_CRASHTEST="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_DRKONQI="ON" \
-DBUILD_KAPPFINDER="ON" \
-DBUILD_KATE="ON" \
@@ -246,9 +235,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_TDM_SYSTEMD_UNIT_FILE="OFF" \
-DBUILD_TQT3INTEGRATION="ON" \
-DBUILD_TSAK="ON" \
- -DBUILD_TWIN="ON" \
- -Wno-dev \
- ..
+ -DBUILD_TWIN="ON"
make_fn
diff --git a/Core/tdeedu/tdeedu.SlackBuild b/Core/tdeedu/tdeedu.SlackBuild
index b2eeb1e..671b048 100755
--- a/Core/tdeedu/tdeedu.SlackBuild
+++ b/Core/tdeedu/tdeedu.SlackBuild
@@ -186,6 +186,12 @@ patch -p0 << EOF
+ .section .rodata.cst16,"aM",@progbits,16
EOF
+## 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|' config/gnu/config.guess
+
## force "gcc -fcommon" for gcc10 build - see https://github.com/ocaml/ocaml/issues/9622
./configure -cc "$COMPILER -fcommon" -libdir /usr/local/lib$LIBDIRSUFFIX/ocaml
## finish build with -j1 if there are race condition errors
@@ -244,18 +250,8 @@ cd_builddir_fn
## kig python scripting support
[[ $(ls -1 /usr/lib$LIBDIRSUFFIX/libboost_python*.so) ]] && KIG_PS="ON"
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ARTS="ON" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_KIG_PYTHON_SCRIPTING=${KIG_PS:-"OFF"} \
-DWITH_LIBUSB="ON" \
-DWITH_OCAML_SOLVER=${OCAML:-"OFF"} \
@@ -278,10 +274,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KTURTLE="ON" \
-DBUILD_KVERBOS="ON" \
-DBUILD_KVOCTRAIN="ON" \
- -DBUILD_KWORDQUIZ="ON" \
- -DBUILD_DOC="ON" \
- -Wno-dev \
- ..
+ -DBUILD_KWORDQUIZ="ON"
## remove obsolete tags
doxygen -u doc/kig/scripting-api/Doxyfile.scripting-api
diff --git a/Core/tdegames/tdegames.SlackBuild b/Core/tdegames/tdegames.SlackBuild
index 7a1e9fc..796d81d 100755
--- a/Core/tdegames/tdegames.SlackBuild
+++ b/Core/tdegames/tdegames.SlackBuild
@@ -39,19 +39,8 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ARTS="ON" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
-DBUILD_LIBTDEGAMES="ON" \
-DBUILD_ATLANTIK="ON" \
-DBUILD_KASTEROIDS="ON" \
@@ -85,9 +74,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KTUBERLING="ON" \
-DBUILD_LSKAT="ON" \
-DBUILD_TWIN4="ON" \
- -DBUILD_TDEFIFTEEN="ON" \
- -Wno-dev \
- ..
+ -DBUILD_TDEFIFTEEN="ON"
# don't package carddecks if they're not needed for chosen games:
[[ ! $(grep -E "kpat|kpoker|lskat" cmake_install.cmake) ]] && sed -i '/carddecks/d' libtdegames/cmake_install.cmake
diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild
index c84685f..ae76f65 100755
--- a/Core/tdegraphics/tdegraphics.SlackBuild
+++ b/Core/tdegraphics/tdegraphics.SlackBuild
@@ -33,6 +33,9 @@ getsource_fn
untar_fn
+## build fails with gcc visibility support
+sed -i '/check for gcc visibility support/,+4d' ConfigureChecks.cmake
+
listdocs_fn
chown_fn
@@ -44,22 +47,12 @@ sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/g
# If imlib is installed, include Kuickshow:
pkg-config imlib && KUICKSHOW=ON
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_T1LIB="OFF" \
-DWITH_PAPER="OFF" \
-DWITH_TIFF="ON" \
-DWITH_OPENEXR="OFF" \
-DWITH_PDF="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_TDEFILE_PLUGINS="ON" \
-DBUILD_KUICKSHOW=${KUICKSHOW:-OFF} \
-DBUILD_KPDF="ON" \
@@ -80,9 +73,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KRULER="ON" \
-DBUILD_KSNAPSHOT="ON" \
-DBUILD_KVIEW="ON" \
- -DBUILD_KVIEWSHELL="ON" \
- -Wno-dev \
- ..
+ -DBUILD_KVIEWSHELL="ON"
make_fn
diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild
index 7f83f7a..9fbbf13 100755
--- a/Core/tdelibs/tdelibs.SlackBuild
+++ b/Core/tdelibs/tdelibs.SlackBuild
@@ -136,6 +136,33 @@ patch -N -p0 << EOF || true
+
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( i_ms / 1000 ), static_cast( (i_ms % 1000) * 1000 ) },
++ { static_cast( ms / 1000 ), static_cast( (ms % 1000) * 1000 ) }
+EOF
+
listdocs_fn
chown_fn
@@ -163,15 +190,7 @@ sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLi
are 14.1.0 options and will be ignored by 14.0.* builds
comment
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DDEFAULT_SPELL_CHECKER=${DEF_SP_CHKR:-"ASPELL"} \
-DTDE_MALLOC="OFF" \
-DTDE_MALLOC_DEBUG="OFF" \
@@ -186,7 +205,6 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_DEVKITPOWER="ON" \
-DWITH_ELFICON="OFF" \
-DWITH_GAMIN="OFF" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_HAL="OFF" \
-DWITH_HSPELL="OFF" \
-DWITH_IMAGETOPS_BINARY="OFF" \
@@ -219,9 +237,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_UPOWER="OFF" \
-DWITH_UTEMPTER="OFF" \
-DWITH_XCOMPOSITE="ON" \
- -DWITH_XRANDR="ON" \
- -Wno-dev \
- ..
+ -DWITH_XRANDR="ON"
make_fn
diff --git a/Core/tdemultimedia/tdemultimedia.SlackBuild b/Core/tdemultimedia/tdemultimedia.SlackBuild
index c8c63f6..ca1389b 100755
--- a/Core/tdemultimedia/tdemultimedia.SlackBuild
+++ b/Core/tdemultimedia/tdemultimedia.SlackBuild
@@ -44,16 +44,7 @@ sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/g
## akode is required for ARTS_AKODE plugin & JUK
pkg-config akode && aRts_AKODE=ON && JUK=ON
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ALSA="ON" \
-DWITH_ARTS_AKODE="${aRts_AKODE:-OFF}" \
-DWITH_ARTS_AUDIOFILE="ON" \
@@ -69,7 +60,6 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_THEORA="ON" \
-DWITH_VORBIS="ON" \
-DBUILD_ARTS="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_JUK="${JUK:-OFF}" \
-DBUILD_KABOODLE="ON" \
-DBUILD_KAPPFINDER_DATA="ON" \
@@ -82,9 +72,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_NOATUN="ON" \
-DBUILD_TDEFILE_PLUGINS="ON" \
-DBUILD_TDEIOSLAVE="ON" \
- -DBUILD_TDEMID="ON" \
- -Wno-dev \
- ..
+ -DBUILD_TDEMID="ON"
make_fn
diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild
index 198004e..58eb390 100755
--- a/Core/tdenetwork/tdenetwork.SlackBuild
+++ b/Core/tdenetwork/tdenetwork.SlackBuild
@@ -47,17 +47,7 @@ sed -i "s|/opt/trinity/share/doc/lisa/README.gz|$INSTALL_TDE/share/apps/lisa/REA
# If speex is installed, include it in the build for jingle
pkg-config speex && SPX="ON"
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ARTS="ON" \
-DWITH_JINGLE="ON" \
-DWITH_SPEEX=${SPX:-"OFF"} \
@@ -67,7 +57,6 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_SLP="OFF" \
-DWITH_WEBCAM="OFF" \
-DBUILD_DCOPRSS="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_FILESHARING="ON" \
-DBUILD_KDICT="ON" \
-DBUILD_TDEDNSSD="ON" \
@@ -111,9 +100,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KOPETE_PLUGIN_NETMEETING="ON" \
-DBUILD_KOPETE_PLUGIN_ADDBOOKMARKS="ON" \
-DBUILD_KOPETE_PLUGIN_STATISTICS="ON" \
- -DBUILD_KOPETE_PLUGIN_SMPPPDCS="ON" \
- -Wno-dev \
- ..
+ -DBUILD_KOPETE_PLUGIN_SMPPPDCS="ON"
make_fn
diff --git a/Core/tdepim/tdepim.SlackBuild b/Core/tdepim/tdepim.SlackBuild
index 600564d..ffa9776 100755
--- a/Core/tdepim/tdepim.SlackBuild
+++ b/Core/tdepim/tdepim.SlackBuild
@@ -33,6 +33,9 @@ getsource_fn
untar_fn
+## build fails with gcc visibility support
+sed -i '/check for gcc visibility support/,+4d' ConfigureChecks.cmake
+
listdocs_fn
chown_fn
@@ -45,15 +48,7 @@ pkg-config libcaldav && LCALDAV="ON"
# If libcarddav is installed, include it in the build for korganizer
pkg-config libcarddav && LCARDDAV="ON"
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ARTS="ON" \
-DWITH_BIRTHDAYS="ON" \
-DWITH_CALDAV=${LCALDAV:-"OFF"} \
@@ -74,7 +69,6 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_XSCREENSAVER="OFF" \
-DBUILD_AKREGATOR="ON" \
-DBUILD_CERTMANAGER="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_INDEXLIB="ON" \
-DBUILD_KADDRESSBOOK="ON" \
-DBUILD_KALARM="ON" \
@@ -108,9 +102,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_TDEFILE_PLUGINS="ON" \
-DBUILD_TDEIOSLAVE="ON" \
-DBUILD_TDERESOURCES="ON" \
- -DBUILD_WIZARDS="ON" \
- -Wno-dev \
- ..
+ -DBUILD_WIZARDS="ON"
make_fn
diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild
index c416db9..7bfc1fb 100755
--- a/Core/tdesdk/tdesdk.SlackBuild
+++ b/Core/tdesdk/tdesdk.SlackBuild
@@ -43,20 +43,10 @@ cd_builddir_fn
sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../cervisia/cervisia.1.in
sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../scripts/tdesvn-build
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_DBSEARCHENGINE="ON" \
-DWITH_KCAL="ON" \
-DBUILD_CERVISIA="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_KAPPTEMPLATE="ON" \
-DBUILD_KBABEL="ON" \
-DBUILD_KBUGBUSTER="ON" \
@@ -74,9 +64,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_TDEFILE_PLUGINS="ON" \
-DBUILD_TDEIOSLAVE="ON" \
-DBUILD_TDEUNITTEST="ON" \
- -DBUILD_UMBRELLO="ON" \
- -Wno-dev \
- ..
+ -DBUILD_UMBRELLO="ON"
make_fn
diff --git a/Core/tdetoys/tdetoys.SlackBuild b/Core/tdetoys/tdetoys.SlackBuild
index 3f7162a..e1fc44b 100755
--- a/Core/tdetoys/tdetoys.SlackBuild
+++ b/Core/tdetoys/tdetoys.SlackBuild
@@ -39,18 +39,8 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DBUILD_AMOR="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_EYESAPPLET="ON" \
-DBUILD_FIFTEENAPPLET="ON" \
-DBUILD_KMOON="ON" \
@@ -59,9 +49,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KTUX="ON" \
-DBUILD_KWEATHER="ON" \
-DBUILD_KONQ_KWEATHER="ON" \
- -DBUILD_KWORLDWATCH="ON" \
- -Wno-dev \
- ..
+ -DBUILD_KWORLDWATCH="ON"
make_fn
diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild
index b8df811..994d929 100755
--- a/Core/tdeutils/tdeutils.SlackBuild
+++ b/Core/tdeutils/tdeutils.SlackBuild
@@ -43,16 +43,7 @@ sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/g
## TDEFileReplace has been moved from tdewebdev for R14.1.0
[[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_DPMS="ON" \
-DWITH_XSCREENSAVER="OFF" \
-DWITH_SENSORS="ON" \
@@ -65,7 +56,6 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_I8K="OFF" \
-DWITH_XMMS="OFF" \
-DWITH_TDENEWSTUFF="OFF" \
- -DBUILD_DOC="ON" \
-DBUILD_ARK="ON" \
-DBUILD_CHARSELECTAPPLET="ON" \
-DBUILD_KCALC="ON" \
@@ -85,9 +75,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KTIMER="ON" \
-DBUILD_TDEWALLET="ON" \
-DBUILD_SUPERKARAMBA="ON" \
- ${TDEFileReplace:-} \
- -Wno-dev \
- ..
+ ${TDEFileReplace:-}
make_fn
diff --git a/Core/tdevelop/tdevelop.SlackBuild b/Core/tdevelop/tdevelop.SlackBuild
index 2695ea3..cc9eed2 100755
--- a/Core/tdevelop/tdevelop.SlackBuild
+++ b/Core/tdevelop/tdevelop.SlackBuild
@@ -33,21 +33,16 @@ getsource_fn
untar_fn
+## build fails with gcc visibility support
+sed -i '/check for gcc visibility support/,+4d' ConfigureChecks.cmake
+
listdocs_fn
chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_BUILDTOOL_ADA="ON" \
-DWITH_BUILDTOOL_ANT="ON" \
-DWITH_BUILDTOOL_AUTOTOOLS="ON" \
@@ -72,11 +67,8 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_VCS_CVSSERVICE="ON" \
-DWITH_VCS_PERFORCE="ON" \
-DWITH_VCS_SUBVERSION="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_KDEVDESIGNER="ON" \
- -DBUILD_VISUALBOYADVANCE="ON" \
- -Wno-dev \
- ..
+ -DBUILD_VISUALBOYADVANCE="ON"
make_fn
diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild
index 7f78dd5..5e29580 100755
--- a/Core/tdewebdev/tdewebdev.SlackBuild
+++ b/Core/tdewebdev/tdewebdev.SlackBuild
@@ -38,6 +38,11 @@ untar_fn
sed -i "s|FileName=trinity|FileName=$PLUGIN_INSTALL_DIR|" quanta/data/config/plugins.rc
sed -i "s|/opt/trinity|$INSTALL_TDE|" */*.tdevelop
sed -i "s|trinity/|$PLUGIN_INSTALL_DIR/|" doc/*/*.docbook
+sed -i "s|/opt/trinity|$INSTALL_TDE|" doc/man/*/*.1
+
+## the path LIB_INSTALL_DIR can be set by cmake
+sed -i 's|project(.*$|&\ninclude( GNUInstallDirs )|' CMakeLists.txt
+sed -i 's|${LIB_INSTALL_DIR}|${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}|' kommander/{widget{,s},plugin}/CMakeLists.txt
listdocs_fn
@@ -45,36 +50,17 @@ chown_fn
cd_builddir_fn
-## override hard coded trinity installation directory link
-sed -i "s|/opt/trinity|$INSTALL_TDE|" ../doc/man/*/*.1
-
-## LIB_INSTALL_DIR is for ../kommander/{widget{,s},plugin}/CMakeLists.txt
-## which defaults to $INSTALL_TDE/lib
## TDEFileReplace has been moved to tdeutils for R14.1.0
[[ $TDEVERSION != 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX \
- -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_OTHER_EDITORS="ON" \
-DWITH_QUANTA_CVSSERVICE="ON" \
- -DBUILD_DOC="ON" \
-DBUILD_KIMAGEMAPEDITOR="ON" \
-DBUILD_KLINKSTATUS="ON" \
-DBUILD_KOMMANDER="ON" \
-DBUILD_KXSLDBG="ON" \
-DBUILD_QUANTA="ON" \
- ${TDEFileReplace:-} \
- -Wno-dev \
- ..
-
+ ${TDEFileReplace:-}
make_fn
diff --git a/Deps/akode/akode.SlackBuild b/Deps/akode/akode.SlackBuild
index 06d7a90..f17a9da 100755
--- a/Deps/akode/akode.SlackBuild
+++ b/Deps/akode/akode.SlackBuild
@@ -38,15 +38,7 @@ chown_fn
cd_builddir_fn
## see README for cmake options
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_LIBLTDL="ON" \
-DWITH_ALSA_SINK="ON" \
-DWITH_JACK_SINK="OFF" \
@@ -57,9 +49,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DWITH_MPC_DECODER="ON" \
-DWITH_MPEG_DECODER="ON" \
-DWITH_SRC_RESAMPLER="ON" \
- -DWITH_XIPH_DECODER="ON" \
- -Wno-dev \
- ..
+ -DWITH_XIPH_DECODER="ON"
make_fn
diff --git a/Deps/arts/arts.SlackBuild b/Deps/arts/arts.SlackBuild
index a229b2c..2776149 100755
--- a/Deps/arts/arts.SlackBuild
+++ b/Deps/arts/arts.SlackBuild
@@ -42,26 +42,14 @@ cd_builddir_fn
sed -i 's|^KDE|TDE|' ../README.md
for i in ../doc/man/*.1 ; do mv $i ${i%%-trinity.1}.1 ; done
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ALSA="ON" \
-DWITH_AUDIOFILE="ON" \
-DWITH_ESOUND="OFF" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
-DWITH_JACK="OFF" \
-DWITH_MAD="ON" \
-DWITH_SNDIO="OFF" \
- -DWITH_VORBIS="ON" \
- -DBUILD_DOC="ON" \
- -Wno-dev \
- ..
+ -DWITH_VORBIS="ON"
make_fn
diff --git a/Deps/avahi-tqt/avahi-tqt.SlackBuild b/Deps/avahi-tqt/avahi-tqt.SlackBuild
index fc7082d..525ccd9 100755
--- a/Deps/avahi-tqt/avahi-tqt.SlackBuild
+++ b/Deps/avahi-tqt/avahi-tqt.SlackBuild
@@ -39,17 +39,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild
index 2e4524a..a2e89aa 100755
--- a/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild
+++ b/Deps/dbus-1-tqt/dbus-1-tqt.SlackBuild
@@ -39,17 +39,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Deps/dbus-tqt/dbus-tqt.SlackBuild b/Deps/dbus-tqt/dbus-tqt.SlackBuild
index 4f8d507..56287ea 100755
--- a/Deps/dbus-tqt/dbus-tqt.SlackBuild
+++ b/Deps/dbus-tqt/dbus-tqt.SlackBuild
@@ -39,14 +39,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Deps/libart-lgpl/libart-lgpl.SlackBuild b/Deps/libart-lgpl/libart-lgpl.SlackBuild
index aca07ef..338f2a6 100755
--- a/Deps/libart-lgpl/libart-lgpl.SlackBuild
+++ b/Deps/libart-lgpl/libart-lgpl.SlackBuild
@@ -29,6 +29,8 @@ BUILD=${BUILD:-1}
TAG=${TAG:-_tde}
source ../../get-source.sh
+
+INSTALL_TDE=/usr # set path for the CMAKE_CACHE file
getsource_fn
untar_fn
@@ -39,25 +41,12 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DMAN_INSTALL_DIR=/usr/man \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_DOC="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
installdocs_fn
-INSTALL_TDE=/usr
mangzip_fn
strip_fn
diff --git a/Deps/libcaldav/libcaldav.SlackBuild b/Deps/libcaldav/libcaldav.SlackBuild
index 0184c79..b98f9be 100755
--- a/Deps/libcaldav/libcaldav.SlackBuild
+++ b/Deps/libcaldav/libcaldav.SlackBuild
@@ -40,20 +40,9 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DBUILD_DOC="ON" \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DBUILD_CALDAV_TEST="OFF" \
- -DBUILD_UNITTEST="OFF" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -Wno-dev \
- ..
+ -DBUILD_UNITTEST="OFF"
make_fn
diff --git a/Deps/libcarddav/libcarddav.SlackBuild b/Deps/libcarddav/libcarddav.SlackBuild
index 0a7018a..e56a6e8 100755
--- a/Deps/libcarddav/libcarddav.SlackBuild
+++ b/Deps/libcarddav/libcarddav.SlackBuild
@@ -39,18 +39,8 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DBUILD_DOC="OFF" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
+ -DBUILD_DOC="OFF"
make_fn
diff --git a/Deps/tqca/tqca.SlackBuild b/Deps/tqca/tqca.SlackBuild
index 931d949..3143418 100755
--- a/Deps/tqca/tqca.SlackBuild
+++ b/Deps/tqca/tqca.SlackBuild
@@ -39,19 +39,9 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DBUILD_TQCA="ON" \
- -DBUILD_TQCA_TLS="ON" \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -Wno-dev \
- ..
+ -DBUILD_TQCA_TLS="ON"
make_fn
diff --git a/Deps/tqt3/tqt3.SlackBuild b/Deps/tqt3/tqt3.SlackBuild
index ac79da5..9d9e69c 100755
--- a/Deps/tqt3/tqt3.SlackBuild
+++ b/Deps/tqt3/tqt3.SlackBuild
@@ -42,16 +42,9 @@ sed -i "s|CONFIG.*$|& ${NO_WARN:+warn_off}|" mkspecs/linux-g++/qmake.conf
## RPATH is set to $ORIGIN/../lib to locate libs during the build
## and added during configure with the -R option
-sed -i "s|QMAKE_RPATH.*$|QMAKE_RPATH =|" mkspecs/linux-g++/qmake.conf
-
-## tqt libs might be installed in $([T]QTDIR)/lib64
-sed -i "s|QTDIR)/lib|&$LIBDIRSUFFIX|" mkspecs/linux-g++/qmake.conf
-## [open]GL libs might be installed in ../lib64
-sed -i "s|X11R6/lib|&$LIBDIRSUFFIX|" mkspecs/linux-g++/qmake.conf
+## lib suffix might be 64
## add -headerdir as set in configure
[[ $TDEVERSION == 14.1.0 ]] && QTDIR_PFX=T || QTDIR=$TQTDIR
-sed -i "s|QMAKE_INCDIR =|& \$(${QTDIR_PFX:-}QTDIR)/include/tqt|" mkspecs/linux-g++/qmake.conf
-
## allow building with clang, either build-time or run-time
[[ ! $(grep COMPILER mkspecs/linux-g++/qmake.conf) ]] && {
echo $'--- mkspecs/linux-g++/qmake.conf
@@ -62,16 +55,44 @@ echo $'--- mkspecs/linux-g++/qmake.conf
@@ -29 +29 @@
-QMAKE_CXX = g++
+QMAKE_CXX = $(COMPILER_CXX)
+@@ -40 +40 @@
+-QMAKE_INCDIR =
++QMAKE_INCDIR = $('"${QTDIR_PFX:-}"$'QTDIR)/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_INCDIR_OPENGL = /usr/X11R6/include
+-QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib
++QMAKE_LIBDIR_'"${QTDIR_PFX:-}"$'QT = $('"${QTDIR_PFX:-}"$'QTDIR)/lib'"$LIBDIRSUFFIX"$'
++QMAKE_INCDIR_OPENGL = /usr/include/GL
++QMAKE_LIBDIR_OPENGL = /usr/lib'"$LIBDIRSUFFIX"$'
@@ -49,2 +49,2 @@
-QMAKE_LINK = g++
-QMAKE_LINK_SHLIB = g++
+QMAKE_LINK = $(COMPILER_CXX)
-+QMAKE_LINK_SHLIB = $(COMPILER_CXX)' | patch -p0
++QMAKE_LINK_SHLIB = $(COMPILER_CXX)
+@@ -58 +58 @@
+-QMAKE_RPATH = -Wl,-rpath,
++QMAKE_RPATH =
+' | patch -p0
}
## don't install html docs if 'nodocs' has been selected
[[ $TQT_OPTS == *nodocs* ]] && sed -i '/htmldocs/d' src/qt_install.pri
+## install translations only for the languages set with I18N
+(cd translations
+I18N=$(echo $I18N | tr '[:upper:]' '[:lower:]' | tr '_' '-')
+for lang in $I18N
+do
+file="${file:+${file}:}*${lang}*"
+done
+GLOBIGNORE=${file:-}
+rm *)
## for a minimal build
[[ $TQT_OPTS == *minimal* ]] && {
sed -i '/translations/d' src/qt_install.pri
@@ -141,6 +162,12 @@ echo "yes" | \
-fast \
-R-Wl,-rpath,\'\\\$\$ORIGIN/../lib:$INST_RPATH\' ## +$INST_RPATH for run-time RPATH
+#| cc1plus: error: one or more PCH files were found, but they were invalid
+#| : fatal error: tqtdesignercore: No such file or directory
+## Not a fatal error causing a build failure - qmake_image_collection.o compiles later
+## at its correct position in the Makefile OBJECTS list - but it's misleading
+sed -i 's|./qmake_image_collection.o:.*$|& tqtdesignercore.gch/c++|' tools/designer/designer/Makefile
+
## don't build tutorial and examples which won't be installed because the release version is being built
make -i $NUMJOBS symlinks src-qmake src-moc sub-src sub-tools || exit 1
make install INSTALL_ROOT=$PKG || exit 1
@@ -303,12 +330,12 @@ EOF
## This could be a first build of tqt3, so build with the packaging directory binaries
$PKG$INSTALL_TDE/bin/tqmake -project -o regextester.pro
-$PKG$INSTALL_TDE/bin/tqmake TARGET=regextester -spec $PKG$INSTALL_TDE/lib64/tqt/mkspecs/linux-g++
+$PKG$INSTALL_TDE/bin/tqmake TARGET=regextester -spec $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt/mkspecs/linux-g++
sed -i "s|-ltqt-mt|$PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/libtqt-mt.so.3|" Makefile
sed -i "s|tqmake|$PKG$INSTALL_TDE/bin/tqmake|" Makefile
-QTDIR=$PKG$INSTALL_TDE COMPILER_CXX=g++ make
+make
strip regextester
diff --git a/Deps/tqtinterface/tqtinterface.SlackBuild b/Deps/tqtinterface/tqtinterface.SlackBuild
index c554961..ec6e4c7 100755
--- a/Deps/tqtinterface/tqtinterface.SlackBuild
+++ b/Deps/tqtinterface/tqtinterface.SlackBuild
@@ -40,21 +40,12 @@ chown_fn
cd_builddir_fn
[[ $TDEVERSION == 14.1.0 ]] && QTINC_PFX=T
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$TQTDIR \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DQT_PREFIX_DIR=$TQTDIR \
-D${QTINC_PFX:-}QT_INCLUDE_DIR=$TQTDIR/include/tqt \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DQT_VERSION=3 \
-DWITH_QT3="OFF" \
- -DWITH_QT4="OFF" \
- -Wno-dev \
- ..
+ -DWITH_QT4="OFF"
make_fn
diff --git a/Libs/libkdcraw/libkdcraw.SlackBuild b/Libs/libkdcraw/libkdcraw.SlackBuild
index 4010b23..64ff4ae 100755
--- a/Libs/libkdcraw/libkdcraw.SlackBuild
+++ b/Libs/libkdcraw/libkdcraw.SlackBuild
@@ -128,27 +128,19 @@ tde_add_executable( dcraw_half AUTOMOC
LINK raw-static
)' >> libkdcraw/test/CMakeLists.txt
+## for pkg-config .pc file
+sed -i 's|project( libkdcraw|& VERSION 0.1.9|' CMakeLists.txt
+sed -i 's|Version:.*$|Version: @PROJECT_VERSION@|' libkdcraw/libkdcraw.pc.cmake
+
chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_LCMS="ON" \
-DWITH_OPENMP="ON" \
-DBUILD_DCRAW="ON" \
- -DBUILD_TESTS="ON" \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+ -DBUILD_TESTS="ON"
make_fn
diff --git a/Libs/libkexiv2/libkexiv2.SlackBuild b/Libs/libkexiv2/libkexiv2.SlackBuild
index 66b9634..9ec71e9 100755
--- a/Libs/libkexiv2/libkexiv2.SlackBuild
+++ b/Libs/libkexiv2/libkexiv2.SlackBuild
@@ -40,17 +40,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Libs/libkipi/libkipi.SlackBuild b/Libs/libkipi/libkipi.SlackBuild
index 0eb2816..35d970f 100755
--- a/Libs/libkipi/libkipi.SlackBuild
+++ b/Libs/libkipi/libkipi.SlackBuild
@@ -43,18 +43,7 @@ chown_fn
cd_builddir_fn
-cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
- -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
- -DCMAKE_C_COMPILER=$COMPILER \
- -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DLIB_SUFFIX=$LIBDIRSUFFIX \
- -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
- -DBUILD_TRANSLATIONS="ON" \
- -Wno-dev \
- ..
+cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-}
make_fn
diff --git a/Misc/inkscape/inkscape.SlackBuild b/Misc/inkscape/inkscape.SlackBuild
index d9226f0..3a79daa 100755
--- a/Misc/inkscape/inkscape.SlackBuild
+++ b/Misc/inkscape/inkscape.SlackBuild
@@ -75,7 +75,7 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc" DESTINATION ${CMA
sed -i 's|VERSION 3.2.0|VERSION 3.2.1|' CMakeLists.txt
cd cmake/
-# LIBDIRSUFFIX not required - builds to lib64 where appropriate ..
+# LIBDIRSUFFIX not required - include(GNUInstallDirs) sets lib64 where appropriate ..
cmake ${G_NINJA:-} \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_TESTING=OFF \
@@ -157,8 +157,14 @@ chown_fn
cd_builddir_fn
+## for a clang/i586 build, linking inkscape and inkview:
+##| /usr/bin/ld: lib/libinkscape_base.so: undefined reference to `__atomic_store'
+##| /usr/bin/ld: lib/libinkscape_base.so: undefined reference to `__atomic_load'
+## Override the LIBATOMIC_NOT_NEEDED test in DefineDependsandFlags.cmake to add -latomic to the linker flags
+[[ $COMPILER == clang && $ARCH == i586 ]] && LIBATOMIC=-DLIBATOMIC_NOT_NEEDED=0
+
## options have been pulled from CMakeLists.txt
-cmake ${G_NINJA:-} \
+cmake ${G_NINJA:-} ${LIBATOMIC:-} \
-DCMAKE_C_FLAGS="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
-DCMAKE_C_COMPILER=$COMPILER \
diff --git a/README.md b/README.md
index b291db9..4e84527 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, 14.1.0.
+which will build the release version 14.0.13, or the development versions 14.0.x [\[see note \[6\]\]](#6), or 14.1.0.
[
](https://ray-v.github.io/TDE-version.png "TDE version")
... select TDE version
@@ -61,7 +61,7 @@ get-source.sh - common code for the SlackBuilds
There is an override in the Misc SlackBuilds for non-trinity source archive URLs. Non-trinity builds have been included where a TDE package requires a dependency that is not in Slackware, or where it's an alternative to a TDE package.
Some SlackBuilds require non-Slackware packages which aren't in the build list. These can be added to the build if they are not already installed by downloading the source archives to the 'src' directory. They will then be built and installed during the xxx.SlackBuild.
-See the READMEs in Core/tdeedu, Apps/k3b, Apps/klamav, Apps/koffice and Misc/inkscape for details, which can also be viewed while running ./BUILD-TDE.sh.
+See the READMEs in Core/tdeedu, Apps/k3b, Apps/klamav, and Misc/inkscape for details, which can also be viewed while running ./BUILD-TDE.sh.
---
@@ -136,6 +136,9 @@ Includes:
[5] The speex build for version 1.2.0 has been retained, but speex v1.2.1 is available as a Slackware 15.0 package and should be used for tdenetwork and amarok builds.
+
+[6] 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/get-source.sh b/get-source.sh
index 72542ef..993d15f 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -124,6 +124,8 @@ cd $BUILD_TDE_ROOT/src/cgit
[[ -d admin ]] && \
(echo "Updating admin ..."
cd admin
+## remove any old .git/worktrees records - only being used here as a build source
+rm -rf .git/worktrees/*
git checkout -- *
git pull
## repo is in master - update r14.0.x to latest revision
@@ -131,6 +133,7 @@ git fetch origin r14.0.x:r14.0.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)
@@ -151,6 +154,7 @@ touch $TMPVARS/admin-cmake-done
[[ -d $PRGNAM ]] && \
(echo "Updating $PRGNAM ..."
cd $PRGNAM
+rm -rf .git/worktrees/*
git checkout -- *
git pull
git fetch origin r14.0.x:r14.0.x)
@@ -163,6 +167,7 @@ git clone https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM
[[ -d libltdl ]] && \
(echo "Updating libltdl ..."
cd libltdl
+rm -rf .git/worktrees/*
git checkout -- *
git pull
git fetch origin r14.0.x:r14.0.x)
@@ -176,6 +181,7 @@ git clone https://mirror.git.trinitydesktop.org/gitea/TDE/libltdl
[[ -d libtdevnc ]] && \
(echo "Updating libtdevnc ..."
cd libtdevnc
+rm -rf .git/worktrees/*
git checkout -- *
git pull
# git fetch origin r14.0.x:r14.0.x
@@ -250,7 +256,7 @@ cd $TMP_BUILD/tmp-$PRGNAM
## unpack R14 or misc
echo -e "\n unpacking $(basename $SOURCE) ... \n"
tar -xf $SOURCE
-[[ $TDEMIR_SUBDIR != misc ]] && (
+[[ $TDEMIR_SUBDIR != misc ]] && [[ -e $(ls $PRGNAM*/CMakeLists.txt) ]] && (
cd $PRGNAM*
tar -xf $SRCDIR/cmake-$TDEVERSION.tar.xz
mv cmake-trinity-$TDEVERSION cmake
@@ -308,9 +314,27 @@ echo # if this fails, SlackBuild will fail from [3]
#
cd $PRGNAM*
-## For cmake builds - the path to the TDE cmake modules
-## Added for 14.0.11+ & 14.1.0 which assume a cmake-trinity package is installed to the CMake system directories
-export CMAKE_OPTS=-DCMAKE_MODULE_PATH=$PWD/cmake/modules
+## 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:
+[[ $VERSION == 14.* ]] && [[ -e CMakeLists.txt ]] && {
+[[ $PRGNAM == libart-lgpl ]] && SLKRCFLAGS=$SLKCFLAGS
+echo 'set ( CMAKE_C_COMPILER '"$(which $COMPILER)"' CACHE FILEPATH "" )
+set ( CMAKE_CXX_COMPILER '"$(which $COMPILER_CXX)"' CACHE FILEPATH "" )
+set ( CMAKE_C_FLAGS "'"$SLKRCFLAGS"'" CACHE STRING "Slackware set c flags" )
+set ( CMAKE_CXX_FLAGS "'"$SLKRCFLAGS"'" CACHE STRING "Slackware set c++ flags" )
+set ( CMAKE_INSTALL_PREFIX '"$INSTALL_TDE"' CACHE PATH "Path to TDE installation directory" )
+set ( PLUGIN_INSTALL_DIR '"$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR"' CACHE PATH "Path to plugins directory" )
+set ( MAN_INSTALL_DIR '"$INSTALL_TDE"'/man CACHE PATH "Path to TDE man pages directory" )
+set ( CMAKE_BUILD_TYPE Release CACHE STRING "The type of build" )
+set ( CMAKE_MODULE_PATH '"$PWD"'/cmake/modules CACHE PATH "Path to TDE cmake modules" )
+set ( LIB_SUFFIX '"$LIBDIRSUFFIX"' CACHE STRING "Libraries directory /lib suffix" )
+set ( WITH_GCC_VISIBILITY '"${GCC_VIS:-}"' CACHE BOOL "Used if ON and included in ConfigureChecks.cmake" )
+set ( BUILD_DOC ON CACHE BOOL "Set but not used for this project" )
+set ( BUILD_TRANSLATIONS ON CACHE BOOL "Set but not used for this project" )
+' > $TMPVARS/CMAKE_CACHE
+export CMAKE_OPTS='-Wno-dev --no-warn-unused-cli ..'
+} || : # exit 0 if not a TDE cmake build
}
listdocs_fn ()