Date: Saturday, December 19, 2020 @ 10:46:14 Author: felixonmars Revision: 779940
archrelease: copy trunk to community-staging-x86_64 Added: dwdiff/repos/community-staging-x86_64/ dwdiff/repos/community-staging-x86_64/PKGBUILD (from rev 779939, dwdiff/trunk/PKGBUILD) dwdiff/repos/community-staging-x86_64/icu68.patch (from rev 779939, dwdiff/trunk/icu68.patch) -------------+ PKGBUILD | 31 +++++++++++++++++++++++++++++++ icu68.patch | 26 ++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) Copied: dwdiff/repos/community-staging-x86_64/PKGBUILD (from rev 779939, dwdiff/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2020-12-19 10:46:14 UTC (rev 779940) @@ -0,0 +1,31 @@ +# Maintainer: Kyle Keen <keen...@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+a...@gmail.com> + +pkgname=dwdiff +pkgver=2.1.3 +pkgrel=2 +pkgdesc="A front-end for the diff program that operates at the word level instead of the line level" +arch=('x86_64') +url="https://os.ghalkes.nl/dwdiff.html" +depends=('diffutils' 'icu') +license=('GPL') +source=("https://os.ghalkes.nl/dist/$pkgname-$pkgver.tar.bz2" + icu68.patch) +sha256sums=('211ddbfaa2e6fcc85d5c88b5141c62a22a13ed0fecffc22fe6dded07e4cf2382' + 'b4248cedec5eec8ff280244e41c3450d302a47e50ec126b4dfdd91d7131dd941') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + patch -Np0 -i ../icu68.patch +} + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --without-dwfilter + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make prefix="$pkgdir"/usr install +} Copied: dwdiff/repos/community-staging-x86_64/icu68.patch (from rev 779939, dwdiff/trunk/icu68.patch) =================================================================== --- community-staging-x86_64/icu68.patch (rev 0) +++ community-staging-x86_64/icu68.patch 2020-12-19 10:46:14 UTC (rev 779940) @@ -0,0 +1,26 @@ +Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844 + +In file included from src/unicode.c:21: +src/definitions.h:48:15: error: expected identifier +typedef enum {false, true} bool; + ^ +/usr/include/stdbool.h:36:15: note: expanded from macro 'false' +#define false 0 + ^ + +--- src/definitions.h.orig 2020-07-18 06:57:36 UTC ++++ src/definitions.h +@@ -43,13 +43,7 @@ + + /*==== Misc definitions ====*/ + /* Define a bool type if not already defined (C++ and C99 do)*/ +-#if !(defined(__cplusplus) || (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L)) +-/*@-incondefs@*/ +-typedef enum {false, true} bool; +-/*@+incondefs@*/ +-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 19990601L + #include <stdbool.h> +-#endif + + /*==== Configuration definitions ====*/ + #ifndef NO_STRDUP