From 9b5de33d896eb8feee0a15b47424b6bd9df3fb02 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Mon, 29 Apr 2024 16:15:21 +0100 Subject: [PATCH] Updates 29 April 2024 for 14.1.2 release plus: clamav, graphviz, and imlib2 versions cmake builds - gwenview and soundkonverter added krename --- Apps/gwenview/gwenview.SlackBuild | 21 +---- Apps/k9copy/k9copy.SlackBuild | 3 +- Apps/klamav/klamav.SlackBuild | 2 +- Apps/koffice-i18n/koffice-i18n.SlackBuild | 1 + Apps/krename/krename.SlackBuild | 88 +++++++++++++++++++ Apps/kvkbd/kvkbd.SlackBuild | 12 +-- Apps/soundkonverter/soundkonverter.SlackBuild | 35 -------- BUILD-TDE.sh | 7 +- Core/tde-i18n/tde-i18n-en_GB-patch | 33 ++++--- Core/tde-i18n/tde-i18n.SlackBuild | 4 +- Core/tdegraphics/tdegraphics.SlackBuild | 17 +++- Deps/akode/akode.SlackBuild | 5 +- Misc/graphviz/graphviz.SlackBuild | 2 +- Misc/imlib2/imlib2.SlackBuild | 2 +- README.md | 6 +- apps-list | 1 + get-source.sh | 12 +-- 17 files changed, 153 insertions(+), 98 deletions(-) create mode 100755 Apps/krename/krename.SlackBuild diff --git a/Apps/gwenview/gwenview.SlackBuild b/Apps/gwenview/gwenview.SlackBuild index 68aa829..6af7cd1 100755 --- a/Apps/gwenview/gwenview.SlackBuild +++ b/Apps/gwenview/gwenview.SlackBuild @@ -34,29 +34,16 @@ getsource_fn untar_fn -## fix check for visibility support - tde-common-admin pull #20 -sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in - listdocs_fn -ltoolupdate_fn - chown_fn cd_builddir_fn -[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility" - -CFLAGS="$SLKRCFLAGS" \ -CXXFLAGS="$SLKRCFLAGS" \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=$INSTALL_TDE \ - --mandir=$INSTALL_TDE/man \ - ${EN_GCC_VIS:-} \ - --disable-rpath \ - --enable-closure +cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ + -DWITH_KIPI="ON" \ + -DWITH_MNG="ON" \ + -DWITH_XCURSOR="ON" make_fn diff --git a/Apps/k9copy/k9copy.SlackBuild b/Apps/k9copy/k9copy.SlackBuild index fc2d892..f6a0bbc 100755 --- a/Apps/k9copy/k9copy.SlackBuild +++ b/Apps/k9copy/k9copy.SlackBuild @@ -39,8 +39,7 @@ untar_fn sed -i 's|# architecture|&\n set ( CMAKE_SYSTEM_PROCESSOR i586 )|' ConfigureChecks.cmake ## for slack-desc -[[ $TDEVERSION != 14.1.1 ]] && TRANS_DIR=translations/messages -langs="";for Lang in $I18N;do [[ -s ${TRANS_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/Apps/klamav/klamav.SlackBuild b/Apps/klamav/klamav.SlackBuild index 715d70b..5e93753 100755 --- a/Apps/klamav/klamav.SlackBuild +++ b/Apps/klamav/klamav.SlackBuild @@ -33,7 +33,7 @@ source ../../get-source.sh ## klamav needs clamav as a build time requirement [[ $(cat $TMPVARS/PRE_DOWNLOAD) != yes ]] && { # ### clamav - start -clamav_VERS=1.2.1 +clamav_VERS=1.3.1 clamav_installed_fn () { pkg-config --atleast-version=$clamav_VERS libclamav ;} ## If it's already installed, go to end clamav_installed_fn || { diff --git a/Apps/koffice-i18n/koffice-i18n.SlackBuild b/Apps/koffice-i18n/koffice-i18n.SlackBuild index b0e206a..8e382bb 100755 --- a/Apps/koffice-i18n/koffice-i18n.SlackBuild +++ b/Apps/koffice-i18n/koffice-i18n.SlackBuild @@ -63,6 +63,7 @@ echo -e "\033[39;1m $(printf '%0.s¯' $(seq 1 $[${#dir}+29])) \033[0m" ## Rename files and contents: +## added '|| true' to continue build where file has already been renamed or doesn't exist for that locale mv ../template/messages/koffice/chalk.pot ../template/messages/koffice/krita.pot || true mv messages/koffice/chalk.po messages/koffice/krita.po mv docs/koffice/chalk docs/koffice/krita || true diff --git a/Apps/krename/krename.SlackBuild b/Apps/krename/krename.SlackBuild new file mode 100755 index 0000000..5dcbcd9 --- /dev/null +++ b/Apps/krename/krename.SlackBuild @@ -0,0 +1,88 @@ +#!/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=krename +VERSION=$TDEVERSION +BUILD=${BUILD:-1} +TAG=${TAG:-_tde} + +source ../../get-source.sh +getsource_fn + +untar_fn + +sed -i 's| "TQt: 3.3.5"||' doc/man/krename.1 +sed -i 's|^TQt.*$|krename \- a batch file renamer|' doc/man/krename.1 +sed -i 's|TQt:|krename|' doc/man/krename.1 +sed -i '/KDE: 3.4.2/d' doc/man/krename.1 +sed -i '/KRename: 3.0.8/d' doc/man/krename.1 +sed -i 's|info TQt|info krename|' doc/man/krename.1 + +## for slack-desc +langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done + +listdocs_fn + +chown_fn + +cd_builddir_fn + +cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} + +make_fn + +installdocs_fn + +mangzip_fn + +strip_fn + +mkdir_install_fn + +doinst_sh_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: krename is for renaming a list of files based on a set of expressions +$PRGNAM: and additionally: +$PRGNAM: * copying/moving a list of files to another directory +$PRGNAM: * converting filenames to upper/lower case +$PRGNAM: * adding numbers to filenames +$PRGNAM: * finding and replacing parts of the filename +$PRGNAM: * renaming Mp3/Ogg Vorbis files based on their ID3 tags +$PRGNAM: * setting access & modification dates, permissions & file ownership +$PRGNAM: * renaming directories recursively +$PRGNAM: +$PRGNAM: With language support for: +$PRGNAM: $langs +" > $PKG/install/slack-desc + +makepkg_fn diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index 8c392cc..bf819da 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -95,13 +95,13 @@ patch -N -p0 << EOF || true --- src/MainWidget.cpp +++ src/MainWidget.cpp @@ -515 +515 @@ -- m->insertItem ( i18n("Font ..."), this, TQT_SLOT ( chooseFont() ) ); -+ m->insertItem ( i18n("Font"), this, TQT_SLOT ( chooseFont() ) ); +- 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, TQT_SLOT ( chooseKeysColor() ) ); -+ m->insertItem ( i18n ("Key color"), this, TQT_SLOT ( chooseKeysColor() ) ); +- m->insertItem ( i18n ("Keys color"), this, TQ_SLOT ( chooseKeysColor() ) ); ++ m->insertItem ( i18n ("Key color"), this, TQ_SLOT ( chooseKeysColor() ) ); EOF ## key spacing & sizing @@ -192,7 +192,7 @@ patch -N -p0 << EOF || true ## generate keycode on click rather than wait for next key-click @@ -318 +318,2 @@ - mod_keys.append ( lwin ); -+ connect ( lwin, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); ++ connect ( lwin, TQ_SIGNAL ( keyClick ( unsigned int ) ), this, TQ_SLOT ( keyPress ( unsigned int ) ) ); + other_keys.append( lwin ); # ## don't lock the RWin button @@ -202,7 +202,7 @@ patch -N -p0 << EOF || true ## generate keycode on click rather than wait for next key-click @@ -355 +356,2 @@ - mod_keys.append ( rwin ); -+ connect ( rwin, TQT_SIGNAL ( keyClick ( unsigned int ) ), this, TQT_SLOT ( keyPress ( unsigned int ) ) ); ++ connect ( rwin, TQ_SIGNAL ( keyClick ( unsigned int ) ), this, TQ_SLOT ( keyPress ( unsigned int ) ) ); + other_keys.append( rwin ); EOF } diff --git a/Apps/soundkonverter/soundkonverter.SlackBuild b/Apps/soundkonverter/soundkonverter.SlackBuild index f7b6e8e..c91dc9b 100755 --- a/Apps/soundkonverter/soundkonverter.SlackBuild +++ b/Apps/soundkonverter/soundkonverter.SlackBuild @@ -33,54 +33,19 @@ getsource_fn untar_fn -[[ $TDEVERSION == 14.1.1 ]] && { - -# 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 != "" ]] && langs=" $(echo $langs | sed 's|.po||g')" - -## fix check for visibility support - tde-common-admin pull #20 -sed -i 's| Q_EXPORT| TQ_EXPORT|' admin/acinclude.m4.in - -} || { - ## for slack-desc langs="";for Lang in $I18N;do [[ -s po/$Lang.po ]] && langs="$langs $Lang";done -} - listdocs_fn -[[ $TDEVERSION == 14.1.1 ]] && ltoolupdate_fn - chown_fn cd_builddir_fn -[[ $TDEVERSION == 14.1.1 ]] && { - -[[ $GCC_VIS == ON ]] && EN_GCC_VIS="--enable-gcc-hidden-visibility" - -CFLAGS="$SLKRCFLAGS" \ -CXXFLAGS="$SLKRCFLAGS" \ -CC=$COMPILER \ -CXX=$COMPILER_CXX \ -../configure \ - --prefix=$INSTALL_TDE \ - ${EN_GCC_VIS:-} \ - --disable-rpath \ - --enable-closure - -} || { - sed -i 's|FILES soundkonverterui.rc$|& userscript.sh|' ../src/CMakeLists.txt cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} -} - make_fn installdocs_fn diff --git a/BUILD-TDE.sh b/BUILD-TDE.sh index cf96af5..a3dc3dd 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.1" "the R14.1.1 release - source from archives" \ +"14.1.2" "the R14.1.2 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 @@ -396,6 +396,7 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD " Misc/imlib2" "An image loading and rendering library" off "\Zb\Z6 Build-time requirement for kompose \Zn" \ "Apps/kompose" "Full-screen window/desktop manager" off "\Zb\Z6 Imlib2 is a build time requirement \Zn" \ "Apps/kplayer" "Multimedia player with MPlayer backend" off "\Zb\Z6 MPlayer is a run time requirement \Zn" \ +"Apps/krename" "Batch renaming files, with KFilePlugins support" off "\Zb\Z6 \Zn" \ "Apps/krusader" "File manager for TDE" off "\Zb\Z6 \Zn" \ "Apps/kscope" "A source-editing environment for C and C-style languages." off "\Zb\Z6 Runtime options cscope [d/cscope], ctags [ap/vim], dot [graphviz] \Zn" \ "Apps/ksensors" "A graphical interface for sensors" off "\Zb\Z6 Runtime requirement ap/lm_sensors \Zn" \ @@ -753,8 +754,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.1 ]] && 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.1 build case +[[ $(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/DL_CGIT) != no ]] && { dialog --cr-wrap --no-shadow --colors --defaultno --title " Only download sources " --yesno \ " diff --git a/Core/tde-i18n/tde-i18n-en_GB-patch b/Core/tde-i18n/tde-i18n-en_GB-patch index 2dcc94f..12f8210 100644 --- a/Core/tde-i18n/tde-i18n-en_GB-patch +++ b/Core/tde-i18n/tde-i18n-en_GB-patch @@ -60,39 +60,38 @@ --- tde-i18n-en_GB/messages/tdebase/kcmlayout.po +++ tde-i18n-en_GB/messages/tdebase/kcmlayout.po -@@ -1325,3 +1325,3 @@ +@@ -1370,3 +1370,3 @@ msgid "Use &theme colors" -msgstr "" +msgstr "Use &theme colours" -@@ -1330,3 +1330,3 @@ +@@ -1375,3 +1375,3 @@ msgid "Use c&ustom colors" -msgstr "" +msgstr "Use c&ustom colours" -@@ -1335,3 +1335,3 @@ +@@ -1380,3 +1380,3 @@ msgid "Background color:" -msgstr "" +msgstr "Background colour:" -@@ -1342,4 +1342,4 @@ +@@ -1387,3 +1387,5 @@ "was set to display a flag." --msgstr "" -- -+msgstr "This colour will be used as the indicator's background unless the indicator " + msgstr "" ++"This colour will be used as the indicator's background unless the indicator " +"was set to display a flag." - #: kcmlayoutwidget.ui:807 -@@ -1347,3 +1347,3 @@ + +@@ -1392,3 +1392,3 @@ msgid "Text color:" -msgstr "" +msgstr "Text colour:" -@@ -1352,3 +1352,3 @@ +@@ -1397,3 +1397,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." -@@ -1393,3 +1393,3 @@ +@@ -1438,3 +1438,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." @@ -103,32 +102,32 @@ ## which becomes "Us&e custom colours", so force &Use .. --- tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po +++ tde-i18n-en_GB/messages/tdebase/kcmtaskbar.po -@@ -382,3 +382,3 @@ +@@ -348,3 +348,3 @@ msgid "Colors" -msgstr "" +msgstr "Colours" -@@ -387,3 +387,3 @@ +@@ -353,3 +353,3 @@ msgid "Use &custom colors" -msgstr "" +msgstr "&Use custom colours" -@@ -392,3 +392,3 @@ +@@ -358,3 +358,3 @@ msgid "Active task te&xt color:" -msgstr "" +msgstr "Active task te&xt colour:" -@@ -397,3 +397,3 @@ +@@ -363,3 +363,3 @@ msgid "&Background color:" -msgstr "" +msgstr "&Background colour:" -@@ -402,3 +402,3 @@ +@@ -368,3 +368,3 @@ msgid "Inacti&ve task text color:" -msgstr "" +msgstr "Inacti&ve task text colour:" -@@ -525,3 +525,3 @@ +@@ -488,3 +488,3 @@ msgid "Right b&utton:" -msgstr "Right b&utton:" +msgstr "&Right button:" diff --git a/Core/tde-i18n/tde-i18n.SlackBuild b/Core/tde-i18n/tde-i18n.SlackBuild index 063ae2f..1238037 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.1 ]] && { +[[ $TDEVERSION == 14.1.2 ]] && { # 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.1 ]] && { +[[ $TDEVERSION == 14.1.2 ]] && { # 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/tdegraphics/tdegraphics.SlackBuild b/Core/tdegraphics/tdegraphics.SlackBuild index a78ca52..ec41e03 100755 --- a/Core/tdegraphics/tdegraphics.SlackBuild +++ b/Core/tdegraphics/tdegraphics.SlackBuild @@ -43,7 +43,7 @@ patch -p0 << EOF --- ksnapshot/ksnapshot.cpp +++ ksnapshot/ksnapshot.cpp @@ -84 +83,0 @@ -- connect(mainWidget, TQT_SIGNAL(openWithKPClicked()), TQT_SLOT(slotOpenWithKP())); +- connect(mainWidget, TQ_SIGNAL(openWithKPClicked()), TQ_SLOT(slotOpenWithKP())); @@ -135,6 +133,0 @@ - // Check for KolourPaint availability - KService::Ptr kpaint = KService::serviceByDesktopName("kolourpaint"); @@ -93,7 +93,7 @@ patch -p0 << EOF - slotOpenWithKPClicked() --- ksnapshot/ksnapshotwidget.ui.h +++ ksnapshot/ksnapshotwidget.ui.h -@@ -140,4 +139,0 @@ +@@ -138,4 +137,0 @@ -void KSnapshotWidget::slotOpenWithKPClicked() -{ - emit openWithKPClicked(); @@ -102,6 +102,18 @@ EOF echo -e "\033[0m" } +## kmrml has been removed from 14.2.0 and deprecated for 14.1.x +[[ $TDEVERSION != 14.2.0 ]] && { +sed -i 's|TQT_TQOBJECT|tqt_TQOBJECT|' kmrml/kmrml/kcontrol/mainpage.cpp +sed -i 's|TQT_|TQ_|g' kmrml/kmrml/kcontrol/*.cpp +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 +# +## display deprecation message +sed -i 's|AUTHOR_WARNING|WARNING|' kmrml/CMakeLists.txt +} + listdocs_fn chown_fn @@ -114,7 +126,6 @@ sed -i "s|http://bugs.trinitydesktop.org|https://mirror.git.trinitydesktop.org/g # If imlib is installed, include Kuickshow: pkg-config imlib && KUICKSHOW=ON -## KMRML removed from 14.2.0 [[ $TDEVERSION != 14.2.0 ]] && BUILD_KMRML=-DBUILD_KMRML="ON" cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ -DWITH_PAPER="OFF" \ diff --git a/Deps/akode/akode.SlackBuild b/Deps/akode/akode.SlackBuild index f17a9da..3efa9b5 100755 --- a/Deps/akode/akode.SlackBuild +++ b/Deps/akode/akode.SlackBuild @@ -49,7 +49,10 @@ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ -DWITH_MPC_DECODER="ON" \ -DWITH_MPEG_DECODER="ON" \ -DWITH_SRC_RESAMPLER="ON" \ - -DWITH_XIPH_DECODER="ON" + -DWITH_XIPH_DECODER="ON" \ + -DWITH_XIPH_FLAC="ON" \ + -DWITH_XIPH_SPEEX="ON" \ + -DWITH_XIPH_VORBIS="ON" make_fn diff --git a/Misc/graphviz/graphviz.SlackBuild b/Misc/graphviz/graphviz.SlackBuild index 527dee2..a880142 100755 --- a/Misc/graphviz/graphviz.SlackBuild +++ b/Misc/graphviz/graphviz.SlackBuild @@ -26,7 +26,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=graphviz -VERSION=9.0.0 +VERSION=10.0.1 BUILD=${BUILD:-1} TAG=${TAG:-} diff --git a/Misc/imlib2/imlib2.SlackBuild b/Misc/imlib2/imlib2.SlackBuild index 3f174c5..6fd00d4 100755 --- a/Misc/imlib2/imlib2.SlackBuild +++ b/Misc/imlib2/imlib2.SlackBuild @@ -21,7 +21,7 @@ # SUCH DAMAGE. PRGNAM=imlib2 -VERSION=1.12.1 +VERSION=1.12.2 BUILD=${BUILD:-1} TAG=${TAG:-} diff --git a/README.md b/README.md index 011d601..6af3919 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [](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 RPi4. --- ***Build TDE [Trinity Desktop Environment]*** @@ -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.1, or the development versions 14.1.x/14.2.0. +which will build the release version 14.1.2, 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.1 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.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. 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 a67b729..6a68602 100644 --- a/apps-list +++ b/apps-list @@ -51,4 +51,5 @@ themes-Apps/twin-style-suse2 utilities-Apps/abakus utilities-Apps/filelight utilities-Apps/kompose +utilities-Apps/krename utilities-Apps/ksensors diff --git a/get-source.sh b/get-source.sh index c4b372b..0fdb5eb 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.1 && ! -s $SRCDIR/cmake-$TDEVERSION.tar.xz ]] && ( +[[ $TDEVERSION == 14.1.2 && ! -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.1 or misc, download archive: -[[ $TDEVERSION == 14.1.1 || $TDEMIR_SUBDIR == misc ]] && { +## if 14.1.2 or misc, download archive: +[[ $TDEVERSION == 14.1.2 || $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.1 nor misc, and we are creating/updating git, +## otherwise, not R14.1.2 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,7 +252,7 @@ cd $TMP_BUILD/tmp-$PRGNAM ## ## [1] firstly test for R14 or misc .. ## -[[ $TDEVERSION == 14.1.1 || $TDEMIR_SUBDIR == misc ]] && { +[[ $TDEVERSION == 14.1.2 || $TDEMIR_SUBDIR == misc ]] && { ## unpack R14 or misc echo -e "\n unpacking $(basename $SOURCE) ... \n" tar -xf $SOURCE @@ -266,7 +266,7 @@ mv tde-cmake-trinity-$TDEVERSION cmake } || { -## [2] not 14.1.1 nor misc, so must be git .. +## [2] not 14.1.2 nor misc, so must be git .. [[ $TDEVERSION == 14.2.0 ]] && DEV_BRANCH=master || DEV_BRANCH=r14.1.x ## copy git content to build area: