diff options
| author | adam <adam@pkgsrc.org> | 2005-04-07 07:52:21 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2005-04-07 07:52:21 +0000 |
| commit | e23f360c62fc136e5af29ef22ef007c635bd08f1 (patch) | |
| tree | 6ddff5c1e3ac420932ba76a08246b3db5a50da4a /editors | |
| parent | 741c7890179033e1a722abd2e58ffe1e4d47c4d8 (diff) | |
| download | pkgsrc-e23f360c62fc136e5af29ef22ef007c635bd08f1.tar.gz | |
patch-ab rewritten as it should be :]
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/abiword/distinfo | 4 | ||||
| -rw-r--r-- | editors/abiword/patches/patch-ab | 21 |
2 files changed, 13 insertions, 12 deletions
diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo index 50908e768ad..f65787da4b2 100644 --- a/editors/abiword/distinfo +++ b/editors/abiword/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.39 2005/04/04 15:33:30 adam Exp $ +$NetBSD: distinfo,v 1.40 2005/04/07 07:52:21 adam Exp $ SHA1 (abiword-2.2.6.tar.bz2) = c653db8e263a121588751b11f797b450979760f6 RMD160 (abiword-2.2.6.tar.bz2) = c8ddc28301b64e995f188b7251911f120fec5ce9 Size (abiword-2.2.6.tar.bz2) = 23895455 bytes SHA1 (patch-aa) = e54908d64747a3fc78e13036ebbd909b2b1b64aa -SHA1 (patch-ab) = 5957635eb05d4b6f9d623c8585ae252d9c484408 +SHA1 (patch-ab) = 927cbe95f5ea892d57ead96938d631ee1ad2c9a3 SHA1 (patch-ad) = c3191d8e0e510708d9ab22ee9c6d28a655e031c5 SHA1 (patch-ae) = 5eab37824f36bfd21238d5cd11507062ac8dccdb diff --git a/editors/abiword/patches/patch-ab b/editors/abiword/patches/patch-ab index 4cfa0ff31c7..ed5b3b0f508 100644 --- a/editors/abiword/patches/patch-ab +++ b/editors/abiword/patches/patch-ab @@ -1,13 +1,14 @@ -$NetBSD: patch-ab,v 1.10 2005/01/11 11:09:27 adam Exp $ +$NetBSD: patch-ab,v 1.11 2005/04/07 07:52:21 adam Exp $ ---- src/af/util/xp/ut_iconv.cpp.orig 2004-11-22 10:42:04.000000000 +0000 +--- src/af/util/xp/ut_iconv.cpp.orig 2004-09-17 03:02:57.000000000 +0000 +++ src/af/util/xp/ut_iconv.cpp -@@ -339,7 +339,7 @@ size_t UT_iconv( UT_iconv_t cd, const ch - #ifdef UT_ICONV_USING_GLIB - return g_iconv((GIConv)cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft); - #else -- return iconv( (iconv_t)cd, (ICONV_CONST char **)inbuf, inbytesleft, outbuf, outbytesleft ); -+ return iconv( (iconv_t)cd, (const char **)inbuf, inbytesleft, outbuf, outbytesleft ); - #endif - } +@@ -68,7 +68,8 @@ extern "C" { + (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) + #define ICONV_CONST const + #else |