diff options
| author | nia <nia@pkgsrc.org> | 2020-12-01 11:21:15 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-12-01 11:21:15 +0000 |
| commit | 552d2a46e56e0ee5ee257183299d66f2c96f2c2c (patch) | |
| tree | 2b4c45b99340a967ac41ed568920a6097449af3d /textproc | |
| parent | b96bfdb5a1b4ea581960d9a2be70d602296873f1 (diff) | |
| download | pkgsrc-552d2a46e56e0ee5ee257183299d66f2c96f2c2c.tar.gz | |
dwdiff: Update to 2.1.3
Version 2.1.3:
Bug fixes:
- Fixed compilation problems on GCC 10, due to multiple definition of the
same variable.
Diffstat (limited to 'textproc')
| -rw-r--r-- | textproc/dwdiff/Makefile | 5 | ||||
| -rw-r--r-- | textproc/dwdiff/distinfo | 11 | ||||
| -rw-r--r-- | textproc/dwdiff/patches/patch-src_definitions.h | 22 |
3 files changed, 30 insertions, 8 deletions
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile index a3b7da55b10..c8d03bc9f49 100644 --- a/textproc/dwdiff/Makefile +++ b/textproc/dwdiff/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2020/11/05 09:09:13 ryoon Exp $ +# $NetBSD: Makefile,v 1.4 2020/12/01 11:21:15 nia Exp $ -DISTNAME= dwdiff-2.1.2 -PKGREVISION= 1 +DISTNAME= dwdiff-2.1.3 CATEGORIES= textproc MASTER_SITES= https://os.ghalkes.nl/dist/ EXTRACT_SUFX= .tar.bz2 diff --git a/textproc/dwdiff/distinfo b/textproc/dwdiff/distinfo index d31fd431d06..d1d45d0747f 100644 --- a/textproc/dwdiff/distinfo +++ b/textproc/dwdiff/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1 2020/06/05 12:43:53 ryoon Exp $ +$NetBSD: distinfo,v 1.2 2020/12/01 11:21:15 nia Exp $ -SHA1 (dwdiff-2.1.2.tar.bz2) = f44d63d95e4df7e8acfeb57473552c0c15ca5a3b -RMD160 (dwdiff-2.1.2.tar.bz2) = 4fdb32536a86a4c08c5a01c1f83b62ad62bce091 -SHA512 (dwdiff-2.1.2.tar.bz2) = e4897ec3990261ddadf1fd4287902dd74c8350d11448714be8ea4b7808fc7d419ca2fd7fe65f347f46fdb1090d2d116c180a53fde3ff095027765f40acaa1c91 -Size (dwdiff-2.1.2.tar.bz2) = 79282 bytes +SHA1 (dwdiff-2.1.3.tar.bz2) = 301a6e5e7f101e418b0f524904e23409d04b13d1 +RMD160 (dwdiff-2.1.3.tar.bz2) = 853cc09ba21297b3b3e5232705c565b9bcdfe41d +SHA512 (dwdiff-2.1.3.tar.bz2) = e4375658ddb919d763bedacd122e5597a4c3cd40ddff2c954c6cc88e5047d20d4d3b18eaf75c6835be21e1f72e2622e25b212ae9882d8eaa36874af3f6de4b3f +Size (dwdiff-2.1.3.tar.bz2) = 79862 bytes SHA1 (patch-config.pkg) = d65cabaf94ebd0283ccce54b7e982e2b3395b59d +SHA1 (patch-src_definitions.h) = ba3feaf2ecbdbe7c330dd877d1b23e9bfbddd30d diff --git a/textproc/dwdiff/patches/patch-src_definitions.h b/textproc/dwdiff/patches/patch-src_definitions.h new file mode 100644 index 00000000000..8c5dd4947ef --- /dev/null +++ b/textproc/dwdiff/patches/patch-src_definitions.h @@ -0,0 +1,22 @@ +$NetBSD: patch-src_definitions.h,v 1.1 2020/12/01 11:21:16 nia Exp $ + +Avoid redefining bool. + +--- src/definitions.h.orig 2020-07-18 06:57:36.000000000 +0000 ++++ src/definitions.h +@@ -43,12 +43,10 @@ + + /*==== 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 ++#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L + #include <stdbool.h> ++#else ++typedef enum {false, true} bool; + #endif + + /*==== Configuration definitions ====*/ |