diff options
| author | kamil <kamil@pkgsrc.org> | 2019-10-25 10:18:03 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2019-10-25 10:18:03 +0000 |
| commit | 6a8d34f3f08ec55a8119020bae97df6b683cdd66 (patch) | |
| tree | 20da66514159d8484ed03c8953721951f7f4cf31 /wm | |
| parent | 86f14758acad0aa753efe288b335546459444c71 (diff) | |
| download | pkgsrc-6a8d34f3f08ec55a8119020bae97df6b683cdd66.tar.gz | |
icewm13: Fix build on NetBSD 9.99.17
Adapt the local patch for the POSIX iconv(3) API change in new NetBSD.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/icewm13/distinfo | 4 | ||||
| -rw-r--r-- | wm/icewm13/patches/patch-src_ylocale.cc | 21 |
2 files changed, 20 insertions, 5 deletions
diff --git a/wm/icewm13/distinfo b/wm/icewm13/distinfo index 7f48ad1db1a..9eb559991e4 100644 --- a/wm/icewm13/distinfo +++ b/wm/icewm13/distinfo @@ -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) = c283daa93d33270cc9a648e083fc75c8a695d59d 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 diff --git a/wm/icewm13/patches/patch-src_ylocale.cc b/wm/icewm13/patches/patch-src_ylocale.cc index ef0e06e2138..b4b8cd32d70 100644 --- a/wm/icewm13/patches/patch-src_ylocale.cc +++ b/wm/icewm13/patches/patch-src_ylocale.cc @@ -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)) |