CVS commit: pkgsrc/wm/icewm

["David H. Gutteridge" <gutteridge%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gutteridge
Date:           Thu Jun 13 22:24:46 UTC 2024

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

Log Message:
icewm: fix building on older NetBSD and SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/wm/icewm/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/wm/icewm/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/icewm/distinfo
diff -u pkgsrc/wm/icewm/distinfo:1.46 pkgsrc/wm/icewm/distinfo:1.47
--- pkgsrc/wm/icewm/distinfo:1.46       Thu Jun  6 14:16:23 2024
+++ pkgsrc/wm/icewm/distinfo    Thu Jun 13 22:24:46 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.46 2024/06/06 14:16:23 ktnb Exp $
+$NetBSD: distinfo,v 1.47 2024/06/13 22:24:46 gutteridge Exp $
 
 BLAKE2s (icewm-3.5.0.tar.gz) = 6b84dedaa05bfc27d1cf0f72f9dd3a7f8e24b4537a23dcc696115242ea10fac0
 SHA512 (icewm-3.5.0.tar.gz) = 0d0bb2a87062a04c09d49c0eafefa076055a980255410b5fe06fcf03fa26a60555d0ea6c814e995a38fc1a8534c645f74527e481194ea5f51ef4f24074da914e
 Size (icewm-3.5.0.tar.gz) = 2475492 bytes
 SHA1 (patch-doc_Makefile.am) = de2c5b3cd65c500af315bb86313507db474684e0
+SHA1 (patch-src_ylocale.cc) = 6456b3fec5f8d11f03898a7206f600316ca8d0e8

Added files:

Index: pkgsrc/wm/icewm/patches/patch-src_ylocale.cc
diff -u /dev/null pkgsrc/wm/icewm/patches/patch-src_ylocale.cc:1.1
--- /dev/null   Thu Jun 13 22:24:46 2024
+++ pkgsrc/wm/icewm/patches/patch-src_ylocale.cc        Thu Jun 13 22:24:46 2024
@@ -0,0 +1,43 @@
+$NetBSD: patch-src_ylocale.cc,v 1.1 2024/06/13 22:24:46 gutteridge Exp $
+
+Fix building on older NetBSD and SunOS, which don't have a POSIX-
+compliant iconv(3) signature.
+
+--- src/ylocale.cc.orig        2024-05-20 14:51:49.000000000 +0000
++++ src/ylocale.cc
+@@ -26,6 +26,15 @@
+ #include <X11/Xlib.h>
+ #include <iconv.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
++
+ const iconv_t invalid = iconv_t(-1);
+ 
+ class YConverter {
+@@ -194,6 +203,9 @@ char* YLocale::localeString(const wchar_
+ 
+     size_t lSize = 4 * uLen;
+     char* lStr = new char[lSize + 1];
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++    const
++#endif
+     char* inbuf = (char *) uStr;
+     char* outbuf = lStr;
+     size_t inlen = uLen * sizeof(wchar_t);
+@@ -227,6 +239,9 @@ wchar_t* YLocale::unicodeString(const ch
+     iconv(instance->converter->unicode(), nullptr, nullptr, nullptr, nullptr);
+ 
+     wchar_t* uStr(new wchar_t[lLen + 1]);
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++    const
++#endif
+     char* inbuf(const_cast<char *>(lStr));
+     char* outbuf(reinterpret_cast<char *>(uStr));
+     size_t inlen(lLen), outlen(4 * lLen);