Updates ...

added man pages for development builds
 reverted installation of TDM configuration files to the TDE default
 backported markdown syntax highlighting for kate for 14.0.12
master
Ray-V 2 years ago
parent 38f0d9fe0c
commit 7c50fed114

@ -121,6 +121,10 @@ sed -i 's|KFORMULA$COMPILE_FILTER_KUGAR|&$COMPILE_FILTER_KRITA$COMPILE_FILTER_KI
[[ $(cat $TMPVARS/DO_NOT_COMPILE) == *kross* ]] && SCRIPTING=--disable-scripting [[ $(cat $TMPVARS/DO_NOT_COMPILE) == *kross* ]] && SCRIPTING=--disable-scripting
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && \
MANDIR=--mandir=$INSTALL_TDE/man
listdocs_fn listdocs_fn
ltoolupdate_fn ltoolupdate_fn
@ -136,6 +140,7 @@ CC=$COMPILER \
CXX=$COMPILER_CXX \ CXX=$COMPILER_CXX \
../configure \ ../configure \
--prefix=$INSTALL_TDE \ --prefix=$INSTALL_TDE \
${MANDIR:-} \
--disable-rpath \ --disable-rpath \
${SCRIPTING:-} \ ${SCRIPTING:-} \
--enable-closure --enable-closure
@ -144,6 +149,8 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn

@ -122,24 +122,8 @@ Any other option will have to be edited into BUILD-TDE.sh
2> $TMPVARS/INSTALL_TDE 2> $TMPVARS/INSTALL_TDE
rm -f $TMPVARS/SYS_CNF_DIR rm -f $TMPVARS/TDE_CNF_DIR
dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE System Configuration " --menu \ echo "$(cat $TMPVARS/INSTALL_TDE)/share/config" > $TMPVARS/TDE_CNF_DIR
"
Select the directory that the TDE System Configuration files
should be installed in.
Selecting '/etc/tde' will also:
* set TDEHOME=~/.tde and TDEROOTHOME=/root/.tde
\Z0\Zbotherwise defaults to
TDEHOME=~/.trinity and TDEROOTHOME=/root/.trinity\Zn
* install plugins in $(cat $TMPVARS/INSTALL_TDE)/lib$LIBDIRSUFFIX/tde
\Z0\Zbotherwise defaults to $(cat $TMPVARS/INSTALL_TDE)/lib$LIBDIRSUFFIX/trinity\Zn
" \
20 75 2 \
"/etc/tde" "" \
"/etc/trinity" "" \
2> $TMPVARS/SYS_CNF_DIR
rm -f $TMPVARS/COMPILER rm -f $TMPVARS/COMPILER
@ -664,6 +648,9 @@ about_k="Image creation and editing"
status_k=off status_k=off
comment_k="\Zb\Z6 Needs filters and servicetypes \Zn" comment_k="\Zb\Z6 Needs filters and servicetypes \Zn"
} }
#
[[ $(cat $TMPVARS/TDEVERSION) != 14.0.12 ]] && MAN_PAGES=' including man pages'
DOCS="Application handbooks${MAN_PAGES:-}"
# #
### for the record, --separate-output generates output without quotes ### for the record, --separate-output generates output without quotes
dialog --cr-wrap --nocancel --separate-output --no-shadow --colors --title " KOffice applications " --item-help --checklist \ dialog --cr-wrap --nocancel --separate-output --no-shadow --colors --title " KOffice applications " --item-help --checklist \
@ -675,7 +662,7 @@ Filters and servicetypes are required for most apps.
" ALL" "Build all applications" off "\Zb\Z6 Overrides any off/on selections below \Zn" \ " ALL" "Build all applications" off "\Zb\Z6 Overrides any off/on selections below \Zn" \
" autocorrect" "Autocorrection for US English" off "\Zb\Z6 \Zn" \ " autocorrect" "Autocorrection for US English" off "\Zb\Z6 \Zn" \
${app_c:-} ${about_c:-} ${status_c:-} ${comment_c:-} \ ${app_c:-} ${about_c:-} ${status_c:-} ${comment_c:-} \
" doc" "Application handbooks" off "\Zb\Z6 \Zn" \ " doc" "$DOCS" off "\Zb\Z6 \Zn" \
" example" "KOffice Example Application" off "\Zb\Z6 \Zn" \ " example" "KOffice Example Application" off "\Zb\Z6 \Zn" \
" filters" "Import/export filters" on "\Zb\Z6 \Zn" \ " filters" "Import/export filters" on "\Zb\Z6 \Zn" \
" karbon" "A scalable graphics editor" off "\Zb\Z6 Needs filters and servicetypes \Zn" \ " karbon" "A scalable graphics editor" off "\Zb\Z6 Needs filters and servicetypes \Zn" \
@ -891,7 +878,7 @@ Confirm or change these build options ..
export TDEVERSION=$(cat $TMPVARS/TDEVERSION) export TDEVERSION=$(cat $TMPVARS/TDEVERSION)
export INSTALL_TDE=$(cat $TMPVARS/INSTALL_TDE) export INSTALL_TDE=$(cat $TMPVARS/INSTALL_TDE)
export SYS_CNF_DIR=$(cat $TMPVARS/SYS_CNF_DIR) export TDE_CNF_DIR=$(cat $TMPVARS/TDE_CNF_DIR)
export COMPILER=$(cat $TMPVARS/COMPILER) export COMPILER=$(cat $TMPVARS/COMPILER)
[[ $COMPILER == gcc ]] && export COMPILER_CXX="g++" || export COMPILER_CXX="clang++" [[ $COMPILER == gcc ]] && export COMPILER_CXX="g++" || export COMPILER_CXX="clang++"
export SET_march=$(cat $TMPVARS/SET_MARCH) export SET_march=$(cat $TMPVARS/SET_MARCH)
@ -925,8 +912,8 @@ export ARM_FABI=$(readelf -Ah $(which bash)|grep -oE "soft|hard")
## override hard coded trinity plugins directory - used for: ## override hard coded trinity plugins directory - used for:
## autotools: get-source.sh|ltoolupdate_fn ## autotools: get-source.sh|ltoolupdate_fn
## cmake: -DPLUGIN_INSTALL_DIR= ## cmake: -DPLUGIN_INSTALL_DIR=
export PLUGIN_INSTALL_DIR=$(cat $TMPVARS/SYS_CNF_DIR | cut -d/ -f3) 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: ### set up variables for the summary list:
## New build ## New build
[[ $(cat $TMPVARS/build-new) != no ]] && NEW_BUILD=yes || NEW_BUILD='no - re-using existing' [[ $(cat $TMPVARS/build-new) != no ]] && NEW_BUILD=yes || NEW_BUILD='no - re-using existing'
@ -990,7 +977,7 @@ TDE version \Zb\Z6$TDEVERSION\Zn
Clone/update cgit local repositories \Zb\Z6${CLONE:-\Z0\Zbn/a}\Zn Clone/update cgit local repositories \Zb\Z6${CLONE:-\Z0\Zbn/a}\Zn
Only download sources \Zb\Z6${PRE_DOWNLOAD:-\Z0\Zbn/a}\Zn Only download sources \Zb\Z6${PRE_DOWNLOAD:-\Z0\Zbn/a}\Zn
TDE installation directory \Zb\Z6$INSTALL_TDE\Zn TDE installation directory \Zb\Z6$INSTALL_TDE\Zn
TDE system configuration directory \Zb\Z6$SYS_CNF_DIR\Zn TDE system configuration directory \Zb\Z6$TDE_CNF_DIR\Zn
Compiler \Zb\Z6$COMPILER\Zn Compiler \Zb\Z6$COMPILER\Zn
gcc cpu optimization \Zb\Z6$SET_march\Zn gcc cpu optimization \Zb\Z6$SET_march\Zn
Number of parallel jobs \Zb\Z6$(echo $NUMJOBS|sed 's|-j||')\Zn Number of parallel jobs \Zb\Z6$(echo $NUMJOBS|sed 's|-j||')\Zn

