diff options
| author | kamil <kamil@pkgsrc.org> | 2019-10-25 10:21:32 +0000 |
|---|---|---|
| committer | kamil <kamil@pkgsrc.org> | 2019-10-25 10:21:32 +0000 |
| commit | 4f84adcdc639182768b3af408b903a567f95038d (patch) | |
| tree | 7c42cbce704844dde47f83df5627cf00bcbc4937 /wm | |
| parent | ce169533b6285befcae878b81898b6014127d6f7 (diff) | |
| download | pkgsrc-4f84adcdc639182768b3af408b903a567f95038d.tar.gz | |
icewm14: 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/icewm14/distinfo | 4 | ||||
| -rw-r--r-- | wm/icewm14/patches/patch-src_ylocale.cc | 25 |
2 files changed, 22 insertions, 7 deletions
diff --git a/wm/icewm14/distinfo b/wm/icewm14/distinfo index 48b54ed879b..c41b5bb9d30 100644 --- a/wm/icewm14/distinfo +++ b/wm/icewm14/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2018/11/28 16:24:54 jperkin Exp $ +$NetBSD: distinfo,v 1.3 2019/10/25 10:21:32 kamil Exp $ SHA1 (icewm-1.4.2.tar.bz2) = d1f9af531fec7beaa334db9c0e4764b9e40bbacd RMD160 (icewm-1.4.2.tar.bz2) = 6aaabad0c235901556951c9d88178adf15e29f51 @@ -11,4 +11,4 @@ SHA1 (patch-src_icetray.cc) = a8e70da376e13be187037f190c672b8b75fd287b SHA1 (patch-src_wmapp.cc) = fdabb4348c1dc55d390c942f34aa0fb597f49fc0 SHA1 (patch-src_wpixres.cc) = aeb0b6423a48e0f3b4074baa2a0a0c9e52e9d8ed SHA1 (patch-src_yapp.cc) = f3c8e1d6d0830d4b95d131af37a1f394737a3c48 -SHA1 (patch-src_ylocale.cc) = 72f29d57d3f238c41fa93997724cc7cc8fd5f6f6 +SHA1 (patch-src_ylocale.cc) = 099296135053df781bd3755f9947d34d52fd3020 diff --git a/wm/icewm14/patches/patch-src_ylocale.cc b/wm/icewm14/patches/patch-src_ylocale.cc index ce19f8a71fd..e42d9f9bc58 100644 --- a/wm/icewm14/patches/patch-src_ylocale.cc +++ b/wm/icewm14/patches/patch-src_ylocale.cc @@ -1,8 +1,23 @@ -$NetBSD: patch-src_ylocale.cc,v 1.1 2018/11/01 09:25:29 bsiegert Exp $ +$NetBSD: patch-src_ylocale.cc,v 1.2 2019/10/25 10:21:32 kamil Exp $ ---- src/ylocale.cc.orig 2017-07-30 08:53:35.000000000 +0000 +--- src/ylocale.cc.orig 2017-07-30 08:53:35.524267864 +0000 +++ src/ylocale.cc -@@ -55,6 +55,8 @@ YLocale::YLocale(char const * localeName +@@ -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); +@@ -55,6 +63,8 @@ YLocale::YLocale(char const * localeName int const codesetItems[] = { #ifdef CONFIG_NL_CODESETS CONFIG_NL_CODESETS @@ -11,11 +26,11 @@ $NetBSD: patch-src_ylocale.cc,v 1.1 2018/11/01 09:25:29 bsiegert Exp $ #else CODESET, _NL_CTYPE_CODESET_NAME, 0 #endif -@@ -159,7 +161,11 @@ YUChar *YLocale::unicodeString(const YLC +@@ -159,7 +169,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)) |