misc/dwdiff: Updated for version 2.0.1.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
This commit is contained in:
slakmagik 2011-11-13 02:25:36 -06:00 committed by Robby Workman
parent f87812f367
commit 7ac98e752d
5 changed files with 36 additions and 21 deletions

View file

@ -1,12 +1,11 @@
dwdiff is a front-end for the diff program that operates at the word
level instead of the line level. It is different from wdiff in that it
allows the user to specify what should be considered whitespace, and in
that it takes an optional list of characters that should be considered
delimiters. Delimiters are single characters that are treated as if they
are words, even when there is no whitespace separating them from
preceding words or delimiters. dwdiff is mostly commandline compatible
with wdiff. Only the --autopager, --terminal and --avoid-wraps options
are not supported.
dwdiff is a diff program that operates at the word level instead of the
line level. It is different from wdiff in that it allows the user to
specify what should be considered whitespace, and in that it takes an
optional list of characters that should be considered delimiters.
Delimiters are single characters that are treated as if they are words,
even when there is no whitespace separating them from preceding words or
delimiters. dwdiff is mostly commandline compatible with wdiff. Only the
--autopager, --terminal and --avoid-wraps options are not supported.
The default output from dwdiff is the new text, with the deleted and
inserted parts annotated with markers. Command line options are

View file

@ -0,0 +1,13 @@
diff -Naurp dwdiff-2.0.1.orig/src/doDiff.c dwdiff-2.0.1/src/doDiff.c
--- dwdiff-2.0.1.orig/src/doDiff.c 2011-10-26 14:32:22.000000000 -0400
+++ dwdiff-2.0.1/src/doDiff.c 2011-10-27 00:34:59.785336664 -0400
@@ -190,7 +190,9 @@ static void handleNextWhitespace(InputFi
whitespace.
*/
static void handleSynchronizedNextWhitespace(bool printNew) {
+#ifdef USE_UNICODE
static_assert(CRLF_GRAPHEME_CLUSTER_BREAK == 0);
+#endif
bool BValid = true;
unsigned int *lineNumberA, *lineNumberB;

View file

@ -5,7 +5,7 @@
# Released under the WTFPL
PRGNAM=dwdiff
VERSION=${VERSION:-1.9}
VERSION=${VERSION:-2.0.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@ -58,6 +58,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \
-o -perm 400 \) -exec chmod 644 {} \;
# Patch for a build failure if not building with unicode.
patch -p1 < $CWD/doDiff.c.patch
# This is one messed up makefile - and its configure doesn't accept '--build'
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \

View file

@ -1,8 +1,8 @@
PRGNAM="dwdiff"
VERSION="1.9"
VERSION="2.0.1"
HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
DOWNLOAD="http://os.ghalkes.nl/dist/dwdiff-1.9.tgz"
MD5SUM="f483d8d8dab7a972ef21d5096e07fd47"
DOWNLOAD="http://os.ghalkes.nl/dist/dwdiff-2.0.1.tgz"
MD5SUM="1d87b54187515ecbfa803df505999e79"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="slakmagik"

View file

@ -6,14 +6,14 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
dwdiff: dwdiff (word-level front-end for diff)
dwdiff: dwdiff (word-level diff program)
dwdiff:
dwdiff: dwdiff is a front-end for the diff program that operates at the word
dwdiff: level instead of the line level. It is different from wdiff in that
dwdiff: it allows the user to specify what should be considered whitespace,
dwdiff: and in that it takes an optional list of characters that should
dwdiff: be considered delimiters. Delimiters are single characters that
dwdiff: are treated as if they are words, even when there is no whitespace
dwdiff: separating them from preceding words or delimiters.
dwdiff: dwdiff is a diff program that operates at the word level instead of
dwdiff: the line level. It is different from wdiff in that it allows the
dwdiff: user to specify what should be considered whitespace, and in that
dwdiff: it takes an optional list of characters that should be considered
dwdiff: delimiters. Delimiters are single characters that are treated as if
dwdiff: they are words, even when there is no whitespace separating them
dwdiff: from preceding words or delimiters.
dwdiff:
dwdiff: Homepage: http://os.ghalkes.nl/dwdiff.html