@ -88,3 +88,43 @@
+ +
+msgid "&Enable user color profile support" +msgid "&Enable user color profile support"
+msgstr "Enable &user colour profile support" +msgstr "Enable &user colour profile support"
--- tde-i18n-en_GB/messages/tdebase/kcmlayout.po
+++ tde-i18n-en_GB/messages/tdebase/kcmlayout.po
@@ -1239,3 +1239,3 @@
msgid "Use &theme colors"
-msgstr ""
+msgstr "Use &theme colours"
@@ -1244,3 +1244,3 @@
msgid "Use c&ustom colors"
-msgstr ""
+msgstr "Use c&ustom colours"
@@ -1249,3 +1249,3 @@
msgid "Background color:"
-msgstr ""
+msgstr "Background colour:"
@@ -1256,4 +1256,4 @@
"was set to display a flag."
-msgstr ""
-
+msgstr "This colour will be used as the indicator's background unless the indicator "
+"was set to display a flag."
#: kcmlayoutwidget.ui:617
@@ -1261,3 +1261,3 @@
msgid "Text color:"
-msgstr ""
+msgstr "Text colour:"
@@ -1266,3 +1266,3 @@
msgid "This color will be used to draw the language label on the indicator."
-msgstr ""
+msgstr "This colour will be used to draw the language label on the indicator."
@@ -1307,3 +1307,3 @@
msgid "The drop shadow behind the language label will be of this color."
-msgstr ""
+msgstr "The drop shadow behind the language label will be of this colour."

@ -60,6 +60,13 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
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:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -67,9 +74,9 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_SDL="ON" \ -DWITH_SDL="ON" \
-DWITH_BERKELEY_DB="ON" \ -DWITH_BERKELEY_DB="ON" \
@ -95,6 +102,8 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn

