diff --git a/Apps/amarok/amarok.SlackBuild b/Apps/amarok/amarok.SlackBuild index cf1db31..6e4a25c 100755 --- a/Apps/amarok/amarok.SlackBuild +++ b/Apps/amarok/amarok.SlackBuild @@ -54,9 +54,6 @@ chown_fn cd_builddir_fn -# If mp4v2 is installed, use mp4 metadata sources in build, otherwise m4a is used .. -pkg-config mp4v2 && MP4V2="ON" - ## Build xine-engine? pkg-config libxine && XINE="ON" @@ -77,7 +74,6 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ -DWITH_IPOD="OFF" \ -DWITH_KONQSIDEBAR="ON" \ -DWITH_LIBVISUAL="ON" \ - -DWITH_MP4V2=${MP4V2:-"OFF"} \ -DWITH_MTP="ON" \ -DWITH_MYSQL="OFF" \ -DWITH_NJB="OFF" \ diff --git a/Apps/kvkbd/dock.png b/Apps/kvkbd/dock.png deleted file mode 100644 index af60dff..0000000 Binary files a/Apps/kvkbd/dock.png and /dev/null differ diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index bf819da..87827ec 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -35,14 +35,22 @@ untar_fn ## copy the helpfile docs to the build tree cp -a $SB_SRCDIR/doc . -cp $SB_SRCDIR/dock.png src/ -## copy translations -cp $SB_SRCDIR/translations/messages/* translations/messages/ -## remove meinproc check - there are a number of validity errors relating to the use of etc., +## remove meinproc --check - there are a number of validity errors relating to the use of etc., ## which I feel provides a better presentation. The help file displays as intended. sed -i 's|--check --cache index.cache.bz2|--cache index.cache.bz2|' cmake/modules/TDEMacros.cmake +## copy translations +cp $SB_SRCDIR/translations/messages/* translations/messages/ +## add translatable strings to template +echo ' +#: MainWidget.cpp:535 +msgid "Help" +msgstr "" + +#: MainWidget.cpp:562 +msgid "Configure" +msgstr ""' >> translations/messages/kvkbd.pot -## change num-pad keys text +## [2] change num-pad keys text [[ $(cat $TMPVARS/Kvkbd_OPTS) == *numpad* ]] && { echo -e "\033[36;1m"'patching for num-pad text ..'"\033[0m" patch -N -p0 << EOF || true @@ -63,7 +71,7 @@ patch -N -p0 << EOF || true EOF } -## set small icons to better fit on buttons for keyboard used at default size +## [3] set small icons to better fit on buttons for keyboard used at default size [[ $(cat $TMPVARS/Kvkbd_OPTS) == *icons* ]] && { echo -e "\033[36;1m"'patching for small icons ..'"\033[0m" patch -N -p0 << EOF || true @@ -91,17 +99,12 @@ EOF } ## configuration menu +sed -i 's|Font \.\.\.|Font|;s|Keys color|Key color|' {src/MainWidget.cpp,translations/messages/*} patch -N -p0 << EOF || true --- src/MainWidget.cpp +++ src/MainWidget.cpp -@@ -515 +515 @@ -- m->insertItem ( i18n("Font ..."), this, TQ_SLOT ( chooseFont() ) ); -+ m->insertItem ( i18n("Font"), this, TQ_SLOT ( chooseFont() ) ); @@ -520,0 +521 @@ + m->insertSeparator(); -@@ -522 +523 @@ -- m->insertItem ( i18n ("Keys color"), this, TQ_SLOT ( chooseKeysColor() ) ); -+ m->insertItem ( i18n ("Key color"), this, TQ_SLOT ( chooseKeysColor() ) ); EOF ## key spacing & sizing @@ -137,7 +140,7 @@ patch -N -p0 << EOF || true + resize ( 64,31 ); EOF -## blank character display where AltGr does not provide extra characters +## [4] blank character display where AltGr does not provide extra characters [[ $(cat $TMPVARS/Kvkbd_OPTS) == *blank* ]] && { echo -e "\033[36;1m"'patching for blank keys ..'"\033[0m" patch -N -p0 << EOF || true @@ -169,16 +172,10 @@ patch -N -p0 << EOF || true +// // This is required at least on US keyboards, where altGr works as Alt. +// c = sc; +// } -# -## substitute the .notdef, VoidSymbol, with a space ---- src/Xutils.cpp -+++ src/Xutils.cpp -@@ -839,0 +840 @@ -+ { 0x00ffffffL, 0x0020 }, /* VoidSymbol -> <- space */ EOF } -## generate keycode for Win keys with single click so that they can be used for xmodmap +## [1] generate keycode for Win keys with single click so that they can be used for xmodmap [[ $(cat $TMPVARS/Kvkbd_OPTS) != *Winlock* ]] && { echo -e "\033[36;1m"'patching for no-lock Win keys ..'"\033[0m" patch -N -p0 << EOF || true diff --git a/Apps/kvkbd/translations/messages/de.po b/Apps/kvkbd/translations/messages/de.po deleted file mode 100644 index 6e2e84d..0000000 --- a/Apps/kvkbd/translations/messages/de.po +++ /dev/null @@ -1,91 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# FIRST AUTHOR , YEAR. -# -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-05-11 04:28+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" -"Language: de\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Instead of a literal translation, add your name to the end of the list (separated by a comma). -msgid "_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "" - -#. Instead of a literal translation, add your email to the end of the list (separated by a comma). -msgid "_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "" - -#: main.cpp:36 -msgid "A virtual keyboard for TDE" -msgstr "" - -#: main.cpp:42 -msgid "Stand alone version for use with TDM or XDM. \n" -"You should Add : HOME=/root kvkbd --loginhelper & to Xsetup to run in xdm/tdm" -msgstr "" - -#: main.cpp:186 -#. This is the app name, will it be translated? -#, fuzzy -msgid "kvkbd" -msgstr "" - -#: MainWidget.cpp:399 -msgid "Hide keyboard" -msgstr "" - -#: MainWidget.cpp:409 MainWidget.cpp:753 -msgid "Hide num pad" -msgstr "" - -#: MainWidget.cpp:412 MainWidget.cpp:747 -msgid "Show num pad" -msgstr "" - -#: MainWidget.cpp:529 -msgid "Font" -msgstr "" - -#: MainWidget.cpp:531 -msgid "Auto resize font" -msgstr "" - -#: MainWidget.cpp:536 -msgid "Background color" -msgstr "" - -#: MainWidget.cpp:538 -msgid "Key color" -msgstr "" - -#: MainWidget.cpp:541 -msgid "Dock widget" -msgstr "" - -#: MainWidget.cpp:546 -msgid "Lock on screen" -msgstr "" - -#: MainWidget.cpp:552 -msgid "Help" -msgstr "" - -#: MainWidget.cpp:578 -msgid "Configure" -msgstr "" - -#: MainWidget.cpp:998 -msgid "Toggle keyboard visibility" -msgstr "" - -#: MainWidget.cpp:1895 -msgid "Virtual keyboard" -msgstr "" diff --git a/Apps/kvkbd/translations/messages/en_GB.po b/Apps/kvkbd/translations/messages/en_GB.po index 172c73a..88e38b8 100644 --- a/Apps/kvkbd/translations/messages/en_GB.po +++ b/Apps/kvkbd/translations/messages/en_GB.po @@ -40,54 +40,54 @@ msgstr "" msgid "kvkbd" msgstr "" -#: MainWidget.cpp:399 +#: MainWidget.cpp:381 msgid "Hide keyboard" msgstr "" -#: MainWidget.cpp:409 MainWidget.cpp:753 +#: MainWidget.cpp:392 MainWidget.cpp:755 msgid "Hide num pad" msgstr "" -#: MainWidget.cpp:412 MainWidget.cpp:747 +#: MainWidget.cpp:397 MainWidget.cpp:749 msgid "Show num pad" msgstr "" -#: MainWidget.cpp:529 +#: MainWidget.cpp:515 msgid "Font" msgstr "" -#: MainWidget.cpp:531 +#: MainWidget.cpp:517 msgid "Auto resize font" msgstr "" -#: MainWidget.cpp:536 +#: MainWidget.cpp:521 msgid "Background color" msgstr "Background colour" -#: MainWidget.cpp:538 +#: MainWidget.cpp:522 msgid "Key color" msgstr "Key colour" -#: MainWidget.cpp:541 +#: MainWidget.cpp:525 msgid "Dock widget" msgstr "" -#: MainWidget.cpp:546 +#: MainWidget.cpp:529 msgid "Lock on screen" msgstr "" -#: MainWidget.cpp:552 +#: MainWidget.cpp:535 msgid "Help" msgstr "" -#: MainWidget.cpp:578 +#: MainWidget.cpp:562 msgid "Configure" msgstr "" -#: MainWidget.cpp:998 +#: MainWidget.cpp:960 msgid "Toggle keyboard visibility" msgstr "" -#: MainWidget.cpp:1895 +#: MainWidget.cpp:989 msgid "Virtual keyboard" msgstr "" diff --git a/Apps/kvkbd/translations/messages/kvkbd.pot b/Apps/kvkbd/translations/messages/kvkbd.pot deleted file mode 100644 index eb78221..0000000 --- a/Apps/kvkbd/translations/messages/kvkbd.pot +++ /dev/null @@ -1,93 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2020-05-11 13:18+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#. Instead of a literal translation, add your name to the end of the list (separated by a comma). -#, ignore-inconsistent -msgid "_: NAME OF TRANSLATORS\n" -"Your names" -msgstr "" - -#. Instead of a literal translation, add your email to the end of the list (separated by a comma). -#, ignore-inconsistent -msgid "_: EMAIL OF TRANSLATORS\n" -"Your emails" -msgstr "" - -#: main.cpp:36 -msgid "A virtual keyboard for TDE" -msgstr "" - -#: main.cpp:42 -msgid "Stand alone version for use with TDM or XDM. \n" -"You should Add : HOME=/root kvkbd --loginhelper & to Xsetup to run in xdm/tdm" -msgstr "" - -#: main.cpp:186 -#. This is the app name, will it be translated? -#, fuzzy -msgid "kvkbd" -msgstr "" - -#: MainWidget.cpp:399 -msgid "Hide keyboard" -msgstr "" - -#: MainWidget.cpp:409 MainWidget.cpp:753 -msgid "Hide num pad" -msgstr "" - -#: MainWidget.cpp:412 MainWidget.cpp:747 -msgid "Show num pad" -msgstr "" - -#: MainWidget.cpp:529 -msgid "Font" -msgstr "" - -#: MainWidget.cpp:531 -msgid "Auto resize font" -msgstr "" - -#: MainWidget.cpp:536 -msgid "Background color" -msgstr "" - -#: MainWidget.cpp:538 -msgid "Key color" -msgstr "" - -#: MainWidget.cpp:541 -msgid "Dock widget" -msgstr "" - -#: MainWidget.cpp:546 -msgid "Lock on screen" -msgstr "" - -#: MainWidget.cpp:552 -msgid "Help" -msgstr "" - -#: MainWidget.cpp:578 -msgid "Configure" -msgstr "" - -#: MainWidget.cpp:998 -msgid "Toggle keyboard visibility" -msgstr "" - -#: MainWidget.cpp:1895 -msgid "Virtual keyboard" -msgstr "" diff --git a/Apps/piklab/piklab.SlackBuild b/Apps/piklab/piklab.SlackBuild index ce94045..c9ceb17 100755 --- a/Apps/piklab/piklab.SlackBuild +++ b/Apps/piklab/piklab.SlackBuild @@ -33,28 +33,16 @@ getsource_fn untar_fn -# set support for additional language(s) as per I18N variable -# but only for languages available with this package -langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done -sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am -langs=$(echo $langs | sed 's|.po||g') +## for slack-desc +langs="en";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done listdocs_fn -ltoolupdate_fn - chown_fn cd_builddir_fn -CFLAGS="$SLKRCFLAGS" \ -CXXFLAGS="$SLKRCFLAGS" \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=$INSTALL_TDE \ - --mandir=$INSTALL_TDE/man \ - --disable-rpath +cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} make_fn @@ -79,7 +67,7 @@ echo " $PRGNAM: An integrated development environment for PIC microcontrollers $PRGNAM: $PRGNAM: With language support for: -$PRGNAM: en $langs +$PRGNAM: $langs $PRGNAM: $PRGNAM: $PRGNAM: diff --git a/Apps/soundkonverter/soundkonverter.SlackBuild b/Apps/soundkonverter/soundkonverter.SlackBuild index 8a944df..8d98c9d 100755 --- a/Apps/soundkonverter/soundkonverter.SlackBuild +++ b/Apps/soundkonverter/soundkonverter.SlackBuild @@ -34,8 +34,7 @@ getsource_fn untar_fn ## for slack-desc -[[ $TDEVERSION != 14.1.2 ]] && PO_DIR=translations/messages -langs="";for Lang in $I18N;do [[ -s ${PO_DIR:-po}/$Lang.po ]] && langs="$langs $Lang";done +langs="";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done listdocs_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index 883408d..5f8aa55 100755 --- a/BUILD-TDE.sh +++ b/BUILD-TDE.sh @@ -101,7 +101,7 @@ Set the version of TDE to be built. " \ 13 75 3 \ -"14.1.2" "the R14.1.2 release - source from archives" \ +"14.1.3" "the R14.1.3 release - source from archives" \ "14.1.x" "next release preview - source from Trinity git" \ "14.2.0" "R14.2.0 development - source from Trinity git" \ 2> $TMPVARS/TDEVERSION @@ -311,16 +311,6 @@ If following the build method on the previous screen, the answer here should pro [[ $? == 0 ]] && echo yes > $TMPVARS/KEEP_BUILD [[ $? == 1 ]] && echo no > $TMPVARS/KEEP_BUILD - -## new app for 14.1.3+ & 14.2.0 -# Use non-breaking space - U00a0 - in strings for this to work with 'dialog' -[[ $(cat $TMPVARS/TDEVERSION) != 14.1.2 ]] && { -app_1="Apps/tde-ebook-reader" -about_1="Ebook reader .." -status_1=off -comment_1="\Zb\Z6 \Zn" -} - rm -f $TMPVARS/TDEbuilds dialog --cr-wrap --nocancel --no-shadow --colors --title " TDE Packages Selection " --item-help --checklist \ " @@ -371,10 +361,9 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD " Misc/xmedcon" "A medical image conversion utility & library" off "\Zb\Z6 Buildtime option for libksquirrel \Zn" \ "Libs/libksquirrel" "A set of image codecs for KSquirrel" off "\Zb\Z6 Required for ksquirrel. Buildtime options include l/netpbm, t/transfig [fig2dev], Misc/xmedcon \Zn" \ "Apps/abakus" "PC calculator" off "\Zb\Z6 optional dependency l/mpfr which requires l/gmp \Zn" \ -" Misc/mp4v2" "Create and modify mp4 files" off "\Zb\Z6 Buildtime option for Amarok \Zn" \ " Misc/moodbar" "GStreamer plugin for Amarok for moodbar feature" off "\Zb\Z6 Requires gstreamer-1.x. Runtime option for Amarok \Zn" \ " Misc/yauap" "A simple commandline audio player" off "\Zb\Z6 Provides an optional engine for Amarok \Zn" \ -"Apps/amarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, mp4v2, speex, moodbar, akode, yauap \Zn" \ +"Apps/amarok" "A Music Player" off "\Zb\Z6 Optional dependencies - xine-lib, speex, moodbar, akode, yauap \Zn" \ "Apps/codeine" "Simple multimedia player" off "\Zb\Z6 \Zn" \ "Apps/digikam" "A digital photo management application + Showfoto viewer" off "\Zb\Z6 Requires kipi-plugins libkdcraw libkexiv2 libkipi. \Zn" \ "Apps/dolphin" "Dolphin file manager for TDE" off "\Zb\Z6 A d3lphin.desktop file is included - see dolphin.SlackBuild. \Zn" \ @@ -419,7 +408,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD "Apps/potracegui" "A GUI for potrace" off "\Zb\Z6 Requires potrace \Zn" \ "Apps/rosegarden" "Audio sequencer and musical notation editor" off "\Zb\Z6 Requires jack-audio-connection-kit liblo and dssi for proper functionality \Zn" \ "Apps/soundkonverter" "Frontend to various audio converters" off "\Zb\Z6 \Zn" \ -${app_1:-} ${about_1:-} ${status_1:-} ${comment_1:-} \ +"Apps/tde-ebook-reader" "Ebook reader ported from FBReader" off "\Zb\Z6  \Zn" \ "Apps/tde-style-lipstik" "Lipstik theme" off "\Zb\Z6 \Zn" \ "Apps/tde-style-qtcurve" "QtCurve theme" off "\Zb\Z6 \Zn" \ "Apps/tdebluez" "Bluetooth Bluez5 functionality" off "\Zb\Z6 \Zn" \ @@ -764,8 +753,8 @@ Create and/or update the git repositories local copies. #rm -f $TMPVARS/PRE_DOWNLOAD ## this is done at the head of this script -[[ $(cat $TMPVARS/TDEVERSION) == 14.1.2 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." || PRE_DOWNLOAD_MESSAGE="All cgit sources for the build list packages will be cloned/updated.\nMisc archives will only be downloaded if not already in 'src'." -## testing for cgit!=no will allow =yes, or null, which is the 14.1.2 build case +[[ $(cat $TMPVARS/TDEVERSION) == 14.1.3 ]] && PRE_DOWNLOAD_MESSAGE="Only the source archives not already in 'src' will be downloaded." || PRE_DOWNLOAD_MESSAGE="All cgit sources for the build list packages will be cloned/updated.\nMisc archives will only be downloaded if not already in 'src'." +## testing for cgit!=no will allow =yes, or null, which is the 14.1.3 build case [[ $(cat $TMPVARS/DL_CGIT) != no ]] && { dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \ " diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 1238037..4177200 100755 --- a/Core/tde-i18n/tde-i18n.SlackBuild +++ b/Core/tde-i18n/tde-i18n.SlackBuild @@ -38,7 +38,7 @@ getsource_fn ## extract, build, and remove source for each language package one at a time cd $TMP_BUILD/tmp-$PRGNAM -[[ $TDEVERSION == 14.1.2 ]] && { +[[ $TDEVERSION == 14.1.3 ]] && { # extract the template source once only echo -e "\033[39;1m Extracting the template source from $(basename $SOURCE) ... @@ -71,7 +71,7 @@ cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/) for lang in $I18N do -[[ $TDEVERSION == 14.1.2 ]] && { +[[ $TDEVERSION == 14.1.3 ]] && { # extract the source for one language at a time for each iteration of the loop echo -e "\033[39;1m Extracting the $PRGNAM-$lang source from $(basename $SOURCE) ... diff --git a/Core/tdebase/tdebase.SlackBuild b/Core/tdebase/tdebase.SlackBuild index 46eab14..33b8ee2 100755 --- a/Core/tdebase/tdebase.SlackBuild +++ b/Core/tdebase/tdebase.SlackBuild @@ -127,16 +127,6 @@ EOF ## rather than set HTDIG_SEARCH_BINARY which fixes the location sed -i 's|HINTS|&\n /var/www/cgi-bin|' khelpcenter/searchhandlers/CMakeLists.txt -## Work-around to build the handbooks, fixes tdebase issues 458 & 483 -## See tdebase issue 483, #issuecomment-51339 -[[ $TDEVERSION == 14.1.2 ]] && { -sed -i 's|MATCHES ";${_lang};" ))|MATCHES ";1;" ))|' cmake/modules/TDEMacros.cmake -} -## + a related change to man source directories for development versions -[[ $TDEVERSION != 14.1.2 ]] && { -MAN_SRC_DIR=*/ -} - ## correct test for sudo sed -i 's|^if( TDESU_BACKEND-NOTFOUND )|if( ${TDESU_BACKEND} STREQUAL "TDESU_BACKEND-NOTFOUND" )|' tdesu/CMakeLists.txt sed -i 's|endif( TDESU_BACKEND-NOTFOUND )|endif()|' tdesu/CMakeLists.txt @@ -148,12 +138,12 @@ chown_fn cd_builddir_fn -sed -i "s|/etc/trinity|$INSTALL_TDE/share/config|" ../doc/man/${MAN_SRC_DIR:-}{gentdmconf,tdm}.1 +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/${MAN_SRC_DIR:-}*.1 && \ -sed -i 's|trinity|tde|g' ../doc/man/${MAN_SRC_DIR:-}*.1 || \ -sed -i 's|trinity,kde,kde2,kde1|trinity|' ../doc/man/${MAN_SRC_DIR:-}*.1 -sed -i "s|http://bugs.*desktop.org|https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM/issues|" ../doc/man/${MAN_SRC_DIR:-}*.1 +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 @@ -167,7 +157,7 @@ install( endif( ) ' >> ../tdm/kfrontend/CMakeLists.txt # -sed -i "s|/opt/.*/share/doc/tdm/README.gz|$INSTALL_TDE/share/config/tdm/README-config|" ../doc/man/${MAN_SRC_DIR:-}tdm{,ctl}.1 +sed -i "s|/opt/.*/share/doc/tdm/README.gz|$INSTALL_TDE/share/config/tdm/README-config|" ../doc/man/*/tdm{,ctl}.1 cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ -DWITH_ARTS="ON" \ @@ -181,7 +171,7 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ -DWITH_OPENEXR="ON" \ -DWITH_OPENGL="ON" \ -DWITH_PAM="OFF" \ - -DWITH_PCRE="ON" \ + -DWITH_PCRE2="ON" \ -DWITH_SAMBA="OFF" \ -DWITH_SASL="OFF" \ -DWITH_SENSORS="ON" \ diff --git a/Core/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index a6def10..1175986 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -110,10 +110,8 @@ sed -i 's|tqt_TQOBJECT|TQT_TQOBJECT_H|' kmrml/kmrml/kcontrol/mainpage.cpp sed -i 's|TQT_|TQ_|g' kmrml/kmrml/*.cpp sed -i 's|TQT_|TQ_|' kmrml/kmrml/server/*.cpp # -[[ $TDEVERSION == 14.1.x ]] && { sed -i 's|KDE_EXPORT|TDE_EXPORT|' kmrml/kmrml/*.cpp sed -i 's|KDE_EXPORT|TDE_EXPORT|' kmrml/kmrml/server/*.cpp -} ## display deprecation message sed -i 's|AUTHOR_WARNING|WARNING|' kmrml/CMakeLists.txt } diff --git a/Core/tdelibs/tdelibs.SlackBuild b/Core/tdelibs/tdelibs.SlackBuild index 6eff770..3ee010f 100755 --- a/Core/tdelibs/tdelibs.SlackBuild +++ b/Core/tdelibs/tdelibs.SlackBuild @@ -159,7 +159,6 @@ pkg-config jasper && JASPER="ON" ## just show message without failing if no spell checker is installed sed -i 's|tde_message_fatal( "Spell checker|message( "Spell checker|' ../CMakeLists.txt -[[ $TDEVERSION != 14.1.2 ]] && pkg-config libwebp && W_WEBP=-DWITH_WEBP=ON cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ -DDEFAULT_SPELL_CHECKER=${DEF_SP_CHKR:-"ASPELL"} \ -DTDE_MALLOC="OFF" \ @@ -191,7 +190,7 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ -DWITH_NETWORK_MANAGER_BACKEND="ON" \ -DWITH_OLD_XDG_STD="OFF" \ -DWITH_OPENEXR="ON" \ - -DWITH_PCRE="ON" \ + -DWITH_PCRE2="ON" \ -DWITH_PCSC="OFF" \ -DWITH_PKCS="OFF" \ -DWITH_SSL="ON" \ @@ -205,7 +204,7 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ -DWITH_UDISKS="ON" \ -DWITH_UPOWER="OFF" \ -DWITH_UTEMPTER="OFF" \ - ${W_WEBP:-} \ + -DWITH_WEBP="ON" \ -DWITH_XCOMPOSITE="ON" \ -DWITH_XRANDR="ON" diff --git a/Misc/mp4v2/README b/Misc/mp4v2/README deleted file mode 100644 index d250ec9..0000000 --- a/Misc/mp4v2/README +++ /dev/null @@ -1,4 +0,0 @@ -Man pages aren't available with this version of mp4v2. - -Identical information for the binaries can be seen by running them from a console with or without the '--help' option. - diff --git a/Misc/mp4v2/mp4v2.SlackBuild b/Misc/mp4v2/mp4v2.SlackBuild deleted file mode 100755 index 12eaf3d..0000000 --- a/Misc/mp4v2/mp4v2.SlackBuild +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/sh -# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST -# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, Netherlands -# Copyright 2015-2017 Thorn Inurcide -# Copyright 2015-2017 tde-slackbuilds project on GitHub -# All rights reserved. -# -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -PRGNAM=mp4v2 -VERSION=2.1.3 -BUILD=${BUILD:-1} -TAG=${TAG:-} - -ARCHIVE_TYPE="tar.gz" -SRCURL="https://github.com/enzo1982/$PRGNAM/archive/v$VERSION.$ARCHIVE_TYPE" - -source ../../get-source.sh -getsource_fn - -untar_fn - -## patch for gcc10 - error: narrowing conversion of ‘mp4v2::util::SubtitleUtility::LC_LIST’ from ‘unsigned int’ to ‘int’, etc.. -## thanks to https://bugs.gentoo.org/723098 -echo -e "\033[39;1m" -patch -N -p0 << EOF || true ---- libutil/Utility.cpp -+++ libutil/Utility.cpp -@@ -492,1 +492,1 @@ -- switch( code ) { -+ switch( static_cast( code ) ) { ---- util/mp4art.cpp -+++ util/mp4art.cpp -@@ -379,1 +379,1 @@ -- switch( code ) { -+ switch( static_cast ( code ) ) { ---- util/mp4chaps.cpp -+++ util/mp4chaps.cpp -@@ -678,1 +678,1 @@ -- switch( code ) { -+ switch( static_cast ( code ) ) { ---- util/mp4file.cpp -+++ util/mp4file.cpp -@@ -192,1 +192,1 @@ -- switch( code ) { -+ switch( static_cast( code ) ) { ---- util/mp4subtitle.cpp -+++ util/mp4subtitle.cpp -@@ -167,1 +167,1 @@ -- switch( code ) { -+ switch( static_cast( code ) ) { ---- util/mp4track.cpp -+++ util/mp4track.cpp -@@ -775,1 +775,1 @@ -- switch( code ) { -+ switch( static_cast( code ) ) { -EOF -echo -e "\033[0m" - -listdocs_fn - -## create mp4v2.pc.in after the installation directories have been set by GNUInstallDirs -sed -i '/^configure_pkg_config_file/d' CMakeLists.txt -sed -i 's|install.*mp4v2.pc.*$|configure_pkg_config_file(mp4v2.pc.in)\n&|' CMakeLists.txt - -cd_builddir_fn - -cmake ${G_NINJA:-} \ - -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ - -DCMAKE_CXX_COMPILER=$COMPILER_CXX \ - -DBUILD_SHARED="ON" \ - -DBUILD_UTILS="ON" \ - .. - -make_fn - -installdocs_fn - -strip_fn - -mkdir_install_fn - -echo " -# HOW TO EDIT THIS FILE: -# The 'handy ruler' below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -$PRGNAM: mp4v2 (Create and modify mp4 files) -$PRGNAM: -$PRGNAM: The MP4v2 library provides an API to create and modify mp4 files as -$PRGNAM: defined by ISO-IEC:14496-1:2001 MPEG-4 Systems. This file format -$PRGNAM: is derived from Apple's QuickTime file format that has been -$PRGNAM: used as a multimedia file format in a variety of platforms and -$PRGNAM: applications. It is a very powerful and extensible format that can -$PRGNAM: accommodate practically any type of media. -$PRGNAM: -$PRGNAM: -$PRGNAM: -" > $PKG/install/slack-desc - -makepkg_fn diff --git a/README.md b/README.md index 1d85c1e..ad40e98 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ 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.1.2, or the development versions 14.1.x/14.2.0. +which will build the release version 14.1.3, or the development versions 14.1.x/14.2.0. [](https://ray-v.github.io/TDE-version.png "TDE version") ... select TDE version @@ -19,7 +19,7 @@ Information about dependencies for some packages has been added at the bottom of Only building the packages is a global option. It therefore can't be used where the build list includes packages which will need to be installed as dependencies for other packages in the build list [for example tdesdk needs tdepim to be installed]. -14.1.2 source archives will be downloaded from a geoIP located mirror site, or the development sources 14.1.x/14.2.0 cloned or updated from trinitydesktop gitea. +14.1.3 source archives will be downloaded from a geoIP located mirror site, or the development sources 14.1.x/14.2.0 cloned or updated from trinitydesktop gitea. Downloading can be done pre-build [useful for an off-line build], or during the build. If you're curious about what this might involve, [take a look at a sample build set up](https://ray-v.github.io/A_typical_TDE_SlackBuild.html). diff --git a/apps-list b/apps-list index 6a68602..8d568ae 100644 --- a/apps-list +++ b/apps-list @@ -26,6 +26,7 @@ office-Apps/kbookreader office-Apps/kile office-Apps/koffice office-Apps/koffice-i18n +office-Apps/tde-ebook-reader settings-Apps/kkbswitch settings-Apps/tdesudo system-Apps/dolphin diff --git a/get-source.sh b/get-source.sh index 8ea9f56..370cfda 100755 --- a/get-source.sh +++ b/get-source.sh @@ -71,14 +71,14 @@ SRCDIR=$BUILD_TDE_ROOT/src SB_SRCDIR=$(cd $(dirname $0); pwd) ## for 14.0.11 onwards, check for cmake archive .. -[[ $TDEVERSION == 14.1.2 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && ( +[[ $TDEVERSION == 14.1.3 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && ( echo -e "\nDownloading to $SRCDIR" wget -T 20 -O $SRCDIR/cmake-$TDEVERSION.tar.xz $TDE_MIRROR/releases/R$TDEVERSION/main/dependencies/tde-cmake-trinity-$TDEVERSION.tar.xz echo -e "----\n" ) -## if 14.1.2 or misc, download archive: -[[ $TDEVERSION == 14.1.2 || $TDEMIR_SUBDIR == misc ]] && { +## if 14.1.3 or misc, download archive: +[[ $TDEVERSION == 14.1.3 || $TDEMIR_SUBDIR == misc ]] && { ## check for and remove any zero byte archive files [[ ! -s $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} ]] && \ rm $SRCDIR/$PRGNAM-$VERSION.${ARCHIVE_TYPE:-"tar.xz"} 2>/dev/null || true @@ -114,7 +114,7 @@ if [ "$P1" == "--download" ]; then exit 0 fi } || { -## otherwise, not R14.1.2 nor misc, and we are creating/updating git, +## otherwise, not R14.1.3 nor misc, and we are creating/updating git, ## so [1] start with admin/cmake: [[ $(cat $TMPVARS/DL_CGIT) == yes ]] && { cd $BUILD_TDE_ROOT/src/cgit @@ -252,21 +252,21 @@ cd $TMP_BUILD/tmp-$PRGNAM ## ## [1] firstly test for R14 or misc .. ## -[[ $TDEVERSION == 14.1.2 || $TDEMIR_SUBDIR == misc ]] && { +[[ $TDEVERSION == 14.1.3 || $TDEMIR_SUBDIR == misc ]] && { ## unpack R14 or misc echo -e "\n unpacking $(basename $SOURCE) ... \n" tar -xf $SOURCE +## and then cmake if required [[ $TDEMIR_SUBDIR != misc ]] && [[ -e $(ls $PRGNAM*/CMakeLists.txt) ]] && ( cd $PRGNAM* -tar -xf $SRCDIR/cmake-$TDEVERSION.tar.xz -mv tde-cmake-trinity-$TDEVERSION cmake +tar xf $SRCDIR/cmake-$TDEVERSION.tar.xz --strip-components=1 --one-top-level=cmake ) : # if this fails, don't try a git build, and go to [3] } || { -## [2] not 14.1.2 nor misc, so must be git .. +## [2] not 14.1.3 nor misc, so must be git .. [[ $TDEVERSION == 14.2.0 ]] && DEV_BRANCH=master || DEV_BRANCH=r14.1.x ## copy git content to build area: @@ -290,9 +290,8 @@ rm -rf .git/worktrees/* git worktree add -f $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/cmake/ ${FEATc:-$DEV_BRANCH} echo -e "\033[39;1m" -## The FEAT commits are based on master branch, so -## rebase the FEAT master branch commit onto the -## r14.1.x branch where that is being built +## The FEAT commits are based on master branch, so rebase the FEAT master branch commit +## onto the r14.1.x branch where that is being built [[ ${FEAT:-} ]] && feat=${FEAT:-} [[ ${FEATa:-} ]] && feat=${FEATa:-} && cm_ad=admin/ [[ ${FEATc:-} ]] && feat=${FEATc:-} && cm_ad=cmake/