CVS commit: pkgsrc/wm/icewm

["Kamil Rytarowski" <kamil%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Oct 25 10:14:20 UTC 2019

Modified Files:
        pkgsrc/wm/icewm: distinfo
        pkgsrc/wm/icewm/patches: patch-aa

Log Message:
icewm: Fix build on NetBSD 9.99.17

Adapt the local patch for the POSIX iconv(3) API change in new NetBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/wm/icewm/distinfo
cvs rdiff -u -r1.12 -r1.13 pkgsrc/wm/icewm/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/icewm/distinfo
diff -u pkgsrc/wm/icewm/distinfo:1.42 pkgsrc/wm/icewm/distinfo:1.43
--- pkgsrc/wm/icewm/distinfo:1.42       Thu Nov 22 04:56:03 2018
+++ pkgsrc/wm/icewm/distinfo    Fri Oct 25 10:14:20 2019
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.42 2018/11/22 04:56:03 ryo Exp $
+$NetBSD: distinfo,v 1.43 2019/10/25 10:14:20 kamil Exp $
 
 SHA1 (icewm-1.2.38pre2.tar.gz) = e0fa0ac454c8a7bbe850f114e9a0a82082516da3
 RMD160 (icewm-1.2.38pre2.tar.gz) = e2b3fefdae7e1d368920e84d175058e3fe7c8d93
 SHA512 (icewm-1.2.38pre2.tar.gz) = c86e9a3ab0fca4543c7c6d479f49e854fc28f90f4cf11acc01f4d5124b64900ec73fdc2612c77e1c856ee526869c27634555b515679020b5127584994bcf7f28
 Size (icewm-1.2.38pre2.tar.gz) = 854190 bytes
-SHA1 (patch-aa) = f8293eb29bffc657e6ae322a944c9c7416ce6687
+SHA1 (patch-aa) = e89e30c88bec0a1f5ce9c184205c5a2a3e652b62
 SHA1 (patch-ad) = 04dbb91c1486d6aa493fffa2661f330347153fe5
 SHA1 (patch-aj) = aa357c56d3165f36a347133cf11cc299438617e9
 SHA1 (patch-ak) = 8f96d98019071522cd8a9196a029842410e4ede1

Index: pkgsrc/wm/icewm/patches/patch-aa
diff -u pkgsrc/wm/icewm/patches/patch-aa:1.12 pkgsrc/wm/icewm/patches/patch-aa:1.13
--- pkgsrc/wm/icewm/patches/patch-aa:1.12       Sun Jan  5 12:29:33 2014
+++ pkgsrc/wm/icewm/patches/patch-aa    Fri Oct 25 10:14:20 2019
@@ -1,14 +1,29 @@
-$NetBSD: patch-aa,v 1.12 2014/01/05 12:29:33 ryoon Exp $
+$NetBSD: patch-aa,v 1.13 2019/10/25 10:14:20 kamil Exp $
 
 * Support NetBSD's iconv(3)
 
---- src/ylocale.cc.orig        2008-01-05 07:34:25.000000000 +0000
+--- src/ylocale.cc.orig        2009-11-08 18:59:46.000000000 +0000
 +++ src/ylocale.cc
-@@ -152,7 +152,11 @@ YUChar *YLocale::unicodeString(const YLC
+@@ -28,6 +28,14 @@
+ #include "ylib.h"
+ #include "yprefs.h"
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#else
++#define NETBSD_POSIX_ICONV 0
++#endif
++#endif
+ 
+ #ifdef CONFIG_I18N
+ YLocale * YLocale::instance(NULL);
+@@ -152,7 +160,11 @@ YUChar *YLocale::unicodeString(const YLC
      char * inbuf((char *) lStr), * outbuf((char *) uStr);
      size_t inlen(lLen), outlen(4 * lLen);
  
-+#if defined(__NetBSD__) || defined(__sun)
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
 +    if (0 > (int) iconv(instance->toUnicode, const_cast<const char **>(&inbuf), &inlen, &outbuf, &outlen))
 +#else
      if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen))