From 2b33366189b3e86daf5e4cdb0752bee686f8ee44 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Sun, 31 Oct 2021 15:26:58 +0000 Subject: [PATCH] Updated for R14.0.11 --- cross-compiling-TDE-for-the-RPi3.html | 97 ++++++++++----------------- 1 file changed, 36 insertions(+), 61 deletions(-) diff --git a/cross-compiling-TDE-for-the-RPi3.html b/cross-compiling-TDE-for-the-RPi3.html index 217d5f8..36228c3 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.10 have been verified for 64-bit arm only]. +[Edit: builds for R14.0.11 have been verified for 64-bit arm only].
For any problems, questions, etc please open an issue at tde-slackbuilds.

@@ -178,9 +178,9 @@ The intention is that as much as possible that is required for the TDE cross com │   │      └── ld-linux-*.so.* … │   ├── bin cross compiler │   │   └── $TARGET-gcc … -│   └── sysroot ♦♦ -│      ├── lib$LIBDIRSUFFIX target libraries -│   ├── usr +│   └── sysroot +│      ├── lib$LIBDIRSUFFIX ♦♦ target libraries +│   ├── usr ♦♦ │   │   ├── include target headers │    │ │   └── linux kernel headers │   │   └── lib$LIBDIRSUFFIX target libraries @@ -590,11 +590,12 @@ 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.10 +export TDE_VERSION=14.0.11 export INSTALL_TDE=/opt/tde export SYS_CNF_DIR=/etc/tde [[ $ARM == aarch64 ]] && export LIBDIRSUFFIX=64 export TQTDIR=$INSTALL_TDE +export INST_RPATH=$TQTDIR/lib$LIBDIRSUFFIX export COMPILER=$HOST-gcc export COMPILER_CXX=$HOST-g++ export CC=$COMPILER @@ -603,7 +604,7 @@ export PLUGIN_INSTALL_DIR=tde export NUMJOBS=-j6 export BUILD=1 export SLKLDFLAGS="" -export SLKCFLAGS=-O2 +export SLKCFLAGS="-O2 -w -Wl,-rpath,'$INST_RPATH'" export I18N=en_GB ## Set variables for local paths: @@ -781,6 +782,9 @@ export PKG_CONFIG_LIBDIR=$SYSROOT/usr/lib$LIBDIRSUFFIX/pkgconfig:$SYSROOT/usr/sh { cd $TMP/tmp-$PRGNAM tar xf $SYSROOT/src/$PRGNAM-*$VERSION.tar.* +[[ $VERSION == $TDE_VERSION ]] && (cd $PRGNAM* +mkdir cmake +tar xf $SYSROOT/src/cmake-*$VERSION.tar.* --strip-components=1 -C cmake) cd $PRGNAM-*$VERSION } @@ -1053,7 +1057,7 @@ echo $'--- mkspecs/linux-arm-g++/qmake.conf -plugin-style-sgi \ -plugin-style-windows \ -fast \ - -R-Wl,-rpath,\'\\\$\$ORIGIN/../lib\' + -R-Wl,-rpath,\'\\\$\$ORIGIN/../lib:$INST_RPATH\' ## Don't build tutorial and examples which won't be installed because the release version is being built make $NUMJOBS symlinks src-qmake src-moc sub-src sub-tools @@ -1083,12 +1087,6 @@ rm libtqassistantclient*) 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 -## move mkspecs/linux-arm-g++ to the TDE installation directory - it isn't needed for the RPi3 package, but is needed for building tqca-tls -(cd $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt/mkspecs/ -mkdir -p $INSTALL_TDE/lib$LIBDIRSUFFIX/tqt/mkspecs -mv linux-arm-g++ $INSTALL_TDE/lib$LIBDIRSUFFIX/tqt/mkspecs -ln -sf linux-g++ default) - mkdir -p $PKG/etc/profile.d echo '#!'"/bin/sh @@ -1261,7 +1259,7 @@ cmake \ -DWITH_ALSA="ON" \ -DWITH_AUDIOFILE="ON" \ -DWITH_ESOUND="OFF" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ -DWITH_JACK="OFF" \ -DWITH_MAD="ON" \ -DWITH_SNDIO="OFF" \ @@ -1383,7 +1381,7 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ -Wno-dev \ .. @@ -1441,7 +1439,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DMAN_INSTALL_DIR=/usr/man \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ -DBUILD_DOC="ON" \ -Wno-dev \ .. @@ -1464,14 +1462,14 @@ ROOT=$SYSROOT installpkg $OUTPUT/$PRGNAM-$VERSION-$ARM-$BUILD.txz

- - + +
-… tqca-tls   +… tqca   -

close +
close cd / -PRGNAM=tqca-tls +PRGNAM=tqca VERSION=$TDE_VERSION BUILD=$BUILD TMP=/tmp/build @@ -1498,7 +1496,9 @@ cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DBUILD_TQCA="ON" \ + -DBUILD_TQCA_TLS="ON" \ + -DWITH_GCC_VISIBILITY="ON" \ -Wno-dev \ .. @@ -1514,10 +1514,10 @@ makepkg_fn installpkg $OUTPUT/$PRGNAM-$VERSION-$ARM-$BUILD.txz ROOT=$SYSROOT installpkg $OUTPUT/$PRGNAM-$VERSION-$ARM-$BUILD.txz -close +close