@ -95,9 +95,10 @@ echo $'
+X-TDE-BrowserView-Built-Into=konqueror +X-TDE-BrowserView-Built-Into=konqueror
' | patch -N -p0 || true ' | patch -N -p0 || true
## allow for configuration files directory == /etc/tde ## allow for configuration files directory == *tde*
## and plugins in $INSTALL_TDE/lib$LIBDIRSUFFIX/tde ## and plugins in $INSTALL_TDE/lib$LIBDIRSUFFIX/tde
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|g" tdm/config.def || true 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|" tdm/kfrontend/gentdmconf.c || true
sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" kcontrol/hwmanager/devicepropsdlg.cpp || 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 sed -i "s|trinity|$PLUGIN_INSTALL_DIR|" tdeioslave/trash/testtrash.cpp || true
@ -132,8 +133,30 @@ chown_fn
cd_builddir_fn cd_builddir_fn
[[ $TDEVERSION != 14.0.12 ]] && {
## Add man pages for development builds ## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && MAN_PAGES=-DMAN_INSTALL_DIR=$INSTALL_TDE/man MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
sed -i "s|/etc/trinity|$INSTALL_TDE/share/config|" ../doc/man/{gentdmconf,tdm}.1
[[ $TDE_CNF_DIR == *tde* ]] && \
sed -i 's|trinity,kde,kde2,kde1|tde|' ../doc/man/*.1 && \
sed -i 's|trinity|tde|g' ../doc/man/*.1 || \
sed -i 's|trinity,kde,kde2,kde1|trinity|' ../doc/man/*.1
sed -i "s|http://bugs.*desktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*.1
## kfrontend/CMakeLists.txt runs gentdmconf to set up the tdm configuration files
## - after that, add the TDM configuration README
echo '
if( BUILD_TDM )
install(
FILES ../README
RENAME README-config
DESTINATION ${CONFIG_INSTALL_DIR}/tdm
)
endif( )
' >> ../tdm/kfrontend/CMakeLists.txt
#
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:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
@ -142,10 +165,9 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MAN_PAGES:-} \ ${MANDIR:-} \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_ELFICON="OFF" \ -DWITH_ELFICON="OFF" \
-DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \
@ -290,11 +312,11 @@ echo '#!'"/bin/sh
export TDEDIR=$INSTALL_TDE export TDEDIR=$INSTALL_TDE
# upgradepkg runs installpkg twice, so test for the second run: # upgradepkg runs installpkg twice, so test for the second run:
[[ \"\$XDG_CONFIG_DIRS\" != *$SYS_CNF_DIR/xdg* ]] && { [[ \"\$XDG_CONFIG_DIRS\" != *$INSTALL_TDE/etc/xdg* ]] && {
if [ ! \"\$XDG_CONFIG_DIRS\" = \"\" ]; then if [ ! \"\$XDG_CONFIG_DIRS\" = \"\" ]; then
export XDG_CONFIG_DIRS=\$XDG_CONFIG_DIRS:$SYS_CNF_DIR/xdg export XDG_CONFIG_DIRS=\$XDG_CONFIG_DIRS:$INSTALL_TDE/etc/xdg
else else
export XDG_CONFIG_DIRS=/etc/xdg:$SYS_CNF_DIR/xdg export XDG_CONFIG_DIRS=/etc/xdg:$INSTALL_TDE/etc/xdg
fi fi
} }
@ -314,9 +336,9 @@ if ( ! \$?TDEDIR ) then
endif endif
if ( \$?XDG_CONFIG_DIRS ) then if ( \$?XDG_CONFIG_DIRS ) then
setenv XDG_CONFIG_DIRS \$XDG_CONFIG_DIRS:$SYS_CNF_DIR/xdg setenv XDG_CONFIG_DIRS \$XDG_CONFIG_DIRS:$INSTALL_TDE/etc/xdg
else else
setenv XDG_CONFIG_DIRS /etc/xdg:$SYS_CNF_DIR/xdg setenv XDG_CONFIG_DIRS /etc/xdg:$INSTALL_TDE/etc/xdg
endif endif
setenv XDG_DATA_DIRS /usr/local/share:/usr/share:$INSTALL_TDE/share setenv XDG_DATA_DIRS /usr/local/share:/usr/share:$INSTALL_TDE/share
@ -333,24 +355,13 @@ fi
################################# TDM stuff ################################# ################################# TDM stuff #################################
# Add some configuration files / scripts needed by TDE.
mkdir -p $PKG$SYS_CNF_DIR
mv $PKG$INSTALL_TDE/share/config/tdm $PKG$SYS_CNF_DIR/tdm
( cd $PKG$INSTALL_TDE/share/config ; ln -sf $SYS_CNF_DIR/tdm tdm )
# Setup config files for TDM:
$PKG$INSTALL_TDE/bin/gentdmconf --no-old --no-old-scripts --no-backup --in $PKG$SYS_CNF_DIR/tdm
## set correct paths for config files
sed -i "s|$INSTALL_TDE/share/config/tdm/|$SYS_CNF_DIR/tdm/|" $PKG$SYS_CNF_DIR/tdm/tdmrc
# Allow root to login # Allow root to login
sed 's|AllowRootLogin=false|AllowRootLogin=true|' $PKG$SYS_CNF_DIR/tdm/tdmrc > $PKG$SYS_CNF_DIR/tdm/tdmrc.new sed 's|AllowRootLogin=false|AllowRootLogin=true|' $PKG$INSTALL_TDE/share/config/tdm/tdmrc > $PKG$INSTALL_TDE/share/config/tdm/tdmrc.new
## Remove tdmrc which has AllowRootLogin=false set and would be used for a new installation ## Remove tdmrc which has AllowRootLogin=false set and would be used for a new installation
## The installed tdmrc will be created by doinst.sh from tdmrc.new if it doesn't exist ## If it doesn't exist, tdmrc will be created by doinst.sh from tdmrc.new
rm $PKG$SYS_CNF_DIR/tdm/tdmrc rm $PKG$INSTALL_TDE/share/config/tdm/tdmrc
mv $PKG$SYS_CNF_DIR/tdm/Xsession $PKG$SYS_CNF_DIR/tdm/Xsession.orig mv $PKG$INSTALL_TDE/share/config/tdm/Xsession $PKG$INSTALL_TDE/share/config/tdm/Xsession.orig
# #
## new Xsession: ## new Xsession:
echo '#!'' /bin/sh echo '#!'' /bin/sh
@ -364,8 +375,8 @@ session=$1
# This section is borrowed from the old X11 Xsession file: # This section is borrowed from the old X11 Xsession file:
userresources=$HOME/.Xresources userresources=$HOME/.Xresources
usermodmap=$HOME/.Xmodmap usermodmap=$HOME/.Xmodmap
sysresources=/usr/lib/X11/xinit/.Xresources sysresources=/etc/X11/xinit/.Xresources
sysmodmap=/usr/lib/X11/xinit/.Xmodmap sysmodmap=/etc/X11/xinit/.Xmodmap
# merge in defaults and keymaps # merge in defaults and keymaps
if [ -r $sysresources ]; then if [ -r $sysresources ]; then
/usr/bin/xrdb -merge $sysresources /usr/bin/xrdb -merge $sysresources
@ -440,7 +451,7 @@ case $session in
;; ;;
esac esac
exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop." exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
' > $PKG$SYS_CNF_DIR/tdm/Xsession ' > $PKG$INSTALL_TDE/share/config/tdm/Xsession
# Add rc.4.local to give TDM priority over rc.4 X11 session manager options # Add rc.4.local to give TDM priority over rc.4 X11 session manager options
# Assumes that rc.4.new from sysvinit-scripts still has the rc.4.local option # Assumes that rc.4.new from sysvinit-scripts still has the rc.4.local option
@ -457,9 +468,7 @@ fi
" > $PKG/etc/rc.d/rc.4.local.tdm " > $PKG/etc/rc.d/rc.4.local.tdm
chmod 755 $PKG/etc/rc.d/rc.4.local.tdm chmod 755 $PKG/etc/rc.d/rc.4.local.tdm
mv $PKG$SYS_CNF_DIR/tdm/backgroundrc $PKG$SYS_CNF_DIR/tdm/backgroundrc.new mv $PKG$INSTALL_TDE/share/config/tdm/backgroundrc $PKG$INSTALL_TDE/share/config/tdm/backgroundrc.new
[[ -r $PKG$SYS_CNF_DIR/tdm/README ]] && \
sed -i "s|$TMP_BUILD/package-tdebase$SYS_CNF_DIR/tdm|$SYS_CNF_DIR/tdm|" $PKG$SYS_CNF_DIR/tdm/README
############################################################################## ##############################################################################
@ -467,20 +476,7 @@ mkdir_install_fn
############################################################################## ##############################################################################
## create doinst.sh: ## create doinst.sh:
echo '# Save old config files: echo '# Save old config files:
if [ ! -L etc/X11/tdm ]; then
if [ -d etc/X11/tdm ]; then
mkdir -p .'"$SYS_CNF_DIR"'/tdm
cp -a etc/X11/tdm/* .'"$SYS_CNF_DIR"'/tdm
rm -rf etc/X11/tdm
( cd etc/X11 ; ln -sf ../..'"$SYS_CNF_DIR"'/tdm tdm )
elif [ ! -e etc/X11/tdm ]; then
mkdir -p etc/X11
( cd etc/X11 ; ln -sf ../..'"$SYS_CNF_DIR"'/tdm tdm )
fi
fi
config() { config() {
NEW="$1" NEW="$1"
OLD="$(dirname $NEW)/$(basename $NEW .new)" OLD="$(dirname $NEW)/$(basename $NEW .new)"
@ -492,8 +488,8 @@ config() {
fi fi
# Otherwise, we leave the .new copy for the admin to consider... # Otherwise, we leave the .new copy for the admin to consider...
} }
config .'"$SYS_CNF_DIR"'/tdm/tdmrc.new config .'"$INSTALL_TDE"'/share/config/tdm/tdmrc.new
config .'"$SYS_CNF_DIR"'/tdm/backgroundrc.new config .'"$INSTALL_TDE"'/share/config/tdm/backgroundrc.new
# update PATH # update PATH
# upgradepkg runs installpkg twice, so even though '"$TQTDIR"'/bin might be # upgradepkg runs installpkg twice, so even though '"$TQTDIR"'/bin might be
@ -521,7 +517,7 @@ sed -i '\''s|source /etc/profile.d/mc.sh|#source /etc/profile.d/mc.sh|'\'' $HOME
' > $PKG/install/doinst.sh ' > $PKG/install/doinst.sh
## set TDEHOME and TDEROOTHOME variables - defaults ~/.trinity and /root/.trinity ## set TDEHOME and TDEROOTHOME variables - defaults ~/.trinity and /root/.trinity
[[ $SYS_CNF_DIR == /etc/tde ]] && { [[ $TDE_CNF_DIR == *tde* ]] && {
echo "# upgradepkg runs installpkg twice, so firstly remove any previous TDE*HOME entries echo "# upgradepkg runs installpkg twice, so firstly remove any previous TDE*HOME entries
sed -i '/TDE.*HOME/d' /etc/profile sed -i '/TDE.*HOME/d' /etc/profile
echo 'export TDEHOME=~/.tde' >> /etc/profile echo 'export TDEHOME=~/.tde' >> /etc/profile

@ -48,6 +48,7 @@ echo $'
+</includes> +</includes>
' | patch -N -p0 || true ' | patch -N -p0 || true
[[ $TDEVERSION == 14.0.12 ]] && {
## for poppler-22.03+ ## for poppler-22.03+
patch -N -p0 << EOF || true patch -N -p0 << EOF || true
--- config.h.cmake --- config.h.cmake
@ -88,6 +89,7 @@ patch -N -p0 << EOF || true
DocumentData(GooString *filePath, GooString *password) : doc(filePath,password), m_fontInfoScanner(0), m_outputDev(0) {} DocumentData(GooString *filePath, GooString *password) : doc(filePath,password), m_fontInfoScanner(0), m_outputDev(0) {}
+# endif +# endif
EOF EOF
}
listdocs_fn listdocs_fn
@ -95,8 +97,15 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1
}
# If imlib is installed, include Kuickshow: # If imlib is installed, include Kuickshow:
pkg-config imlib && KUICKSHOW=ON pkg-config imlib && KUICKSHOW=ON
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \
@ -106,6 +115,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \
-DWITH_T1LIB="OFF" \ -DWITH_T1LIB="OFF" \
-DWITH_PAPER="OFF" \ -DWITH_PAPER="OFF" \
-DWITH_TIFF="ON" \ -DWITH_TIFF="ON" \
@ -117,8 +127,8 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DBUILD_KPDF="ON" \ -DBUILD_KPDF="ON" \
-DBUILD_KAMERA="OFF" \ -DBUILD_KAMERA="OFF" \
-DBUILD_KSVG="ON" \ -DBUILD_KSVG="ON" \
-DBUILD_LIBKSCAN="OFF" \ -DBUILD_LIBKSCAN="ON" \
-DBUILD_KOOKA="OFF" \ -DBUILD_KOOKA="ON" \
-DBUILD_KCOLOREDIT="ON" \ -DBUILD_KCOLOREDIT="ON" \
-DBUILD_KDVI="ON" \ -DBUILD_KDVI="ON" \
-DBUILD_KFAX="ON" \ -DBUILD_KFAX="ON" \
@ -140,6 +150,8 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn

@ -4,3 +4,8 @@ Some formatting for help pages has been changed by a patch in the SlackBuild - i
* border and colour for keyboard key highlighting * border and colour for keyboard key highlighting
* lightened menu items highlighting * lightened menu items highlighting
---
Markdown syntax highlighting for kate has been backported for 14.0.12, with some personal preferences.
The original file is @ https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs/raw/branch/master/kate/data/markdown.xml

@ -0,0 +1,182 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Kate syntax highlight filter for Markdown/MultiMarkdown documents.
Copyright 2008 Darrin Yeager. http://www.dyeager.org/
Dual-Licensed under both GPL and BSD licenses.
Extended 2009 Claes Holmerson. http://github.com/claes/kate-markdown/
-->
<!-- the [^\s]{1} is in the regex to avoid interfering with bullet list which
starts "* item". Thus emphasis/strong MUST be formed like *words here*
with the asterisks next to the beginning of the first word.
Match space or newline, followed by "*", followed by one non-space,
followed by anything non-asterisk, followed by "*", followed by
space, end-of-sentence punctuation, or the end of the line.
-->
<!DOCTYPE language SYSTEM "language.dtd"
[
<!ENTITY strongemphasisregex "(\s|^)[\*_]{3}[^\*_]+[\*_]{3}(\s|\.|,|;|:|\-|\?|$)">
<!ENTITY strongregex "(\s|^)[\*_]{2}[^\s]{1}[^\*_]+[\*_]{2}(\s|\.|,|;|:|\-|\?|$)">
<!ENTITY emphasisregex "(\s|^)[\*_]{1}[^\s]{1}[^\*_]+[\*_]{1}(\s|\.|,|;|:|\-|\?|$)">
<!ENTITY reflinkregex '\[[^\]\^]+\]\s*\[[^\]]*\]\s*(\s+\"[^\"]*\"){0,1}'>
<!ENTITY reflinktargetregex '\[[^\]\^]+\]\:\s+[^\s]+(\s+\"[^\"]*\"){0,1}'>
<!ENTITY footnoteregex "\[\^[^\]]+\]">
<!ENTITY idlinkregex '\[[^\]\^]+\]\s*\(#[^\(]*\)'>
<!ENTITY inlinelinkregex '\[[^\]\^]+\]\s*\([^\(]*\)'>
<!ENTITY inlineimageregex '\!\[[^\]\^]+\]\([^\(]*\)'>
<!ENTITY refimageregex '\!\[[^\]\^]+\]\[[^\[]*\]'>
<!ENTITY autolinkregex '&lt;(https?|ftp):[^\"&gt;\s]+&gt;'>
<!ENTITY mailtolinkregex '&lt;(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)&gt;'>
<!ENTITY rulerregex '^\s*([\*\-_]\s?){3,}\s*$'>
<!-- two spaces at end of line generates linebreak -->
<!ENTITY linebreakregex " $">
<!ENTITY strikeoutregex "~~[^~].*~~">
<!ENTITY difflineremoveregex "^-[^-].*$">
<!ENTITY difflineaddregex "^\+[^\+].*$">
<!ENTITY diffheader1regex "^-{3} .*$">
<!ENTITY diffheader2regex "^\+{3} .*$|^@@.*$">
<!ENTITY diffheaderdiffregex "^diff .*$">
]>
<language name="Markdown" version="1.3" section="Markup"
extensions="*.md;*.mmd;*.mdwn"
author="Darrin Yeager, Claes Holmerson"
license="GPL,BSD" >
<highlighting>
<contexts>
<context attribute="Normal Text" lineEndContext="#stay" name="Normal Text" >
<DetectChar context="blockquote" char="&gt;" column="0"/>
<RegExpr attribute="h1" String="^#\s.*[#]?$" />
<RegExpr attribute="h2" String="^##\s.*[#]?$" />
<RegExpr attribute="h3" String="^###\s.*[#]?$" />
<RegExpr attribute="h4" String="^####\s.*[#]?$" />
<RegExpr attribute="h5" String="^#####\s.*[#]?$" />
<RegExpr attribute="strongemphasis" String="&strongemphasisregex;" />
<RegExpr attribute="strong" String="&strongregex;" />
<RegExpr attribute="emphasis" String="&emphasisregex;" />
<RegExpr attribute="ruler" String="&rulerregex;" />
<RegExpr context="bullet" String="^[,\t, {4}]*[\*\+\-]\s" />
<RegExpr context="numlist" String="^[,\t, {4}]*[\d]+\.\s" />
<RegExpr attribute="code" String="^([\s]{4,}|\t+).*$" />
<RegExpr attribute="meta" String="^(Title|Author|Date|Copyright|Revision|CSS|LaTeX\ XSLT|Categories|Tags|BaseName|Excerpt):(.*)+$" />
<IncludeRules context="inc" />
</context>
<context attribute="blockquote" lineEndContext="#pop" name="blockquote">
<RegExpr attribute="bq-strong" String="&strongregex;" />
<RegExpr attribute="bq-emphasis" String="&emphasisregex;" />
<RegExpr attribute="bq-strongemphasis" String="&strongemphasisregex;" />
<IncludeRules context="inc" />
</context>
<context attribute="bullet" lineEndContext="#pop" name="bullet" >
<RegExpr attribute="bl-strong" String="&strongregex;" />
<RegExpr attribute="bl-emphasis" String="&emphasisregex;" />
<RegExpr attribute="bl-strongemphasis" String="&strongemphasisregex;" />
<IncludeRules context="inc" />
</context>
<context attribute="numlist" lineEndContext="#pop" name="numlist" >
<RegExpr attribute="nl-strong" String="&strongregex;" />
<RegExpr attribute="nl-emphasis" String="&emphasisregex;" />
<RegExpr attribute="nl-strongemphasis" String="&strongemphasisregex;" />
<IncludeRules context="inc" />
</context>
<context attribute="comment" lineEndContext="#stay" name="comment" >
<RegExpr String="--&gt;" attribute="comment" context="#pop" endRegion="comment"/>
</context>
<context attribute="pre" lineEndContext="#stay" name="pre" >
<RegExpr String="```$" attribute="pre" context="#pop" endRegion="pre"/>
</context>
<context attribute="prediff" lineEndContext="#stay" name="prediff" >
<RegExpr String="```$" attribute="prediff" context="#pop" endRegion="prediff"/>
<RegExpr attribute="difflineremove" String="&difflineremoveregex;" />
<RegExpr attribute="difflineadd" String="&difflineaddregex;" />
<RegExpr attribute="diffheader1" String="&diffheader1regex;" />
<RegExpr attribute="diffheader2" String="&diffheader2regex;" />
<RegExpr attribute="diffheaderdiff" String="&diffheaderdiffregex;" />
</context>
<context attribute="common" name="inc" lineEndContext="#stay" >
<RegExpr context="comment" String="&lt;!--" beginRegion="comment" />
<RegExpr context="prediff" String="```\s{0,}diff" beginRegion="prediff" />
<RegExpr context="pre" String="```.*" beginRegion="pre" />
<RegExpr attribute="code" String="`[^`].*[^\\]`" />
<RegExpr attribute="reflink" String="&reflinkregex;" />
<RegExpr attribute="footnote" String="&footnoteregex;" />
<RegExpr attribute="idlink" String="&idlinkregex;"/>
<RegExpr attribute="inlinelink" String="&inlinelinkregex;"/>
<RegExpr attribute="reflinktarget" String="&reflinktargetregex;"/>
<RegExpr attribute="inlineimage" String="&inlineimageregex;"/>
<RegExpr attribute="refimage" String="&refimageregex;"/>
<RegExpr attribute="autolink" String="&autolinkregex;"/>
<RegExpr attribute="mailtolink" String="&mailtolinkregex;"/>
<RegExpr attribute="strikeout" minimal="true" String="&strikeoutregex;"/>
<RegExpr attribute="linebreak" minimal="true" String="&linebreakregex;"/>
</context>
</contexts>
<itemDatas>
<itemData name="Normal Text" defStyleNum="dsNormal" />
<itemData name="common" defStyleNum="dsNormal" />
<itemData name="emphasis" defStyleNum="dsNormal" italic="true" />
<itemData name="strong" defStyleNum="dsNormal" bold="true" />
<itemData name="diffheader1" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" bold="true" />
<itemData name="diffheader2" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#800000" />
<itemData name="diffheaderdiff" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="#000000" bold="true" />
<itemData name="difflineremove" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="red" />
<itemData name="difflineadd" defStyleNum="dsNormal" backgroundColor="#eeeeee" color="blue" />
<itemData name="strongemphasis" defStyleNum="dsNormal" italic="true" bold="true"/>
<itemData name="ruler" defStyleNum="dsNormal" color="#e200e2" bold="true" />
<itemData name="strikeout" defStyleNum="dsNormal" strikeOut="true" backgroundColor="#fafaaf" />
<itemData name="linebreak" defStyleNum="dsNormal" backgroundColor="#F8E0FF" />
<itemData name="h1" defStyleNum="dsFunction" bold="true" />
<itemData name="h2" defStyleNum="dsFunction" bold="true" />
<itemData name="h3" defStyleNum="dsFunction" bold="true" />
<itemData name="h4" defStyleNum="dsFunction" bold="true" />
<itemData name="h5" defStyleNum="dsFunction" bold="true" />
<itemData name="blockquote" defStyleNum="dsNormal" color="black" />
<itemData name="bq-emphasis" defStyleNum="dsNormal" color="black" italic="true" />
<itemData name="bq-strong" defStyleNum="dsNormal" color="black" bold="true" />
<itemData name="bq-strongemphasis" defStyleNum="dsNormal" color="black" italic="true" bold="true" />
<itemData name="bullet" defStyleNum="dsNormal" color="#b700b7" />
<itemData name="bl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" />
<itemData name="bl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" />
<itemData name="bl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" />
<itemData name="numlist" defStyleNum="dsNormal" color="#b700b7" />
<itemData name="nl-emphasis" defStyleNum="dsNormal" color="#b700b7" italic="true" />
<itemData name="nl-strong" defStyleNum="dsNormal" color="#b700b7" bold="true" />
<itemData name="nl-strongemphasis" defStyleNum="dsNormal" color="#b700b7" bold="true" italic="true" />
<itemData name="comment" defStyleNum="dsComment" />
<itemData name="pre" defStyleNum="dsNormal" backgroundColor="#eeeeee" />
<itemData name="prediff" defStyleNum="dsNormal" backgroundColor="#eeeeee" />
<itemData name="code" defStyleNum="dsNormal" color="darkcyan" backgroundColor="#eeeeee" />
<itemData name="reflink" defStyleNum="dsOthers" color="blue" />
<itemData name="idlink" defStyleNum="dsOthers" color="blue" italic="true" />
<itemData name="inlinelink" defStyleNum="dsOthers" color="blue" />
<itemData name="autolink" defStyleNum="dsOthers" underline="true" />
<itemData name="mailtolink" defStyleNum="dsOthers" underline="true" />
<itemData name="footnote" defStyleNum="dsOthers" italic="true" />
<itemData name="meta" defStyleNum="dsComment" />
<itemData name="reflinktarget" defStyleNum="dsOthers" />
<itemData name="inlineimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" />
<itemData name="refimage" defStyleNum="dsNormal" backgroundColor="#fff8f8" color="blue" />
</itemDatas>
</highlighting>
<general>
<comments>
<comment name="multiLine" start="&lt;!--" end="--&gt;" region="comment" />
</comments>
</general>
</language>

@ -48,7 +48,7 @@ echo $'--- tdecmshell/main.cpp
+ kdError(780) << "Could not find \'" << path << "\'." << endl; + kdError(780) << "Could not find \'" << path << "\'." << endl;
' | patch -N -p0 || true ' | patch -N -p0 || true
## allow for configuration files directory == /etc/tde ## allow for configuration files directory == *tde*
## and plugins in $INSTALL_TDE/lib$LIBDIRSUFFIX/tde ## and plugins in $INSTALL_TDE/lib$LIBDIRSUFFIX/tde
for file in \ for file in \
tdecore/kstandarddirs.cpp \ tdecore/kstandarddirs.cpp \
@ -115,6 +115,7 @@ patch -N -p0 << EOF || true
+ text-align: left; + text-align: left;
EOF EOF
[[ $TDEVERSION == 14.0.12 ]] && {
## for jasper-3.0.0+ ## for jasper-3.0.0+
patch -N -p0 << EOF || true patch -N -p0 << EOF || true
--- kimgio/jp2.cpp --- kimgio/jp2.cpp
@ -138,6 +139,13 @@ patch -N -p0 << EOF || true
jas_stream_close( stream ); jas_stream_close( stream );
EOF EOF
## Backport for markdown syntax highlighting in kate
sed -i 's|mandoc.xml|& markdown.xml|' kate/data/CMakeLists.txt
sed -i 's|mandoc.xml.*$|&\n<Definition name="Markdown" url="http://git.trinitydesktop.org/cgit/tdelibs/plain/kate/data/markdown.xml" version="1.3"/>|' kate/data/update-files.xml
}
## and add modified markdown.xml for all TDE versions
cp $SB_SRCDIR/markdown.xml kate/data/
listdocs_fn listdocs_fn
chown_fn chown_fn
@ -162,7 +170,7 @@ sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLi
WITH_PCSC WITH_PCSC
WITH_PKCS WITH_PKCS
WITH_UDEVIL WITH_UDEVIL
are 14.1.0 options and will be ignored by 14.0.n builds are 14.1.0 options and will be ignored by 14.0.? builds
comment comment
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
@ -172,7 +180,6 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
-DDEFAULT_SPELL_CHECKER=${DEF_SP_CHKR:-"ASPELL"} \ -DDEFAULT_SPELL_CHECKER=${DEF_SP_CHKR:-"ASPELL"} \

@ -39,6 +39,10 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## man pages bug reporting URLs
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:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \
-DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \

@ -53,6 +53,12 @@ chown_fn
cd_builddir_fn cd_builddir_fn
## Add man pages for development builds
[[ $TDEVERSION != 14.0.12 ]] && {
MANDIR=-DMAN_INSTALL_DIR=$INSTALL_TDE/man
sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/*/*.1
}
## TDEFileReplace has been moved from tdewebdev for R14.1.0 ## TDEFileReplace has been moved from tdewebdev for R14.1.0
[[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON" [[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON"
cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
@ -64,6 +70,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \
-DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
-DLIB_SUFFIX=$LIBDIRSUFFIX \ -DLIB_SUFFIX=$LIBDIRSUFFIX \
-DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \
${MANDIR:-} \
-DWITH_DPMS="ON" \ -DWITH_DPMS="ON" \
-DWITH_XSCREENSAVER="OFF" \ -DWITH_XSCREENSAVER="OFF" \
-DWITH_SENSORS="ON" \ -DWITH_SENSORS="ON" \
@ -104,6 +111,8 @@ make_fn
installdocs_fn installdocs_fn
[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn
strip_fn strip_fn
mkdir_install_fn mkdir_install_fn

@ -33,7 +33,7 @@ getsource_fn
untar_fn untar_fn
## override hard coded trinity references - PLUGIN_INSTALL_DIR is derived from SYS_CNF_DIR, ## override hard coded trinity references - PLUGIN_INSTALL_DIR is derived from TDE_CNF_DIR,
## and is relative to the TDE libraries directory ## and is relative to the TDE libraries directory
sed -i "s|FileName=trinity|FileName=$PLUGIN_INSTALL_DIR|" quanta/data/config/plugins.rc 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|/opt/trinity|$INSTALL_TDE|" */*.tdevelop

@ -1,15 +1,16 @@
[<img src="https://ray-v.github.io/TDE-aarch64-gui.png">](https://ray-v.github.io/TDE-aarch64-gui.png) [<img src="https://ray-v.github.io/TDE-aarch64-gui.png">](https://ray-v.github.io/TDE-aarch64-gui.png "TDE desktop")
... a TDE desktop, cross compiled for aarch64, running on a RPi3. ... a TDE desktop, cross compiled for aarch64, running on a RPi3.
--- ---
***Build TDE [Trinity Desktop Environment]*** ***Build TDE [Trinity Desktop Environment]***
.. for Slackware [x86_64/i586+/arm], and [Slarm64](http://slarm64.org/download.html) [aarch64]. .. for Slackware [x86_64/i586+/arm], and [Slarm64](http://slarm64.org/download.html) [aarch64].
See 'Cross compiling for RPi3' for building for arm_hf and aarch64. 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, 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.12, or the development versions 14.0.x, 14.1.0. which will build the release version 14.0.12, or the development versions 14.0.x, 14.1.0.
[<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png) [<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png "TDE version")
... select TDE version
The Required packages will need to be installed as they are built, because they provide dependencies for other TDE packages. The Required packages will need to be installed as they are built, because they provide dependencies for other TDE packages.
@ -99,8 +100,7 @@ Once any git repository has been cloned, further downloads are updates only[2],
The git repositories are cloned to 'src/cgit' The git repositories are cloned to 'src/cgit'
--- ---
<a id="xcompiling"></a>***Cross compiling for RPi3***
***Cross compiling for RPi3***
Cross compiling a number of packages for the Raspberry Pi3 based on these scripts is detailed in the html page in the gh-pages branch: Cross compiling a number of packages for the Raspberry Pi3 based on these scripts is detailed in the html page in the gh-pages branch:
``` ```
@ -132,6 +132,8 @@ Includes:
[4] The README for a [native build for Raspberry Pi3](./README-Raspberry-Pi3.md) is out-of-date and cross compiling is a better option. [4] The README for a [native build for Raspberry Pi3](./README-Raspberry-Pi3.md) is out-of-date and cross compiling is a better option.
[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.
--- ---
See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more information See https://wiki.trinitydesktop.org/How_to_Build_TDE_Core_Modules for more information

Loading…
Cancel
Save