From d6e441aa07b0ec2081a0b2c6ce9d614c8405a899 Mon Sep 17 00:00:00 2001 From: Ray-V Date: Fri, 12 Feb 2021 13:53:08 +0000 Subject: [PATCH] Workaround for kvkbd Revert development builds to compatible revisions until all updates for PR 9 have been merged --- Apps/kvkbd/kvkbd.SlackBuild | 18 +++++++++++++++++- README.md | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/Apps/kvkbd/kvkbd.SlackBuild b/Apps/kvkbd/kvkbd.SlackBuild index 8d4bb63..532cb2d 100755 --- a/Apps/kvkbd/kvkbd.SlackBuild +++ b/Apps/kvkbd/kvkbd.SlackBuild @@ -33,6 +33,23 @@ getsource_fn untar_fn +# ### 2021-02-12 +## These changes are being merged piecemeal to git resulting in patches, and the build, failing. +## This script will be updated when all merges have been completed, but meanwhile, to build kvkbd with these patches, revert the repo to compatible revisions +[[ $TDEVERSION != 14.0.9 ]] && { +(cd $BUILD_TDE_ROOT/src/cgit/$PRGNAM/ +git reset HEAD * +rm -rf .git/worktrees/* +[[ $TDEVERSION == cgit ]] && git checkout -f 2a5540d || git checkout -f 2882ff6 +## overwrite the files in the build area set up by untar_fn with the source now in 'detached HEAD' state .. +echo -e "\n copying $PRGNAM git sources to build area ... \n" +(cd $BUILD_TDE_ROOT/src/cgit +cp -a --parents $PRGNAM/* $TMP_BUILD/tmp-$PRGNAM/ +cp -a --parents cmake/* $TMP_BUILD/tmp-$PRGNAM/$PRGNAM/) +) +} +# ### + ## copy the helpfile docs to the build tree cp -a $SRCDIR/doc . cp $SRCDIR/dock.png src/ @@ -965,7 +982,6 @@ patch -N -p0 << EOF || true extent->res(); EOF - ## for slack-desc langs="en";for Lang in $I18N;do [[ -s translations/messages/$Lang.po ]] && langs="$langs $Lang";done diff --git a/README.md b/README.md index d7d74e7..cd2e0b1 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series The default is to install the packages as they are built, which is necessary initially for the required packages and for some interdependencies [for example, tdesdk requires tdepim]. Run **INST=0 ./BUILD-TDE.sh** to build only. -This is a global option so can't be used where the build list includes packages which will be dependencies for other packages in the build list. +This is a global option so 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. Any package, or set of packages, can be selected in the 'TDE Packages Selection' screen. Information about dependencies for some packages has been added at the bottom of the dialog screen.