diff --git a/cross-compiling-TDE-for-the-RPi3.html b/cross-compiling-TDE-for-the-RPi3.html
index a1e5a3a..0002291 100755
--- a/cross-compiling-TDE-for-the-RPi3.html
+++ b/cross-compiling-TDE-for-the-RPi3.html
@@ -133,7 +133,7 @@ Builds have been done for the RPi3 running systems based on Slackware-arm-curren
The packages listed on this page have been built on an x86_64 machine and installed and tested OK on an RPi3.
-[Edit: builds for R14.0.12 have been verified for 64-bit arm only].
+[Edit: builds for R14.0.13 have been verified for 64-bit arm only].
For any problems, questions, etc please open an issue at tde-slackbuilds.
@@ -590,7 +590,7 @@ To keep track of where stuff is installed use the package management system - de
installpkg /tmp/xgcc910-glibc2.29-${K_VER}_RPi_headers-en_GB-$ARM.txz
## Set the variables for the TDE packages builds
-export TDE_VERSION=14.0.12
+
-## Set up an arm mkspecs to use for this build where includes and libs paths are set to SYSROOT
+## Set up an arm mkspecs to use for this build where the system includes and libs paths are set to SYSROOT
export TDE_VERSION=14.0.13
export INSTALL_TDE=/opt/tde
export SYS_CNF_DIR=/etc/tde
[[ $ARM == aarch64 ]] && export LIBDIRSUFFIX=64
@@ -800,6 +800,11 @@ mkdir -p build-${PRGNAM}
cd build-${PRGNAM}
}
+mangzip_fn ()
+{
+find $PKG$INSTALL_TDE/man -type f -name "*.?" -exec gzip -9f {} \;
+}
+
strip_fn ()
{
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
@@ -953,9 +958,9 @@ sed -i '/phrasebooks/d' tools/linguist/linguist/linguist.pro
sed -i '/templates/d' tools/designer/designer/designer.pro
## only need linux-g++
-mv mkspecs/linux-g++ ../
-rm -rf mkspecs/*
-mv ../linux-g++ mkspecs/
+(cd mkspecs
+GLOBIGNORE=linux-g++
+rm -rf *)
## RPATH is to be set as $ORIGIN/../lib, so don't need absolute libs directory built in -
## Allow setting CC/CXX for linux-g++/qmake.conf -
@@ -968,18 +973,21 @@ mv ../linux-g++ mkspecs/
@@ -29 +29 @@
-QMAKE_CXX\t\t= g++
+QMAKE_CXX\t\t= $(COMPILER_CXX)
+@@ -40 +40 @@
+-QMAKE_INCDIR\t\t=
++QMAKE_INCDIR\t\t= $(QTDIR)/include/tqt
@@ -42,2 +42,2 @@
-QMAKE_INCDIR_X11\t= /usr/X11R6/include
-QMAKE_LIBDIR_X11\t= /usr/X11R6/lib
+QMAKE_INCDIR_X11\t= /usr/include/X11
-+QMAKE_LIBDIR_X11\t= /usr/lib$(LIBDIRSUFFIX)
++QMAKE_LIBDIR_X11\t= /usr/lib'"$LIBDIRSUFFIX"$'
@@ -45,3 +45,3 @@
-QMAKE_LIBDIR_QT\t\t= $(QTDIR)/lib
-QMAKE_INCDIR_OPENGL\t= /usr/X11R6/include
-QMAKE_LIBDIR_OPENGL\t= /usr/X11R6/lib
-+QMAKE_LIBDIR_QT\t\t= $(QTDIR)/lib$(LIBDIRSUFFIX)
++QMAKE_LIBDIR_QT\t\t= $(QTDIR)/lib'"$LIBDIRSUFFIX"$'
+QMAKE_INCDIR_OPENGL\t= /usr/include/GL
-+QMAKE_LIBDIR_OPENGL\t= /usr/lib$(LIBDIRSUFFIX)
++QMAKE_LIBDIR_OPENGL\t= /usr/lib'"$LIBDIRSUFFIX"$'
@@ -49,2 +49,2 @@
-QMAKE_LINK\t\t= g++
-QMAKE_LINK_SHLIB\t= g++
@@ -999,21 +1007,24 @@ sed -i "s| /usr/lib| $SYSROOT/usr/lib$LIBDIRSUFFIX|" config.tests/{unix,x11}/*.t
sed -i "s|\"/lib|\"$SYSROOT/lib$LIBDIRSUFFIX|" config.tests/unix/checkavail
sed -i "s|/usr|$SYSROOT&|" config.tests/unix/checkavail
cp -a mkspecs/linux-g++ mkspecs/linux-arm-g++
echo $'--- mkspecs/linux-arm-g++/qmake.conf
+++ mkspecs/linux-arm-g++/qmake.conf
+@@ -8 +8 @@
+-CONFIG\t\t\t+= qt warn_on release incremental link_prl thread
++CONFIG\t\t\t+= qt warn_off release incremental link_prl thread
@@ -42,2 +42,2 @@
-QMAKE_INCDIR_X11\t= /usr/include/X11
--QMAKE_LIBDIR_X11\t= /usr/lib$(LIBDIRSUFFIX)
+-QMAKE_LIBDIR_X11\t= /usr/lib'"$LIBDIRSUFFIX"$'
+QMAKE_INCDIR_X11\t= $(SYSROOT)/usr/include/X11
-+QMAKE_LIBDIR_X11\t= $(SYSROOT)/usr/lib$(LIBDIRSUFFIX)
++QMAKE_LIBDIR_X11\t= $(SYSROOT)/usr/lib'"$LIBDIRSUFFIX"$'
@@ -46,2 +46,2 @@
-QMAKE_INCDIR_OPENGL\t= /usr/include/GL
--QMAKE_LIBDIR_OPENGL\t= /usr/lib$(LIBDIRSUFFIX)
+-QMAKE_LIBDIR_OPENGL\t= /usr/lib'"$LIBDIRSUFFIX"$'
+QMAKE_INCDIR_OPENGL\t= $(SYSROOT)/usr/include/GL
-+QMAKE_LIBDIR_OPENGL\t= $(SYSROOT)/usr/lib$(LIBDIRSUFFIX)' | patch -p0
++QMAKE_LIBDIR_OPENGL\t= $(SYSROOT)/usr/lib'"$LIBDIRSUFFIX" | patch -p0
## Set -platform to arm so that tqmoc is built as an arm binary for installation on RPi3.
## Set -rpath so that libtqt-mt.so.3 can be found during the build
@@ -1082,9 +1093,13 @@ rm tqdesigner)
rm libtqteditor*
rm libtqassistantclient*)
-## remove sysroot path from RPi3 package
+## remove sysroot references from RPi3 package
sed -i "s|-L\$(S.*X)||g;s|$SYSROOT||g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/libtqt-mt.la
sed -i "s|-L\$(S.*X)||g;s|$SYSROOT||g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig/tqt-mt.pc
+
+(cd $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt/mkspecs/
+rm -rf linux-arm-g++
+ln -sf linux-g++ default)
mkdir -p $PKG/etc/profile.d
@@ -1183,6 +1198,7 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$TQTDIR \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DQT_PREFIX_DIR=$TQTDIR \
-DQT_INCLUDE_DIR=$TQTDIR/include/tqt \
@@ -1254,7 +1270,9 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
+ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_ALSA="ON" \
-DWITH_AUDIOFILE="ON" \
-DWITH_ESOUND="OFF" \
@@ -1263,6 +1281,7 @@ cmake \
-DWITH_MAD="ON" \
-DWITH_SNDIO="OFF" \
-DWITH_VORBIS="ON" \
+ -DBUILD_DOC="ON" \
-Wno-dev \
..
@@ -1272,6 +1291,8 @@ make DESTDIR=$PKG install
## remove sysroot path from package
sed -i "s|$SYSROOT||g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/pkgconfig/artsc.pc
+mangzip_fn
+
strip_fn
mkdir_install_fn
@@ -1322,6 +1343,7 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-Wno-dev \
..
@@ -1379,6 +1401,7 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DWITH_GCC_VISIBILITY="ON" \
-Wno-dev \
@@ -1436,6 +1459,7 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DMAN_INSTALL_DIR=/usr/man \
-DWITH_GCC_VISIBILITY="ON" \
@@ -1446,6 +1470,10 @@ cmake \
make $NUMJOBS
make DESTDIR=$PKG install
+## in shell so that INSTALL_TDE for TDE isn't overridden
+(INSTALL_TDE=/usr
+mangzip_fn)
+
strip_fn
mkdir_install_fn
@@ -1494,6 +1522,7 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DBUILD_TQCA="ON" \
-DBUILD_TQCA_TLS="ON" \
@@ -1590,7 +1619,7 @@ sed -i "s|\"trinity\"|\"$PLUGIN_INSTALL_DIR\"|" tdecore/tdeapplication.cpp || t
+ padding:0px 1px;
-khtml-border-radius: 3px;
#
-## for the
+## Restore diff.xml +/- colours and match markdown.xml diff display
+echo $'--- kate/data/diff.xml
++++ kate/data/diff.xml
+@@ -111,2 +111,2 @@
+- <itemData name="Removed line" defStyleNum="dsString" backgroundColor="#ffeef0"/>
+- <itemData name="Added line" defStyleNum="dsOthers" backgroundColor="#e6ffed"/>
++ <itemData name="Removed line" defStyleNum="dsString" color="#FF0000"/>
++ <itemData name="Added line" defStyleNum="dsOthers" color="#0000FF"/>
+--- kate/data/markdown.xml
++++ kate/data/markdown.xml
+@@ -149,2 +149,2 @@
+-\t\t\t<itemData name="difflineremove" defStyleNum="dsString" backgroundColor="#ffeef0" />
+-\t\t\t<itemData name="difflineadd" defStyleNum="dsOthers" backgroundColor="#e6ffed" />
++\t\t\t<itemData name="difflineremove" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#FF0000" />
++\t\t\t<itemData name="difflineadd" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#0000FF" />
+' | patch -p0
+
## Build without spell checker installed
## Otherwise, install Aspell, or Hspell, or Ispell …
sed -i 's|^.*Spell checker selected as default.*$|message( STATUS " ## no spell checker selected ##" )|' CMakeLists.txt
@@ -1652,7 +1698,7 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DCMAKE_SKIP_RPATH="OFF" \
-DCMAKE_INSTALL_RPATH=$INSTALL_TDE/lib$LIBDIRSUFFIX \
@@ -1823,6 +1869,7 @@ sed -i '20s|^|#include <linux/limits.h>|' kdesktop/lock/lockprocess.cpp
## Configuration files are in /etc/tde, and plugins in $INSTALL_TDE/lib$LIBDIRSUFFIX/tde
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|g" tdm/config.def || true
+sed -i "s|/etc/trinity|$INSTALL_TDE/share/config|" tdm/kfrontend/gentdmconf.c || true
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdm/kfrontend/gentdmconf.c || true
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" kcontrol/hwmanager/devicepropsdlg.cpp || true
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdeioslave/trash/testtrash.cpp || true
@@ -1870,9 +1917,10 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_ARTS="ON" \
-DWITH_ELFICON="OFF" \
-DWITH_GCC_VISIBILITY="ON" \
@@ -1972,6 +2020,8 @@ make DESTDIR=$PKG install
## remove sysroot path from package
sed -i "s|$SYSROOT||" $PKG$INSTALL_TDE/bin/khc_htsearch.pl
+mangzip_fn
+
strip_fn
## Add xinitrc:
@@ -2313,14 +2363,16 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
- -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_ARTS="ON" \
-DWITH_SDL="ON" \
-DWITH_BERKELEY_DB="ON" \
-DWITH_XMMS="OFF" \
-DWITH_TEST="OFF" \
+ -DWITH_GCC_VISIBILITY="ON" \
-DBUILD_DOC="ON" \
-DBUILD_ATLANTIKDESIGNER=${ATLANTIKDESIGNER:-"OFF"} \
-DBUILD_KADDRESSBOOK_PLUGINS=${KADDRESSBOOK_PLUGINS:-"OFF"} \
@@ -2339,6 +2391,8 @@ cmake \
make $NUMJOBS
make DESTDIR=$PKG install
+mangzip_fn
+
strip_fn
mkdir_install_fn
@@ -2399,8 +2453,10 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_DPMS="ON" \
-DWITH_XSCREENSAVER="OFF" \
-DWITH_SENSORS="ON" \
@@ -2439,6 +2495,8 @@ cmake \
make $NUMJOBS
make DESTDIR=$PKG install
+mangzip_fn
+
strip_fn
mkdir_install_fn
@@ -2496,13 +2554,17 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
+ -DWITH_GCC_VISIBILITY="ON" \
-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" \
@@ -2511,6 +2573,7 @@ cmake \
-DBUILD_KWORLDCLOCK="ON" \
-DBUILD_SOUNDS="ON" \
-DBUILD_STYLES="ON" \
+ -DBUILD_TDEASCIIQUARIUM="ON" \
-DBUILD_WALLPAPERS="ON" \
-Wno-dev \
..
@@ -2518,6 +2581,8 @@ cmake \
make $NUMJOBS
make DESTDIR=$PKG install
+mangzip_fn
+
strip_fn
mkdir_install_fn
@@ -3086,8 +3151,10 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
+ -DMAN_INSTALL_DIR=$INSTALL_TDE/man \
-DWITH_T1LIB="OFF" \
-DWITH_PAPER="OFF" \
-DWITH_TIFF="OFF" \
@@ -3121,6 +3188,8 @@ cmake \
make $NUMJOBS
make DESTDIR=$PKG install
+mangzip_fn
+
strip_fn
mkdir_install_fn
@@ -3177,6 +3246,7 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DWITH_GCC_VISIBILITY="ON" \
@@ -3227,6 +3297,7 @@ makepkg_fn
PRGNAM=tdmtheme
VERSION=$TDE_VERSION
BUILD=$BUILD
+I18N=$I18N
TMP=/tmp/build
rm -rf $TMP
PKG=$TMP/package-$PRGNAM
@@ -3236,12 +3307,16 @@ mkdir $TMP/tmp-$PRGNAM
untar_fn
+## set support for additional language(s) as per I18N variable
+## but only for languages available with this package
+## [need to export LINGUAS to set it as an environment variable for cmake]
+[[ $I18N ]] && TRANS=ON && export LINGUAS=$I18N
+
chown_fn
cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$PRGNAM*/build-$PRGNAM/*
-## all locales and html docs built by default, actually only en_US
cmake-toolchain_fn
cmake \
-D CMAKE_TOOLCHAIN_FILE=./cmake-toolchain.cmake \
@@ -3254,11 +3329,12 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DWITH_GCC_VISIBILITY="ON" \
-DBUILD_DOC="ON" \
- -DBUILD_TRANSLATIONS="ON" \
+ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \
-Wno-dev \
..
@@ -3336,6 +3412,7 @@ cmake \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DWITH_GCC_VISIBILITY="ON" \
@@ -3620,6 +3697,7 @@ cmake-toolchain_fn
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
+ -DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DWITH_GCC_VISIBILITY="ON" \
-DBUILD_DOC="ON" \
-DBUILD_TRANSLATIONS="OFF" \