diff --git a/Apps/koffice/koffice.SlackBuild b/Apps/koffice/koffice.SlackBuild index 320840a..7f77258 100755 --- a/Apps/koffice/koffice.SlackBuild +++ b/Apps/koffice/koffice.SlackBuild @@ -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 +## Add man pages for development builds +[[ $TDEVERSION != 14.0.12 ]] && \ +MANDIR=--mandir=$INSTALL_TDE/man + listdocs_fn ltoolupdate_fn @@ -136,6 +140,7 @@ CC=$COMPILER \ CXX=$COMPILER_CXX \ ../configure \ --prefix=$INSTALL_TDE \ + ${MANDIR:-} \ --disable-rpath \ ${SCRIPTING:-} \ --enable-closure @@ -144,6 +149,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn mkdir_install_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 132cd9c..b1aeb1c 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -122,24 +122,8 @@ Any other option will have to be edited into BUILD-TDE.sh 2> $TMPVARS/INSTALL_TDE -rm -f $TMPVARS/SYS_CNF_DIR -dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE System Configuration " --menu \ -" -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/TDE_CNF_DIR +echo "$(cat $TMPVARS/INSTALL_TDE)/share/config" > $TMPVARS/TDE_CNF_DIR rm -f $TMPVARS/COMPILER @@ -664,6 +648,9 @@ about_k="Image creation and editing" status_k=off 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 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" \ " autocorrect" "Autocorrection for US English" off "\Zb\Z6 \Zn" \ ${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" \ " filters" "Import/export filters" on "\Zb\Z6 \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 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) [[ $COMPILER == gcc ]] && export COMPILER_CXX="g++" || export COMPILER_CXX="clang++" 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: ## autotools: get-source.sh|ltoolupdate_fn ## 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: ## New build [[ $(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 Only download sources \Zb\Z6${PRE_DOWNLOAD:-\Z0\Zbn/a}\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 gcc cpu optimization \Zb\Z6$SET_march\Zn Number of parallel jobs \Zb\Z6$(echo $NUMJOBS|sed 's|-j||')\Zn diff --git a/Core/tde-i18n/tde-i18n-en_GB-patch b/Core/tde-i18n/tde-i18n-en_GB-patch index 80d9f2a..30f5772 100644 --- a/Core/tde-i18n/tde-i18n-en_GB-patch +++ b/Core/tde-i18n/tde-i18n-en_GB-patch @@ -88,3 +88,43 @@ + +msgid "&Enable user color 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." + diff --git a/Core/tdeaddons/tdeaddons.SlackBuild b/Core/tdeaddons/tdeaddons.SlackBuild index 1178707..0be1643 100755 --- a/Core/tdeaddons/tdeaddons.SlackBuild +++ b/Core/tdeaddons/tdeaddons.SlackBuild @@ -60,6 +60,13 @@ chown_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:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ @@ -67,9 +74,9 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ + ${MANDIR:-} \ -DWITH_ARTS="ON" \ -DWITH_SDL="ON" \ -DWITH_BERKELEY_DB="ON" \ @@ -95,6 +102,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn mkdir_install_fn diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index fedc1d7..3886159 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -95,9 +95,10 @@ echo $' +X-TDE-BrowserView-Built-Into=konqueror ' | 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 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 @@ -132,8 +133,30 @@ chown_fn cd_builddir_fn +[[ $TDEVERSION != 14.0.12 ]] && { ## 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:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ @@ -142,10 +165,9 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ - ${MAN_PAGES:-} \ + ${MANDIR:-} \ -DWITH_ARTS="ON" \ -DWITH_ELFICON="OFF" \ -DWITH_GCC_VISIBILITY=${GCC_VIS:-} \ @@ -290,11 +312,11 @@ echo '#!'"/bin/sh export TDEDIR=$INSTALL_TDE # 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 - export XDG_CONFIG_DIRS=\$XDG_CONFIG_DIRS:$SYS_CNF_DIR/xdg + export XDG_CONFIG_DIRS=\$XDG_CONFIG_DIRS:$INSTALL_TDE/etc/xdg else - export XDG_CONFIG_DIRS=/etc/xdg:$SYS_CNF_DIR/xdg + export XDG_CONFIG_DIRS=/etc/xdg:$INSTALL_TDE/etc/xdg fi } @@ -314,9 +336,9 @@ if ( ! \$?TDEDIR ) then endif 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 - setenv XDG_CONFIG_DIRS /etc/xdg:$SYS_CNF_DIR/xdg + setenv XDG_CONFIG_DIRS /etc/xdg:$INSTALL_TDE/etc/xdg endif setenv XDG_DATA_DIRS /usr/local/share:/usr/share:$INSTALL_TDE/share @@ -333,24 +355,13 @@ fi ################################# 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 -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 -## The installed tdmrc will be created by doinst.sh from tdmrc.new if it doesn't exist -rm $PKG$SYS_CNF_DIR/tdm/tdmrc -mv $PKG$SYS_CNF_DIR/tdm/Xsession $PKG$SYS_CNF_DIR/tdm/Xsession.orig +## If it doesn't exist, tdmrc will be created by doinst.sh from tdmrc.new +rm $PKG$INSTALL_TDE/share/config/tdm/tdmrc +mv $PKG$INSTALL_TDE/share/config/tdm/Xsession $PKG$INSTALL_TDE/share/config/tdm/Xsession.orig # ## new Xsession: echo '#!'' /bin/sh @@ -364,8 +375,8 @@ session=$1 # This section is borrowed from the old X11 Xsession file: userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap -sysresources=/usr/lib/X11/xinit/.Xresources -sysmodmap=/usr/lib/X11/xinit/.Xmodmap +sysresources=/etc/X11/xinit/.Xresources +sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps if [ -r $sysresources ]; then /usr/bin/xrdb -merge $sysresources @@ -440,7 +451,7 @@ case $session in ;; esac 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 # 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 chmod 755 $PKG/etc/rc.d/rc.4.local.tdm -mv $PKG$SYS_CNF_DIR/tdm/backgroundrc $PKG$SYS_CNF_DIR/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 +mv $PKG$INSTALL_TDE/share/config/tdm/backgroundrc $PKG$INSTALL_TDE/share/config/tdm/backgroundrc.new ############################################################################## @@ -467,20 +476,7 @@ mkdir_install_fn ############################################################################## ## create doinst.sh: - 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() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" @@ -492,8 +488,8 @@ config() { fi # Otherwise, we leave the .new copy for the admin to consider... } -config .'"$SYS_CNF_DIR"'/tdm/tdmrc.new -config .'"$SYS_CNF_DIR"'/tdm/backgroundrc.new +config .'"$INSTALL_TDE"'/share/config/tdm/tdmrc.new +config .'"$INSTALL_TDE"'/share/config/tdm/backgroundrc.new # update PATH # 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 ## 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 sed -i '/TDE.*HOME/d' /etc/profile echo 'export TDEHOME=~/.tde' >> /etc/profile diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index 88bbe69..c289e9b 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -48,6 +48,7 @@ echo $' + ' | patch -N -p0 || true +[[ $TDEVERSION == 14.0.12 ]] && { ## for poppler-22.03+ patch -N -p0 << EOF || true --- 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) {} +# endif EOF +} listdocs_fn @@ -95,8 +97,15 @@ chown_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: pkg-config imlib && KUICKSHOW=ON + cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ @@ -106,6 +115,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ + ${MANDIR:-} \ -DWITH_T1LIB="OFF" \ -DWITH_PAPER="OFF" \ -DWITH_TIFF="ON" \ @@ -117,8 +127,8 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DBUILD_KPDF="ON" \ -DBUILD_KAMERA="OFF" \ -DBUILD_KSVG="ON" \ - -DBUILD_LIBKSCAN="OFF" \ - -DBUILD_KOOKA="OFF" \ + -DBUILD_LIBKSCAN="ON" \ + -DBUILD_KOOKA="ON" \ -DBUILD_KCOLOREDIT="ON" \ -DBUILD_KDVI="ON" \ -DBUILD_KFAX="ON" \ @@ -140,6 +150,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn mkdir_install_fn diff --git a/Core/tdelibs/README b/Core/tdelibs/README index f869dec..cce7c85 100644 --- a/Core/tdelibs/README +++ b/Core/tdelibs/README @@ -3,4 +3,9 @@ Some formatting for help pages has been changed by a patch in the SlackBuild - i * text in paragraphs left aligned * border and colour for keyboard key 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 diff --git a/Core/tdelibs/markdown.xml b/Core/tdelibs/markdown.xml new file mode 100644 index 0000000..44fb94b --- /dev/null +++ b/Core/tdelibs/markdown.xml @@ -0,0 +1,182 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index 9ab1905..b8f50f4 100755 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -48,7 +48,7 @@ echo $'--- tdecmshell/main.cpp + kdError(780) << "Could not find \'" << path << "\'." << endl; ' | 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 for file in \ tdecore/kstandarddirs.cpp \ @@ -115,6 +115,7 @@ patch -N -p0 << EOF || true + text-align: left; EOF +[[ $TDEVERSION == 14.0.12 ]] && { ## for jasper-3.0.0+ patch -N -p0 << EOF || true --- kimgio/jp2.cpp @@ -138,6 +139,13 @@ patch -N -p0 << EOF || true jas_stream_close( stream ); 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|' kate/data/update-files.xml +} +## and add modified markdown.xml for all TDE versions +cp $SB_SRCDIR/markdown.xml kate/data/ + listdocs_fn chown_fn @@ -162,7 +170,7 @@ sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLi WITH_PCSC WITH_PKCS 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 cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ @@ -172,7 +180,6 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ - -DSYSCONF_INSTALL_DIR=$SYS_CNF_DIR \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ -DDEFAULT_SPELL_CHECKER=${DEF_SP_CHKR:-"ASPELL"} \ diff --git a/Core/tdesdk/tdesdk.SlackBuild b/Core/tdesdk/tdesdk.SlackBuild index 2de8122..c416db9 100755 --- a/Core/tdesdk/tdesdk.SlackBuild +++ b/Core/tdesdk/tdesdk.SlackBuild @@ -39,6 +39,10 @@ chown_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:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKRCFLAGS" \ diff --git a/Core/tdeutils/tdeutils.SlackBuild b/Core/tdeutils/tdeutils.SlackBuild index dddd136..ad0d229 100755 --- a/Core/tdeutils/tdeutils.SlackBuild +++ b/Core/tdeutils/tdeutils.SlackBuild @@ -53,6 +53,12 @@ chown_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 [[ $TDEVERSION == 14.1.0 ]] && TDEFileReplace="-DBUILD_TDEFILEREPLACE=ON" cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ @@ -64,6 +70,7 @@ cmake ${G_NINJA:-} ${CMAKE_OPTS:-} \ -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \ -DLIB_SUFFIX=$LIBDIRSUFFIX \ -DPLUGIN_INSTALL_DIR=$INSTALL_TDE/lib$LIBDIRSUFFIX/$PLUGIN_INSTALL_DIR \ + ${MANDIR:-} \ -DWITH_DPMS="ON" \ -DWITH_XSCREENSAVER="OFF" \ -DWITH_SENSORS="ON" \ @@ -104,6 +111,8 @@ make_fn installdocs_fn +[[ $TDEVERSION != 14.0.12 ]] && mangzip_fn + strip_fn mkdir_install_fn diff --git a/Core/tdewebdev/tdewebdev.SlackBuild b/Core/tdewebdev/tdewebdev.SlackBuild index 4654224..7f78dd5 100755 --- a/Core/tdewebdev/tdewebdev.SlackBuild +++ b/Core/tdewebdev/tdewebdev.SlackBuild @@ -33,7 +33,7 @@ getsource_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 sed -i "s|FileName=trinity|FileName=$PLUGIN_INSTALL_DIR|" quanta/data/config/plugins.rc sed -i "s|/opt/trinity|$INSTALL_TDE|" */*.tdevelop diff --git a/README.md b/README.md index d218d4d..d91ec30 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,16 @@ -[](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. --- ***Build TDE [Trinity Desktop Environment]*** .. 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, which will build the release version 14.0.12, or the development versions 14.0.x, 14.1.0. -[](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. @@ -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' --- - -***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: ``` @@ -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. +[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