- +

@@ -1670,7 +1670,7 @@ cmake \ -DWITH_DEVKITPOWER="ON" \ -DWITH_ELFICON="OFF" \ -DWITH_GAMIN="OFF" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ -DWITH_HAL="OFF" \ -DWITH_HSPELL="OFF" \ -DWITH_IMAGETOPS_BINARY="OFF" \ @@ -1729,7 +1729,7 @@ ROOT=$SYSROOT installpkg $OUTPUT/$PRGNAM-$VERSION-$ARM-$BUILD.txz ## prefix paths with SYSROOT for build.make => link.txt dependencies for cmake builds for consistency with pkg-config paths sed -i "s|\"$INSTALL_TDE|\"$SYSROOT$INSTALL_TDE|" {,$SYSROOT}$INSTALL_TDE/share/cmake/tdelibs.cmake -## reinstate the sysroot paths stripped out of the package for libz, libjpeg, libasound +## reinstate the sysroot paths for the installed libz, libjpeg, libasound files required for the build sed -i "s|;/usr|;$SYSROOT/usr|" {,$SYSROOT}$INSTALL_TDE/share/cmake/tdelibs.cmake close @@ -1876,7 +1876,7 @@ cmake \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DWITH_ARTS="ON" \ -DWITH_ELFICON="OFF" \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ -DWITH_HAL="OFF" \ -DWITH_I8K="OFF" \ -DWITH_LDAP="OFF" \ @@ -1960,8 +1960,8 @@ cmake \ -Wno-dev \ .. -## If the linker has decided it can't find some libs to build kicker even though they've been built, -## editing kicker.dir/link.txt and rerunning make works: +## If the linker can't find some libs to build kicker even though they've been built, +## edit kicker.dir/link.txt and rerun 'make': make $NUMJOBS || \ [[ ! -e ./kicker/kicker/kicker ]] && { sed -i 's|^.*$|& ../../libkonq/libkonq.so.4 ./interfaces/libkickoffsearch_interfaces.so.0|' ./kicker/kicker/CMakeFiles/kicker.dir/link.txt && \ @@ -2558,7 +2558,7 @@ mkdir $TMP/tmp-$PRGNAM untar_fn -## patches thanks to fedora +Patches thanks to fedora echo $'--- Imlib/load.c +++ Imlib/load.c @@ -6,0 +7,2 @@ @@ -3180,7 +3180,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ -DBUILD_DOC="ON" \ -DBUILD_KCRON="ON" \ -DBUILD_KDAT="ON" \ @@ -3257,7 +3257,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="ON" \ -Wno-dev \ @@ -3338,7 +3338,7 @@ cmake \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ -DWITH_LIBIW="OFF" \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS=${TRANS:-"OFF"} \ @@ -3409,6 +3409,7 @@ MEINPROC=$INSTALL_TDE/bin/meinproc-x86 \ ../configure \ --prefix=$INSTALL_TDE \ --mandir=$INSTALL_TDE/man \ + --enable-gcc-hidden-visibility \ --disable-rpath \ --host=$HOST @@ -3548,26 +3549,6 @@ echo $'--- src/MainWidget.cpp -\tresize ( 96,47 ); +\tresize ( 64,31 );'|patch -p0 -## Caps+AltGr[+Shift] displayed characters should be toggled from the non-Caps state -echo $'--- src/VButton.cpp -+++ src/VButton.cpp -@@ -94,2 +94,13 @@ --\t\t// Caps does not seem to make any difference when AltGr is pressed --\t\tif (shift) -+\t\t// If Caps is on, displayed alpha characters should be toggled from the AltGr case -+\t\tif (caps) -+\t\t{ -+\t\t\tif (shift) -+\t\t\t{ -+\t\t\t\tTQPushButton::setText(altGrShiftText.lower()); -+\t\t\t} -+\t\t\telse -+\t\t\t{ -+\t\t\t\tTQPushButton::setText(altGrText.upper()); -+\t\t\t} -+\t\t} -+\t\telse if (shift)'|patch -p0 - ## blank character display where AltGr does not provide extra characters echo $'--- src/VButton.cpp +++ src/VButton.cpp @@ -3627,12 +3608,6 @@ echo $'--- src/MainWidget.cpp -\tmod_keys.append ( rwin ); +\tconnect ( rwin, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); +\tother_keys.append( rwin );'|patch -p0 - -## another combining character to display -echo $'--- src/Xutils.cpp -+++ src/Xutils.cpp -@@ -871,0 +872 @@ -+ { 0x01000358L, 0x02d9 }, /* combining dot above right ˙ dot above */'|patch -p0 chown_fn @@ -3651,7 +3626,7 @@ cmake-toolchain_fn -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DWITH_GCC_VISIBILITY="OFF" \ + -DWITH_GCC_VISIBILITY="ON" \ -DBUILD_DOC="ON" \ -DBUILD_TRANSLATIONS="OFF" \ -Wno-dev \ @@ -3709,7 +3684,7 @@ git checkout gh-pages

… dbus-tqt

… dbus-1-tqt

… libart-lgpl -

… tqca-tls +

… tqca

… tdelibs

… tdebase

… tdeaddons