CVS commit: pkgsrc/wm/icewm13

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

Module Name:    pkgsrc
Committed By:   kamil
Date:           Fri Oct 25 10:18:03 UTC 2019

Modified Files:
        pkgsrc/wm/icewm13: distinfo
        pkgsrc/wm/icewm13/patches: patch-src_ylocale.cc

Log Message:
icewm13: 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.3 -r1.4 pkgsrc/wm/icewm13/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/icewm13/patches/patch-src_ylocale.cc

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

Modified files:

Index: pkgsrc/wm/icewm13/distinfo
diff -u pkgsrc/wm/icewm13/distinfo:1.3 pkgsrc/wm/icewm13/distinfo:1.4
--- pkgsrc/wm/icewm13/distinfo:1.3      Thu Nov 22 04:56:03 2018
+++ pkgsrc/wm/icewm13/distinfo  Fri Oct 25 10:18:03 2019
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2018/11/22 04:56:03 ryo Exp $
+$NetBSD: distinfo,v 1.4 2019/10/25 10:18:03 kamil Exp $
 
 SHA1 (icewm-1.3.8.tar.gz) = dc9155227129be14aced00c24c572356e0fa5cd8
 RMD160 (icewm-1.3.8.tar.gz) = cacf40e529a10ab8eb33961236432efd080e81b6
@@ -8,4 +8,4 @@ SHA1 (patch-Makefile.in) = c283daa93d332
 SHA1 (patch-src_wmapp.cc) = a2a7cf6d5b1f12e2e6a832b7cd1e320a7be4f055
 SHA1 (patch-src_wmtaskbar.cc) = 5e536a60b9d0a604369f6cc3010e7f577f103d5d
 SHA1 (patch-src_yimage.cc) = 5d825354579d05844986192dc55b5a27eac4483c
-SHA1 (patch-src_ylocale.cc) = 193d3c8b59175855054d3e825b2da4ea0c968123
+SHA1 (patch-src_ylocale.cc) = e4fa369d717248cc6c04193bfee828ee2c394709

Index: pkgsrc/wm/icewm13/patches/patch-src_ylocale.cc
diff -u pkgsrc/wm/icewm13/patches/patch-src_ylocale.cc:1.1 pkgsrc/wm/icewm13/patches/patch-src_ylocale.cc:1.2
--- pkgsrc/wm/icewm13/patches/patch-src_ylocale.cc:1.1  Sun Jan  5 12:33:26 2014
+++ pkgsrc/wm/icewm13/patches/patch-src_ylocale.cc      Fri Oct 25 10:18:03 2019
@@ -1,12 +1,27 @@
-$NetBSD: patch-src_ylocale.cc,v 1.1 2014/01/05 12:33:26 ryoon Exp $
+$NetBSD: patch-src_ylocale.cc,v 1.2 2019/10/25 10:18:03 kamil Exp $
 
 --- src/ylocale.cc.orig        2013-11-17 16:54:39.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))