diff options
| author | fredb <fredb@pkgsrc.org> | 2003-11-04 20:57:29 +0000 |
|---|---|---|
| committer | fredb <fredb@pkgsrc.org> | 2003-11-04 20:57:29 +0000 |
| commit | 05c55e8819d5fcc723060a9ea2777b2cd2c3f34c (patch) | |
| tree | 247de1292a7bbf5a46b5c7469bbefaa360a9fc20 /editors/abiword | |
| parent | 0f9865cb336fea9980e4574e439750360eaa03ef (diff) | |
| download | pkgsrc-05c55e8819d5fcc723060a9ea2777b2cd2c3f34c.tar.gz | |
Back out the last patch, which removed the conditional const-poisoning,
but rather, make it work. The "const" wasn't be-ing put in for either
NetBSD-current's or pkgsrc's libiconv, but both need it. This should close
PR pkg/23368.
Diffstat (limited to 'editors/abiword')
| -rw-r--r-- | editors/abiword/distinfo | 4 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-ac | 27 |
2 files changed, 16 insertions, 15 deletions
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index c8b7f3f8bac..6849e5be0da 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.20 2003/09/26 14:31:40 fredb Exp $ +$NetBSD: distinfo,v 1.21 2003/11/04 20:57:29 fredb Exp $ SHA1 (abisuite/abiword-1.0.5.tar.gz) = 29292d858dd361bd4ad10c98c32c5b8b5941110d Size (abisuite/abiword-1.0.5.tar.gz) = 18966097 bytes SHA1 (patch-ab) = 31f61d0a855db4dd9d3fa2c2ab1bae31fb03c636 -SHA1 (patch-ac) = 4b07508d1183a17b7659c1c67f62d69646bd4565 +SHA1 (patch-ac) = 8a4acdb50c024b747da2ac55945e2efc9ab6dee5 SHA1 (patch-ad) = 1b1cdab98c9b58b5395e0a43169fa54cac819b04 SHA1 (patch-ae) = a8fbe68e56bed6881329632bb12173cb67b8d750 SHA1 (patch-af) = 9bf0cb3abe338b7021acbf771b34b55bb7edcbae diff --git a/editors/abiword/patches/patch-ac b/editors/abiword/patches/patch-ac index 93087957930..56d20d645a0 100644 --- a/editors/abiword/patches/patch-ac +++ b/editors/abiword/patches/patch-ac @@ -1,15 +1,16 @@ -$NetBSD: patch-ac,v 1.8 2003/09/26 14:31:40 fredb Exp $ +$NetBSD: patch-ac,v 1.9 2003/11/04 20:57:29 fredb Exp $ ---- src/af/util/xp/ut_iconv.cpp.orig 2002-04-24 14:49:23.000000000 -0500 -+++ src/af/util/xp/ut_iconv.cpp -@@ -159,8 +159,8 @@ size_t UT_iconv( UT_iconv_t cd, const c - if ( !UT_iconv_isValid ( cd ) ) - return (size_t)-1; +--- src/af/util/xp/ut_types.h.orig 2002-03-20 11:44:26.000000000 -0600 ++++ src/af/util/xp/ut_types.h +@@ -242,7 +242,10 @@ ABI_EXPORT void * UT_calloc ( UT_uint32 + (defined (__MACH__) && defined (__APPLE__)) || \ + (defined(TARGET_OS_MAC) && TARGET_OS_MAC) || \ + defined(__BEOS__) || defined (__AIX__) || \ +-(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) ++(defined(__linux__) && defined(__powerpc__) && (__GLIBC__ <= 2) && (__GLIBC_MINOR__ <= 1)) || \ ++defined(__NetBSD__) || \ ++(defined(_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x0109) ++ -- ICONV_CONST char ** buf = (ICONV_CONST char**)(inbuf); -- return iconv( cd, buf, inbytesleft, outbuf, outbytesleft ); -+ // ICONV_CONST char ** buf = (ICONV_CONST char**)(inbuf); -+ return iconv( cd, inbuf, inbytesleft, outbuf, outbytesleft ); - } - - int UT_iconv_close( UT_iconv_t cd ) + #define ICONV_CONST const + #else |