diff options
author | xtraeme <xtraeme@pkgsrc.org> | 2005-01-13 01:31:53 +0000 |
---|---|---|
committer | xtraeme <xtraeme@pkgsrc.org> | 2005-01-13 01:31:53 +0000 |
commit | 8e381a892bc89c94269a45da5e48b14615a67be4 (patch) | |
tree | f5334a9f6f27c61a64d97a68a74b3c647814d5d7 /wm/icewm/patches/patch-af | |
parent | 24d8983a46632ef01b15b95d78f5856e20af5f55 (diff) | |
download | pkgsrc-8e381a892bc89c94269a45da5e48b14615a67be4.tar.gz |
Fix the icewm* packages on NetBSD >= 2.0 (with native iconv(3)), the
problem was that the prototype used by this was not matching the NetBSD
one, which uses ``const char **'' as its second argument, when libiconv
and POSIX uses ``char **''.
This closes PR pkg/28693.
Bumped PKGREVISION to all icewm* pkgs for the bulk builds.
Diffstat (limited to 'wm/icewm/patches/patch-af')
-rw-r--r-- | wm/icewm/patches/patch-af | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/wm/icewm/patches/patch-af b/wm/icewm/patches/patch-af new file mode 100644 index 00000000000..5720d0a3851 --- /dev/null +++ b/wm/icewm/patches/patch-af @@ -0,0 +1,24 @@ +$NetBSD: patch-af,v 1.11 2005/01/13 01:31:53 xtraeme Exp $ + +--- src/ylocale.cc.orig 2004-08-16 06:58:31.000000000 +0200 ++++ src/ylocale.cc 2005-01-13 02:25:55.000000000 +0100 +@@ -15,6 +15,7 @@ + + #include "intl.h" + #include <string.h> ++#include <sys/param.h> /* __NetBSD_Version__ */ + + #ifdef CONFIG_I18N + #include <errno.h> +@@ -152,7 +153,11 @@ + char * inbuf((char *) lStr), * outbuf((char *) uStr); + size_t inlen(lLen), outlen(4 * lLen); + ++#if __NetBSD_Version__ >= 200000000 ++ if (0 > (int) iconv(instance->toUnicode, (const char **)&inbuf, &inlen, &outbuf, &outlen)) ++#else + if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) ++#endif + warn(_("Invalid multibyte string \"%s\": %s"), lStr, strerror(errno)); + + *((YUChar *) outbuf) = 0; |