This is based on the tde-slackbuilds build scripts which are used for a native RPi3 build.
-Builds have been done for the RPi3 running systems based on Slackware-arm-current [hard float], and Slarm64, with both systems using a 64-bit kernel built here.
+Builds have been done for the RPi3 running systems based on Slackware-arm-current [hard float], and Slarm64 [which can be downloaded from a mirror site, for example slackware.uk], with both systems using a 64-bit kernel built here.
The packages listed on this page have been built on an x86_64 machine and installed and tested OK on an RPi3.
@@ -192,8 +192,6 @@ The intention is that as much as possible that is required for the TDE cross com
The source archives need to be downloaded and placed in the src directory -
For the official release, R series, download from https://mirror.ppa.trinitydesktop.org/trinity/releases/
-
-For the snapshot release, r series, download https://mirror.git.trinitydesktop.org/cgit/<package>/snapshot/<package>-r14.0.*.tar.gz
Build in a chroot?
Yes if:
@@ -592,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=r14.0.6
+export TDE_VERSION=14.0.7
export INSTALL_TDE=/opt/trinity
export SYS_CNF_DIR=/etc/trinity
[[ $ARM == aarch64 ]] && export LIBDIRSUFFIX=64
@@ -612,7 +610,6 @@ export I18N=en_GB
export TDE_SRC=/path_to_${TDE_VERSION}_source_archives
export MISC_SRC=/path_to_misc_source_archives
-## Packages from Slarm64 have been used for the 64-bit build - download from a mirror site, for example slackware.uk
## Set Slack_base where the Slackware/Slarm64 packages a-y directories are:
export Slack_base=/path_to_[Slackware_arm_current/Slarm64]_a-y_directories
@@ -775,14 +772,8 @@ export PKG_CONFIG_LIBDIR=$SYSROOT/usr/lib$LIBDIRSUFFIX/pkgconfig:$SYSROOT/usr/sh
untar_fn ()
{
cd $TMP/tmp-$PRGNAM
-tar xf $SYSROOT/src/$PRGNAM-$VERSION.tar.*
-## cd - the former for 'R' releases; the latter for 'r' from git, and misc ..
-cd ${SUB_DIR:-}$PRGNAM 2>/dev/null || {
-cd $PRGNAM-$VERSION
-[[ -d admin ]] && tar xf $SYSROOT/src/admin-$VERSION.tar.* -C admin --strip-components=1
-[[ -d cmake ]] && tar xf $SYSROOT/src/cmake-$VERSION.tar.* -C cmake --strip-components=1
-[[ -d libltdl ]] && tar xf $SYSROOT/src/libltdl-$VERSION.tar.* -C libltdl --strip-components=1
-}
+tar xf $SYSROOT/src/$PRGNAM-*$VERSION.tar.*
+cd $PRGNAM-*$VERSION
}
chown_fn ()
@@ -835,40 +826,6 @@ make -f admin/Makefile.common
} 2>/dev/null
}
-FindTQt-patch_fn ()
-{
-## allow tqmoc path to be pre-defined
-## Ref: https://mirror.git.trinitydesktop.org/gitea/TDE/tde-common-cmake/issues/29
-## commit cf2e8d2857
-echo $'--- cmake/modules/FindTQt.cmake
-+++ cmake/modules/FindTQt.cmake
-@@ -21,0 +22,6 @@
-+mark_as_advanced(
-+ TMOC_EXECUTABLE
-+ MOC_EXECUTABLE
-+ UIC_EXECUTABLE
-+)
-+
-@@ -25 +31,3 @@
-- OUTPUT_VARIABLE TMOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
-+ OUTPUT_VARIABLE TMOC_EXECUTABLE
-+ CACHE FILEPATH "TQt tmoc executable path"
-+ OUTPUT_STRIP_TRAILING_WHITESPACE )
-@@ -37 +45,3 @@
-- OUTPUT_VARIABLE MOC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
-+ OUTPUT_VARIABLE MOC_EXECUTABLE
-+ CACHE FILEPATH "TQt moc executable path"
-+ OUTPUT_STRIP_TRAILING_WHITESPACE )
-@@ -49 +59,3 @@
-- OUTPUT_VARIABLE UIC_EXECUTABLE OUTPUT_STRIP_TRAILING_WHITESPACE )
-+ OUTPUT_VARIABLE UIC_EXECUTABLE
-+ CACHE FILEPATH "TQt uic executable path"
-+ OUTPUT_STRIP_TRAILING_WHITESPACE )' | while read line
-do
-patch -N -p0
-done
-}
-
cmake-toolchain_fn ()
{
echo " set(CMAKE_SYSTEM_NAME Linux)
@@ -896,21 +853,21 @@ echo " set(CMAKE_SYSTEM_NAME Linux)
… tqmoc and meinproc x86 binaries The cross compiling build time can be reduced by using x86 versions of tqmoc and meinproc which produce ARCH independent ouput. The figures for the tdebase build demonstrate how much quicker a build can be.
Variables for pre-built x86 packages - these were built to install to /opt/tde on a 64-bit system
## Don't build tutorial and examples which won't be installed because the release version is being built
## Build in a sub-shell to temporarily add the path to libtqt-mt.so.3
-## Different PATHs for release [R] and snapshot [r] TDE versions
-INSTALL_TDE_x86="/opt/tde"
LIBDIRSUFFIX_x86="64"
## Install x86 packages to temporary location on BUILD system
cd /location_of_pre-built_TDE_x86_packages
-ROOT=/tmp/x86/ installpkg tqt3-R14.0.5-x86_64-*.txz tqtinterface-R14.0.5-x86_64-*.txz dbus-1-tqt-R14.0.5-x86_64-*.txz tdelibs-R14.0.5-x86_64-*.txz libart*lgpl-R14.0.5-x86_64-*.txz
+ROOT=/tmp/x86/ installpkg tqt3-$TDE_VERSION-x86_64-*.txz tqtinterface-$TDE_VERSION-x86_64-*.txz dbus-1-tqt-$TDE_VERSION-x86_64-*.txz tdelibs-$TDE_VERSION-x86_64-*.txz libart*lgpl-$TDE_VERSION-x86_64-*.txz
## Copy tqmoc, and meinproc and its dependent libraries, to a convenient location, $SYSROOT/x86
cd $SYSROOT/x86
-cp -a /tmp/x86$INSTALL_TDE_x86/lib$LIBDIRSUFFIX_x86/tqt3-R14.0.5/bin/tqmoc .
+cp -a /tmp/x86$INSTALL_TDE_x86/lib$LIBDIRSUFFIX_x86/tqt3-$TDE_VERSION/bin/tqmoc .
cp -a /tmp/x86$INSTALL_TDE_x86/bin/meinproc .
cp -a /tmp/x86$INSTALL_TDE_x86/lib$LIBDIRSUFFIX_x86/lib{DCOP,dbus-1-tqt,tde{core,fx,io,su,ui,walletclient}}.so* .
-cp -a /tmp/x86$INSTALL_TDE_x86/lib$LIBDIRSUFFIX_x86/tqt3-R14.0.5/lib/libtqt-mt.so* .
+cp -a /tmp/x86$INSTALL_TDE_x86/lib$LIBDIRSUFFIX_x86/tqt3-$TDE_VERSION/lib/libtqt-mt.so* .
cp -a /tmp/x86/usr/lib$LIBDIRSUFFIX_x86/lib{tqt,art_lgpl_2}.so* .
rm -rf /tmp/x86*
@@ -949,7 +906,6 @@ mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
PREPEND=no
-SUB_DIR=dependencies/
untar_fn
@@ -1070,8 +1026,7 @@ done
(LD_LIBRARY_PATH=$TMP/tmp-$PRGNAM/${SUB_DIR}$PRGNAM/lib:$TMP/tmp-$PRGNAM/$PRGNAM-$VERSION/lib:$LD_LIBRARY_PATH \
+
## remove sysroot path from RPi3 package
(LD_LIBRARY_PATH=$TMP/tmp-$PRGNAM/$PRGNAM-*$VERSION/lib:$LD_LIBRARY_PATH \
make $NUMJOBS symlinks src-qmake src-moc sub-src sub-tools)
make install INSTALL_ROOT=$PKG
@@ -1085,16 +1040,17 @@ rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqtconfig
rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqm2ts
rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqlupdate
rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqlrelease
-rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqlinguist
+#rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqlinguist
rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqembed
rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqdesigner
-rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqassistant
+#rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/tqassistant
rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/msg2tqm
rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/bin/maketqpf
## libraries
rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/lib/libtqteditor*
rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/lib/libtqtdesignercore*
+rm $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/lib/libtqassistantclient*
sed -i "s|-L\$(S.*X)||g;s|$SYSROOT||g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/tqt3-$VERSION/lib/libtqt-mt.la
@@ -1237,13 +1193,10 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=dependencies/
untar_fn
chown_fn
-FindTQt-patch_fn
-
cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$SUB_DIR$PRGNAM/build-$PRGNAM/*
@@ -1307,13 +1260,10 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=dependencies/
untar_fn
chown_fn
-FindTQt-patch_fn
-
cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$SUB_DIR$PRGNAM/build-$PRGNAM/*
@@ -1373,13 +1323,10 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=dependencies/
untar_fn
chown_fn
-FindTQt-patch_fn
-
cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$SUB_DIR$PRGNAM/build-$PRGNAM/*
@@ -1433,13 +1380,10 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=dependencies/
untar_fn
chown_fn
-FindTQt-patch_fn
-
cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$SUB_DIR$PRGNAM/build-$PRGNAM/*
@@ -1493,23 +1437,24 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=dependencies/
untar_fn
-ltoolupdate_fn
-
chown_fn
cd_builddir_fn
-LDFLAGS="$SLKLDFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-CFLAGS="$SLKCFLAGS" \
-../configure \
- --prefix=/usr \
- --libdir=/usr/lib$LIBDIRSUFFIX \
- --disable-static \
- --host=$HOST
+## rm -rf $TMP/tmp-$PRGNAM/$SUB_DIR$PRGNAM/build-$PRGNAM/*
+cmake-toolchain_fn
+cmake \
+ -D CMAKE_TOOLCHAIN_FILE=./cmake-toolchain.cmake \
+ -DCMAKE_C_FLAGS:STRING=$SLKCFLAGS \
+ -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \
+ -DCMAKE_C_COMPILER=$COMPILER \
+ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DLIB_SUFFIX=$LIBDIRSUFFIX \
+ ..
make $NUMJOBS
make DESTDIR=$PKG install
@@ -1546,7 +1491,6 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=dependencies/
untar_fn
chown_fn
@@ -1604,7 +1548,6 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=""
untar_fn
## patch to enable tdecmshell to find TDE .desktop file in the event of a duplication in file names - TDE bug 2821
@@ -1640,8 +1583,6 @@ done || true
chown_fn
-FindTQt-patch_fn
-
## Check for avahi-tqt
[[ $(ls $SYSROOT/$INSTALL_TDE/lib$LIBDIRSUFFIX/libavahi-tqt.so.*) ]] && AVAHI="ON"
@@ -1757,7 +1698,6 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=""
untar_fn
## picking up the wrong limits.h - MAX_PATH not defined
@@ -1830,31 +1770,8 @@ do
patch -p0
done
-## linux/stat.h:56:8: error: redefinition of struct statx_timestamp
-## glibc-2.28+ issue - commit de4afaaf00
-[[ $TDE_VERSION == R14.0.5 ]] && {
-echo $'--- kdesktop/lock/lockprocess.cc
-+++ kdesktop/lock/lockprocess.cc
-@@ -82,3 +81,0 @@
--#ifdef __linux__
--#include <linux/stat.h>
--#endif
-' | while read line
-do
-patch -p0
-done
-}
-
-## Add libtirpc for rpc functions.
-## The 32-bit, Sl current, build of r14.0.6 uses the glibc..rpc/rpc.h and fails with:
-## tdeio_nfs.cpp:(.text+0x412c): undefined reference to `clnttcp_create' .. etc
-## Force libtirpc for all builds:
-sed -i 's|LINK tdeio-shared.*$|LINK tdeio-shared -ltirpc|' tdeioslave/nfs/CMakeLists.txt
-
chown_fn
-FindTQt-patch_fn
-
cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$SUB_DIR$PRGNAM/build-$PRGNAM/*
@@ -1905,14 +1822,7 @@ cmake-toolchain_fn
-Wno-dev \
..
-## The linker has decided it can't find some libs to build kicker even though they've been built.
-## Until the problem is fixed, adding their locations to link.txt and rerunning make works:
-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 && \
make $NUMJOBS
-}
-
make DESTDIR=$PKG install
## remove sysroot path from package
@@ -2205,13 +2115,10 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=""
untar_fn
chown_fn
-FindTQt-patch_fn
-
## check for libatlantic [tdegames]
[[ $(ls $SYSROOT$INSTALL_TDE/lib$LIBDIRSUFFIX/libatlantic.so.*) ]] && ATLANTIKDESIGNER="ON"
@@ -2305,13 +2212,10 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=""
untar_fn
chown_fn
-FindTQt-patch_fn
-
cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$SUB_DIR$PRGNAM/build-$PRGNAM/*
@@ -2397,13 +2301,10 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=""
untar_fn
chown_fn
-FindTQt-patch_fn
-
cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$SUB_DIR$PRGNAM/build-$PRGNAM/*
@@ -2996,172 +2897,13 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=""
untar_fn
-## for R14* - bug 2957
-echo $'--- tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
-+++ tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake
-@@ -27,5 +27,5 @@
--if( NOT DEFINED HAVE_POPPLER_060 )
-- message( STATUS "Performing Test HAVE_POPPLER_060" )
-- if( NOT POPPLER_VERSION VERSION_LESS "0.60" )
-- set( HAVE_POPPLER_060 1 CACHE INTERNAL "" FORCE )
-- message( STATUS "Performing Test HAVE_POPPLER_060 - Success" )
-+if( NOT DEFINED HAVE_POPPLER_058 )
-+ message( STATUS "Performing Test HAVE_POPPLER_058" )
-+ if( NOT POPPLER_VERSION VERSION_LESS "0.58" )
-+ set( HAVE_POPPLER_058 1 CACHE INTERNAL "" FORCE )
-+ message( STATUS "Performing Test HAVE_POPPLER_058 - Success" )
-@@ -33,2 +33,13 @@
-- set( HAVE_POPPLER_060 "" CACHE INTERNAL "" FORCE )
-- message( STATUS "Performing Test HAVE_POPPLER_060 - Failed" )
-+ set( HAVE_POPPLER_058 "" CACHE INTERNAL "" FORCE )
-+ message( STATUS "Performing Test HAVE_POPPLER_058 - Failed" )
-+ endif( )
-+endif( )
-+
-+if( NOT DEFINED HAVE_POPPLER_064 )
-+ message( STATUS "Performing Test HAVE_POPPLER_064" )
-+ if( NOT POPPLER_VERSION VERSION_LESS "0.64" )
-+ set( HAVE_POPPLER_064 1 CACHE INTERNAL "" FORCE )
-+ message( STATUS "Performing Test HAVE_POPPLER_064 - Success" )
-+ else( )
-+ set( HAVE_POPPLER_064 "" CACHE INTERNAL "" FORCE )
-+ message( STATUS "Performing Test HAVE_POPPLER_064 - Failed" )
---- config.h.cmake
-+++ config.h.cmake
-@@ -4 +4,2 @@
--#cmakedefine HAVE_POPPLER_060
-+#cmakedefine HAVE_POPPLER_064
-+#cmakedefine HAVE_POPPLER_058
---- tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
-+++ tdefile-plugins/dependencies/poppler-tqt/poppler-document.cc
-@@ -156 +156 @@
--# if defined(HAVE_POPPLER_060)
-+# if defined(HAVE_POPPLER_058)
-@@ -166 +166 @@
-- GooString *s1;
-+ CONST_064 GooString *s1;
-@@ -173 +173 @@
--# if defined(HAVE_POPPLER_060)
-+# if defined(HAVE_POPPLER_058)
-@@ -205 +205 @@
--# if !defined(HAVE_POPPLER_060)
-+# if !defined(HAVE_POPPLER_058)
-@@ -211 +211 @@
--# if !defined(HAVE_POPPLER_060)
-+# if !defined(HAVE_POPPLER_058)
-@@ -226 +226 @@
--# if defined(HAVE_POPPLER_060)
-+# if defined(HAVE_POPPLER_058)
-@@ -232 +232 @@
--# if !defined(HAVE_POPPLER_060)
-+# if !defined(HAVE_POPPLER_058)
-@@ -245 +245 @@
--# if defined(HAVE_POPPLER_060)
-+# if defined(HAVE_POPPLER_058)
-@@ -259 +259 @@
--#\tif !defined(HAVE_POPPLER_060)
-+#\tif !defined(HAVE_POPPLER_058)
-@@ -267 +267 @@
--# if !defined(HAVE_POPPLER_060)
-+# if !defined(HAVE_POPPLER_058)
-@@ -323 +323 @@
-- GooList * items = outline->getItems();
-+ CONST_064 GooList * items = outline->getItems();
-@@ -350 +350 @@
--#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030)
-+#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030)
---- tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc
-+++ tdefile-plugins/dependencies/poppler-tqt/poppler-link.cc
-@@ -33,2 +33,2 @@
--\t\tLinkDest *ld = data.ld;
--\t\t
-+\t\tCONST_064 LinkDest *ld = data.ld;
-+
---- tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc
-+++ tdefile-plugins/dependencies/poppler-tqt/poppler-page.cc
-@@ -132 +132 @@
--#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
-+#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
-@@ -167 +167 @@
--#if defined(HAVE_POPPLER_060) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
-+#if defined(HAVE_POPPLER_058) || defined(HAVE_POPPLER_030) || defined(HAVE_POPPLER_020)
-@@ -208 +208 @@
--# if defined(HAVE_POPPLER_060)
-+# if defined(HAVE_POPPLER_058)
-@@ -215 +215 @@
--# if !defined(HAVE_POPPLER_060)
-+# if !defined(HAVE_POPPLER_058)
---- tdefile-plugins/dependencies/poppler-tqt/poppler-private.cc
-+++ tdefile-plugins/dependencies/poppler-tqt/poppler-private.cc
-@@ -34 +34 @@
--TQString unicodeToTQString(Unicode* u, int len)
-+TQString unicodeToTQString(CONST_064 Unicode* u, int len)
-@@ -44 +44 @@
--TQString UnicodeParsedString(GooString *s1)
-+TQString UnicodeParsedString(CONST_064 GooString *s1)
-@@ -89 +89 @@
--void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items )
-+void DocumentData::addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, CONST_064 GooList * items )
-@@ -99 +99 @@
-- Unicode * uniChar = outlineItem->getTitle();
-+ CONST_064 Unicode * uniChar = outlineItem->getTitle();
-@@ -109 +109 @@
-- ::LinkAction * a = outlineItem->getAction();
-+ CONST_064 ::LinkAction * a = outlineItem->getAction();
-@@ -113,2 +113,2 @@
-- LinkGoTo * g = static_cast< LinkGoTo * >( a );
-- LinkDest * destination = g->getDest();
-+ CONST_064 LinkGoTo * g = static_cast< CONST_064 LinkGoTo * >( a );
-+ CONST_064 LinkDest * destination = g->getDest();
-@@ -120 +120 @@
-- GooString *s = g->getNamedDest();
-+ CONST_064 GooString *s = g->getNamedDest();
-@@ -134 +134 @@
-- LinkGoToR * g2 = static_cast< LinkGoToR * >( a );
-+ CONST_064 LinkGoToR * g2 = static_cast< CONST_064 LinkGoToR * >( a );
-@@ -141 +141 @@
-- GooList * children = outlineItem->getKids();
-+ CONST_064 GooList * children = outlineItem->getKids();
---- tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
-+++ tdefile-plugins/dependencies/poppler-tqt/poppler-private.h
-@@ -36,0 +37,5 @@
-+#if defined(HAVE_POPPLER_064)
-+#define CONST_064 const
-+#else
-+#define CONST_064
-+#endif
-@@ -42 +47 @@
--TQString unicodeToTQString(Unicode* u, int len);
-+TQString unicodeToTQString(CONST_064 Unicode* u, int len);
-@@ -44 +49 @@
--TQString UnicodeParsedString(GooString *s1);
-+TQString UnicodeParsedString(CONST_064 GooString *s1);
-@@ -50 +55 @@
-- LinkDestinationData( LinkDest *l, GooString *nd, Poppler::DocumentData *pdfdoc ) : ld(l), namedDest(nd), doc(pdfdoc)
-+ LinkDestinationData( CONST_064 LinkDest *l, GooString *nd, Poppler::DocumentData *pdfdoc ) : ld(l), namedDest(nd), doc(pdfdoc)
-@@ -53,2 +58,2 @@
--\t
-- LinkDest *ld;
-+
-+ CONST_064 LinkDest *ld;
-@@ -87 +92 @@
-- void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, GooList * items );
-+ void addTocChildren( TQDomDocument * docSyn, TQDomNode * parent, CONST_064 GooList * items );
-' | while read line
-do
-patch -N -p0
-done
-
## error: /bin/sh: squeeze: command not found
sed -i 's|COMMAND squeeze|COMMAND ./squeeze|' kdvi/CMakeLists.txt
chown_fn
-FindTQt-patch_fn
-
cd_builddir_fn
## rm -rf $TMP/tmp-$PRGNAM/$SUB_DIR$PRGNAM/build-$PRGNAM/*
@@ -3249,7 +2991,6 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=""
untar_fn
ltoolupdate_fn
@@ -3278,8 +3019,11 @@ MEINPROC=$INSTALL_TDE/bin/meinproc-x86 \
make $NUMJOBS
make DESTDIR=$PKG install
-## remove xgcc paths in package
+## remove XGCC and SYSROOT paths in package
sed -i "s|$XGCC_DIR/$HOST|/usr|g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
+sed -i "s|$SYSROOT||g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
+## tidy up some anomalies
+sed -i "s|6464|64|g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
strip_fn
@@ -3331,7 +3075,6 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=applications/
untar_fn
ltoolupdate_fn
@@ -3361,6 +3104,9 @@ make DESTDIR=$PKG install
## remove xgcc paths in package
sed -i "s|$XGCC_DIR/$HOST|/usr|g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
+sed -i "s|$SYSROOT||g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
+## tidy up some anomalies
+sed -i "s|6464|64|g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
strip_fn
@@ -3406,7 +3152,6 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=applications/
untar_fn
# rename knemo icons to avoid conflict with those in tdeartwork
@@ -3448,6 +3193,9 @@ make DESTDIR=$PKG install
## remove xgcc paths in package
sed -i "s|$XGCC_DIR/$HOST|/usr|g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
+sed -i "s|$SYSROOT||g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
+## tidy up some anomalies
+sed -i "s|6464|64|g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
strip_fn
@@ -3486,7 +3234,6 @@ OUTPUT=/tmp
mkdir -p $PKG
mkdir $TMP/tmp-$PRGNAM
-SUB_DIR=applications/
untar_fn
## set support for additional language(s) as per I18N variable
@@ -3525,6 +3272,9 @@ make DESTDIR=$PKG install
## remove xgcc paths in package
sed -i "s|$XGCC_DIR/$HOST|/usr|g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
+sed -i "s|$SYSROOT||g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
+## tidy up some anomalies
+sed -i "s|6464|64|g" $PKG$INSTALL_TDE/lib$LIBDIRSUFFIX/trinity/*.la
strip_fn