diff --git a/cross-compiling-TDE-for-the-RPi3.html b/cross-compiling-TDE-for-the-RPi3.html
index 0002291..98d92f1 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.13 have been verified for 64-bit arm only].
+[Edit: builds for R14.1.0 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
-
+
+
+ … kvkbd
+ export TDE_VERSION=14.0.13
+
export TDE_VERSION=14.1.0
export INSTALL_TDE=/opt/tde
export SYS_CNF_DIR=/etc/tde
[[ $ARM == aarch64 ]] && export LIBDIRSUFFIX=64
@@ -913,7 +913,7 @@ rm -rf /tmp/x86*
## Add an RPATH so meinproc will use these libraries
patchelf --force-rpath --set-rpath $SYSROOT/x86 $SYSROOT/x86/meinproc
-patchelf --force-rpath --set-rpath $SYSROOT/x86 $SYSROOT/x86/libtdecore.so.14.0.0
+patchelf --force-rpath --set-rpath $SYSROOT/x86 $SYSROOT/x86/libtdecore.so.14.1.0
## Copy the x86 meinproc to the TDE installation directory - it's fussy about its location, producing parsing errors otherwise.
mkdir -p $INSTALL_TDE/bin
@@ -975,17 +975,17 @@ rm -rf *)
+QMAKE_CXX\t\t= $(COMPILER_CXX)
@@ -40 +40 @@
-QMAKE_INCDIR\t\t=
-+QMAKE_INCDIR\t\t= $(QTDIR)/include/tqt
++QMAKE_INCDIR\t\t= $(TQTDIR)/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"$'
@@ -45,3 +45,3 @@
--QMAKE_LIBDIR_QT\t\t= $(QTDIR)/lib
+-QMAKE_LIBDIR_TQT\t\t= $(TQTDIR)/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_TQT\t\t= $(TQTDIR)/lib'"$LIBDIRSUFFIX"$'
+QMAKE_INCDIR_OPENGL\t= /usr/include/GL
+QMAKE_LIBDIR_OPENGL\t= /usr/lib'"$LIBDIRSUFFIX"$'
@@ -49,2 +49,2 @@
@@ -1105,7 +1105,7 @@ ln -sf linux-g++ default)
echo '#!'"/bin/sh
# Environment path variable for the tQt package.
-export QTDIR=$TQTDIR
+export TQTDIR=$TQTDIR
" > $PKG/etc/profile.d/tqt3.sh
chmod 755 $PKG/etc/profile.d/tqt3.sh
@@ -1201,11 +1201,9 @@ cmake \
-DCMAKE_MODULE_PATH=$PWD/../cmake/modules \
-DLIB_SUFFIX=$LIBDIRSUFFIX \
-DQT_PREFIX_DIR=$TQTDIR \
- -DQT_INCLUDE_DIR=$TQTDIR/include/tqt \
+ -DTQT_INCLUDE_DIR=$TQTDIR/include/tqt \
-DMOC_EXECUTABLE=$SYSROOT/x86/tqmoc \
-DQT_VERSION=3 \
- -DWITH_QT3="OFF" \
- -DWITH_QT4="OFF" \
-Wno-dev \
..
@@ -1924,7 +1922,6 @@ cmake \
-DWITH_ARTS="ON" \
-DWITH_ELFICON="OFF" \
-DWITH_GCC_VISIBILITY="ON" \
- -DWITH_HAL="OFF" \
-DWITH_I8K="OFF" \
-DWITH_LDAP="OFF" \
-DWITH_LIBART="ON" \
@@ -2489,6 +2486,7 @@ cmake \
-DBUILD_KTIMER="ON" \
-DBUILD_TDEWALLET="ON" \
-DBUILD_SUPERKARAMBA="ON" \
+ -DBUILD_TDEFILEREPLACE="ON" \
-Wno-dev \
..
@@ -3133,8 +3131,68 @@ untar_fn
sed -i 's|COMMAND squeeze|COMMAND ./squeeze|' kdvi/CMakeLists.txt
chown_fn
-
-cd_builddir_fn
+
+## option to build without the dedicated KolourPaint button in ksnapshot
+echo $'--- ksnapshot/ksnapshot.cpp
++++ ksnapshot/ksnapshot.cpp
+@@ -84 +83,0 @@
+- connect(mainWidget, TQT_SIGNAL(openWithKPClicked()), TQT_SLOT(slotOpenWithKP()));
+@@ -135,6 +133,0 @@
+- // Check for KolourPaint availability
+- KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint");
+- if (!kpaint) {
+- mainWidget->btnOpenWithKP->hide();
+- }
+-
+@@ -395,7 +388,0 @@
+-void KSnapshot::slotOpenWithKP() {
+- KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint");
+- if (kpaint) {
+- openWithExternalApp(*kpaint);
+- }
+-}
+-
+--- ksnapshot/ksnapshot.h
++++ ksnapshot/ksnapshot.h
+@@ -114 +113,0 @@
+- void slotOpenWithKP();
+--- ksnapshot/ksnapshotwidget.ui
++++ ksnapshot/ksnapshotwidget.ui
+@@ -245,14 +244,0 @@
+- <widget class="KPushButton">
+- <property name="name">
+- <cstring>btnOpenWithKP</cstring>
+- </property>
+- <property name="text">
+- <string>Open in &KolourPaint</string>
+- </property>
+- <property name="whatsThis" stdset="0">
+- <string>Click this button to edit the snapshot in KolourPaint.</string>
+- </property>
+- <property name="iconSet">
+- <iconset>"kolourpaint"</iconset>
+- </property>
+- </widget>
+@@ -320,6 +305,0 @@
+- <connection>
+- <sender>btnOpenWithKP</sender>
+- <signal>clicked()</signal>
+- <receiver>KSnapshotWidget</receiver>
+- <slot>slotOpenWithKPClicked()</slot>
+- </connection>
+@@ -365 +344,0 @@
+- <signal>openWithKPClicked()</signal>
+@@ -375 +353,0 @@
+- <slot access="protected" specifier="non virtual">slotOpenWithKPClicked()</slot>
+--- ksnapshot/ksnapshotwidget.ui.h
++++ ksnapshot/ksnapshotwidget.ui.h
+@@ -140,4 +139,0 @@
+-void KSnapshotWidget::slotOpenWithKPClicked()
+-{
+- emit openWithKPClicked();
+-}' |patch -p0
+
+cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$PRGNAM*/build-$PRGNAM/*
## If imlib is installed, include kuickshow:
@@ -3155,7 +3213,6 @@ cmake \
-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" \
-DWITH_OPENEXR="OFF" \
@@ -3497,6 +3554,8 @@ make DESTDIR=$PKG install
sed -i "s|$XGCC_DIR/$HOST|/usr|g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/t*/*.la
sed -i "s|$SYSROOT||g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/t*/*.la
+mangzip_fn
+
strip_fn
mkdir_install_fn
@@ -3728,6 +3787,82 @@ Translations are also available with the x86_64 build.
+
+… tdebluez
+
+cd /
+PRGNAM=tdebluez
+VERSION=$TDE_VERSION
+BUILD=$BUILD
+TMP=/tmp/build
+rm -rf $TMP
+PKG=$TMP/package-$PRGNAM
+OUTPUT=/tmp
+mkdir -p $PKG
+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
+
+## path to configuration file
+sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" {README.md,doc/en/tdebluez.docbook}
+
+chown_fn
+
+cd_builddir_fn
+
+## rm -rf $TMP/tmp-$PRGNAM/$PRGNAM*/build-$PRGNAM/*
+cmake-toolchain_fn
+ cmake \
+ -D CMAKE_TOOLCHAIN_FILE=./cmake-toolchain.cmake \
+ -D MOC_EXECUTABLE=$SYSROOT/x86/tqmoc \
+ -D INTLTOOL_MERGE_EXECUTABLE=$(which intltool-merge) \
+ -D KDE3_MEINPROC_EXECUTABLE:INTERNAL=$INSTALL_TDE/bin/meinproc-x86 \
+ -DCMAKE_C_FLAGS="$SLKCFLAGS" \
+ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \
+ -DCMAKE_C_COMPILER=$COMPILER \
+ -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=${TRANS:-"OFF"} \
+ -DBUILD_LIBTDEBLUEZ="ON" \
+ -DBUILD_TDEIOSLAVE="ON" \
+ -Wno-dev \
+ ..
+
+make $NUMJOBS
+make DESTDIR=$PKG install
+
+strip_fn
+
+mkdir_install_fn
+
+doinst_sh_fn
+
+makepkg_fn
+
+## don't need to install this
+## installpkg $OUTPUT/$PRGNAM-$VERSION-$ARM-$BUILD.txz
+## ROOT=$SYSROOT installpkg $OUTPUT/$PRGNAM-$VERSION-$ARM-$BUILD.txz
+
+
+close
+
The source for this page is in the gh-pages branch of tde-slackbuilds:
@@ -3769,6 +3904,7 @@ git checkout gh-pages