From 409c72e83fc0dfc31498ad68c800a8430d319072 Mon Sep 17 00:00:00 2001 From: regdub Date: Tue, 14 Sep 2021 13:01:52 +0200 Subject: development/kdiff3: Updated for version 1.9.3. Signed-off-by: Matteo Bernardini Signed-off-by: Willy Sudiarto Raharjo --- development/kdiff3/README | 33 ++++++++++++++------------------- development/kdiff3/kdiff3.SlackBuild | 6 +++--- development/kdiff3/kdiff3.info | 8 ++++---- development/kdiff3/slack-desc | 4 ++-- 4 files changed, 23 insertions(+), 28 deletions(-) (limited to 'development/kdiff3') diff --git a/development/kdiff3/README b/development/kdiff3/README index fec26dc27f..758e159960 100644 --- a/development/kdiff3/README +++ b/development/kdiff3/README @@ -1,22 +1,17 @@ -KDiff3 is a program that - * compares or merges two or three text input files or directories, - * shows the differences line by line and character by character (!), - * provides an automatic merge-facility and - * an integrated editor for comfortable solving of merge-conflicts, - * supports Unicode, UTF-8 and other codecs, autodetection via - byte-order-mark "BOM" - * supports KIO on KDE (allows accessing ftp, sftp, fish, smb etc.), - * Printing of differences, - * Manual alignment of lines, - * Automatic merging of version control history ($Log$), - * and has an intuitive graphical user interface. - * Windows-Explorer integration Diff-Ext-for-KDiff3 - shell - extension included in installer (originally by Sergey Zorin; - see also Diff Ext) - * Read what else is special in a short abstract (PDF). +KDiff3 is a file and folder diff and merge tool which + * compares and merges two or three text input files or folders, + * shows the differences line by line and character by character(!), + * provides an automatic merge-facility, + * has an editor for comfortable solving of merge-conflicts, + * provides network transparency via KIO, + * option for highlight or hide changes in white-space or comments, + * supports Unicode, UTF-8 and other file encodings, + * prints differences, + * supports version control keyword and history merging. -NOTE: By default, a KDE version is compiled. If you prefer a Qt4-only -version, pass the script QT4ONLY=yes, like: +KDiff3 is a KDE Application +KDiff3 requires KDE Frameworks packages provided by Slackware + +NOTE: The historical Qt4-only build has not been ported to Qt5. -QT4ONLY=yes ./kdiff3.SlackBuild diff --git a/development/kdiff3/kdiff3.SlackBuild b/development/kdiff3/kdiff3.SlackBuild index 8613f93268..0abea60463 100644 --- a/development/kdiff3/kdiff3.SlackBuild +++ b/development/kdiff3/kdiff3.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=kdiff3 -VERSION=${VERSION:-0.9.98} +VERSION=${VERSION:-1.9.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,7 +73,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz +tar -xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -138,7 +138,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog README TODO \ +cp -a AUTHORS COPYING ChangeLog INSTALL README doc \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \; diff --git a/development/kdiff3/kdiff3.info b/development/kdiff3/kdiff3.info index 7dbb3a6be1..da9717962f 100644 --- a/development/kdiff3/kdiff3.info +++ b/development/kdiff3/kdiff3.info @@ -1,8 +1,8 @@ PRGNAM="kdiff3" -VERSION="0.9.98" -HOMEPAGE="http://kdiff3.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.98.tar.gz" -MD5SUM="b52f99f2cf2ea75ed5719315cbf77446" +VERSION="1.9.3" +HOMEPAGE="https://apps.kde.org/kdiff3/" +DOWNLOAD="https://download.kde.org/stable/kdiff3/kdiff3-1.9.3.tar.xz" +MD5SUM="7f90489aa8f1e62cb37a297c4d9788fd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/kdiff3/slack-desc b/development/kdiff3/slack-desc index 713ea8c8fe..703e43d15d 100644 --- a/development/kdiff3/slack-desc +++ b/development/kdiff3/slack-desc @@ -15,5 +15,5 @@ kdiff3: automatic merge-facility, has an editor for comfortable solving of kdiff3: merge-conflicts, provides network transparency via KIO, has options to kdiff3: highlight or hide changes in whitespace or comments, supports Unicode, kdiff3: UTF-8 and other file encodings, prints differences, supports version -kdiff3: control keyword and history merging -kdiff3: +kdiff3: control keyword and history merging. +kdiff3: homepage: https://apps.kde.org/kdiff3/ -- cgit v1.2.3-65-gdbad