i3: Fix iconv usage

Author: alarixnia

wm/i3/distinfo

@@ -7,6 +7,7 @@ SHA1 (patch-etc_config) = d3f649e8d4dc7cae7eb3c1548fa8d81224e4dacb
 SHA1 (patch-etc_config.keycodes) = 6adde0b3a56576805facd951fa9d32bfd6c88011
 SHA1 (patch-i3-config-wizard_main.c) = 79e7b2f63f893357b808a6ce8ee28d3a501efed2
 SHA1 (patch-libi3_get__process__filename.c) = 7de46b0f26aa46ed6864ffd1cc5850ec6315c7a8
+SHA1 (patch-libi3_ucs2__conversion.c) = 1e9360f959100061853d1913baa23d932f4a63a7
 SHA1 (patch-meson.build) = 89ec2c7f594f8f13c13b522c7635cb59626554af
 SHA1 (patch-src_config.c) = 7985366b892f240379daa19d9b7baeddb22f66ee
 SHA1 (patch-src_log.c) = 19b33b43d1716ead4bad36e2afd52ff30af017c1

wm/i3/patches/patch-libi3_ucs2__conversion.c

@@ -0,0 +1,50 @@
+$NetBSD$
+
+Fix iconv usage on SunOS and older NetBSD.
+
+--- libi3/ucs2_conversion.c.orig	2026-02-06 07:30:55.000000000 +0000
++++ libi3/ucs2_conversion.c
+@@ -12,6 +12,15 @@
+ #include <stdlib.h>
+ #include <string.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
++
+ static iconv_t utf8_conversion_descriptor = (iconv_t)-1;
+ static iconv_t ucs2_conversion_descriptor = (iconv_t)-1;
+ 
+@@ -42,8 +51,13 @@ char *convert_ucs2_to_utf8(xcb_char2b_t 
+ 
+     /* Do the conversion */
+     size_t input_len = num_glyphs * sizeof(xcb_char2b_t);
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++    size_t rc = iconv(utf8_conversion_descriptor, (const char **)&text,
++                      &input_len, &output, &output_size);
++#else
+     size_t rc = iconv(utf8_conversion_descriptor, (char **)&text,
+                       &input_len, &output, &output_size);
++#endif
+     if (rc == (size_t)-1) {
+         perror("Converting to UTF-8 failed");
+         free(buffer);
+@@ -89,8 +103,13 @@ xcb_char2b_t *convert_utf8_to_ucs2(char 
+     }
+ 
+     /* Do the conversion */
++#if (defined(__NetBSD__) && !NETBSD_POSIX_ICONV) || defined(__sun)
++    size_t rc = iconv(ucs2_conversion_descriptor, (const char *)&input, &input_size,
++                      (char **)&output, &output_bytes_left);
++#else
+     size_t rc = iconv(ucs2_conversion_descriptor, &input, &input_size,
+                       (char **)&output, &output_bytes_left);
++#endif
+     if (rc == (size_t)-1) {
+         /* Conversion will only be partial. */
+         perror("Converting to UCS-2 failed");