Received: by mail.netbsd.org (Postfix, from userid 605) id E34A784E0A; Fri, 25 Oct 2019 10:21:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 6C8E384DFF for ; Fri, 25 Oct 2019 10:21:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id E1ctgA4MikPc for ; Fri, 25 Oct 2019 10:21:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id DBBB084D3A for ; Fri, 25 Oct 2019 10:21:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D581AFA89; Fri, 25 Oct 2019 10:21:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1571998892269530" MIME-Version: 1.0 Date: Fri, 25 Oct 2019 10:21:32 +0000 From: "Kamil Rytarowski" Subject: CVS commit: pkgsrc/wm/icewm14 To: pkgsrc-changes@NetBSD.org Reply-To: kamil@netbsd.org X-Mailer: log_accum Message-Id: <20191025102132.D581AFA89@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1571998892269530 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: kamil Date: Fri Oct 25 10:21:32 UTC 2019 Modified Files: pkgsrc/wm/icewm14: distinfo pkgsrc/wm/icewm14/patches: patch-src_ylocale.cc Log Message: icewm14: 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.2 -r1.3 pkgsrc/wm/icewm14/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/wm/icewm14/patches/patch-src_ylocale.cc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1571998892269530 Content-Disposition: inline Content-Length: 2717 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/wm/icewm14/distinfo diff -u pkgsrc/wm/icewm14/distinfo:1.2 pkgsrc/wm/icewm14/distinfo:1.3 --- pkgsrc/wm/icewm14/distinfo:1.2 Wed Nov 28 16:24:54 2018 +++ pkgsrc/wm/icewm14/distinfo Fri Oct 25 10:21:32 2019 @@ -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) = a8e70da376 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 Index: pkgsrc/wm/icewm14/patches/patch-src_ylocale.cc diff -u pkgsrc/wm/icewm14/patches/patch-src_ylocale.cc:1.1 pkgsrc/wm/icewm14/patches/patch-src_ylocale.cc:1.2 --- pkgsrc/wm/icewm14/patches/patch-src_ylocale.cc:1.1 Thu Nov 1 09:25:29 2018 +++ pkgsrc/wm/icewm14/patches/patch-src_ylocale.cc Fri Oct 25 10:21:32 2019 @@ -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 ++#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 #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(&inbuf), &inlen, &outbuf, &outlen)) +#else if (0 > (int) iconv(instance->toUnicode, &inbuf, &inlen, &outbuf, &outlen)) --_----------=_1571998892269530--