[pkgsrc/pkgsrc-2004Q4]: pkgsrc/wm/icewm Pullup ticket 223 - requested by Juan RP

[snj <snj%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/768fdede2e17
branches:  pkgsrc-2004Q4
changeset: 485823:768fdede2e17
user:      snj <snj%pkgsrc.org@localhost>
date:      Mon Jan 17 21:15:45 2005 +0000

description:
Pullup ticket 223 - requested by Juan RP
build fix for icewm and friends

   Module Name:    pkgsrc
   Committed By:   xtraeme
   Date:           Thu Jan 13 01:31:53 UTC 2005

   Modified Files:
           pkgsrc/wm/icewm: Makefile distinfo
           pkgsrc/wm/icewm-gnome: Makefile
           pkgsrc/wm/icewm-imlib: Makefile
   Added Files:
           pkgsrc/wm/icewm/patches: patch-af

   Log Message:
   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.
---
   Module Name:    pkgsrc
   Committed By:   xtraeme
   Date:           Thu Jan 13 10:14:45 UTC 2005

   Modified Files:
           pkgsrc/wm/icewm: Makefile
           pkgsrc/wm/icewm-gnome: Makefile
           pkgsrc/wm/icewm-imlib: Makefile

   Log Message:
   There's no need to bumping PKGREVISION, because the packages were
   not building before, thanks jmmv.

diffstat:

 wm/icewm/distinfo         |   3 ++-
 wm/icewm/patches/patch-af |  24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletions(-)

diffs (41 lines):

diff -r 2a31dea3f26a -r 768fdede2e17 wm/icewm/distinfo
--- a/wm/icewm/distinfo Mon Jan 17 21:03:09 2005 +0000
+++ b/wm/icewm/distinfo Mon Jan 17 21:15:45 2005 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.20 2004/11/09 07:58:14 xtraeme Exp $
+$NetBSD: distinfo,v 1.20.2.1 2005/01/17 21:15:45 snj Exp $
 
 SHA1 (icewm-1.2.16.tar.gz) = 79f8e011fa601943714c034c06ae1654bb834c9e
 Size (icewm-1.2.16.tar.gz) = 947114 bytes
 SHA1 (patch-ac) = 2f04935c54e8ea8f6dccfe2c9b37c9c16df88bc6
 SHA1 (patch-ad) = 8efab7cb50ce5bdb7d218caa232ae501dd064424
 SHA1 (patch-ae) = 2b0fd5802595021440ac97c29de13f66e08e1190
+SHA1 (patch-af) = f73e8b5b0ab49de018a7a90ec0e394ee10b44965
diff -r 2a31dea3f26a -r 768fdede2e17 wm/icewm/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/icewm/patches/patch-af Mon Jan 17 21:15:45 2005 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.10.4.1 2005/01/17 21:15:45 snj 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;