CVS commit: pkgsrc/wm/i3

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Mon Mar 23 13:09:14 UTC 2026

Modified Files:
        pkgsrc/wm/i3: distinfo
Added Files:
        pkgsrc/wm/i3/patches: patch-i3-config-wizard_main.c
            patch-libi3_get__process__filename.c patch-libi3_ucs2__conversion.c
            patch-src_sd-daemon.c

Log Message:
i3: Fix build on SunOS


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/wm/i3/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/wm/i3/patches/patch-i3-config-wizard_main.c
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/wm/i3/patches/patch-libi3_get__process__filename.c \
    pkgsrc/wm/i3/patches/patch-libi3_ucs2__conversion.c \
    pkgsrc/wm/i3/patches/patch-src_sd-daemon.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/wm/i3/distinfo
diff -u pkgsrc/wm/i3/distinfo:1.35 pkgsrc/wm/i3/distinfo:1.36
--- pkgsrc/wm/i3/distinfo:1.35  Thu Feb 19 10:20:00 2026
+++ pkgsrc/wm/i3/distinfo       Mon Mar 23 13:09:13 2026
@@ -1,10 +1,14 @@
-$NetBSD: distinfo,v 1.35 2026/02/19 10:20:00 wiz Exp $
+$NetBSD: distinfo,v 1.36 2026/03/23 13:09:13 nia Exp $
 
 BLAKE2s (i3-4.25.1.tar.xz) = 760bce3bd75e0585b2fa0d21473e348221660e1525fe9318f71e3ffb85ffa6b7
 SHA512 (i3-4.25.1.tar.xz) = 10d44f7efcfb23089edf5ec9783ddd3b9dca5592f4d5b101ec7158cd75ec73d917e3025250968c1c8e2d44c64d749855000a07b16059c582c1e80b1220ac7c81
 Size (i3-4.25.1.tar.xz) = 1357556 bytes
 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) = 78a15da32993c6ab24359eab539f96bbfbb3d998
 SHA1 (patch-meson.build) = 89ec2c7f594f8f13c13b522c7635cb59626554af
 SHA1 (patch-src_config.c) = 7985366b892f240379daa19d9b7baeddb22f66ee
 SHA1 (patch-src_log.c) = 19b33b43d1716ead4bad36e2afd52ff30af017c1
+SHA1 (patch-src_sd-daemon.c) = 94ea1d383c28a1156e60214f8da357ab9dd35af3

Added files:

Index: pkgsrc/wm/i3/patches/patch-i3-config-wizard_main.c
diff -u /dev/null pkgsrc/wm/i3/patches/patch-i3-config-wizard_main.c:1.3
--- /dev/null   Mon Mar 23 13:09:14 2026
+++ pkgsrc/wm/i3/patches/patch-i3-config-wizard_main.c  Mon Mar 23 13:09:13 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-i3-config-wizard_main.c,v 1.3 2026/03/23 13:09:13 nia Exp $
+
+Include <libgen.h> for mkdirp(3) on SunOS.
+
+--- i3-config-wizard/main.c.orig       2026-03-23 12:17:50.971594427 +0000
++++ i3-config-wizard/main.c
+@@ -36,6 +36,7 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <libgen.h>
+ 
+ #include <xcb/xcb.h>
+ #include <xcb/xcb_aux.h>

Index: pkgsrc/wm/i3/patches/patch-libi3_get__process__filename.c
diff -u /dev/null pkgsrc/wm/i3/patches/patch-libi3_get__process__filename.c:1.1
--- /dev/null   Mon Mar 23 13:09:14 2026
+++ pkgsrc/wm/i3/patches/patch-libi3_get__process__filename.c   Mon Mar 23 13:09:13 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-libi3_get__process__filename.c,v 1.1 2026/03/23 13:09:13 nia Exp $
+
+Include <libgen.h> for mkdirp(3) on SunOS.
+
+--- libi3/get_process_filename.c.orig  2026-02-06 07:30:55.000000000 +0000
++++ libi3/get_process_filename.c
+@@ -10,6 +10,7 @@
+ #include <err.h>
+ #include <pwd.h>
+ #include <stdlib.h>
++#include <libgen.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+ 
Index: pkgsrc/wm/i3/patches/patch-libi3_ucs2__conversion.c
diff -u /dev/null pkgsrc/wm/i3/patches/patch-libi3_ucs2__conversion.c:1.1
--- /dev/null   Mon Mar 23 13:09:14 2026
+++ pkgsrc/wm/i3/patches/patch-libi3_ucs2__conversion.c Mon Mar 23 13:09:13 2026
@@ -0,0 +1,50 @@
+$NetBSD: patch-libi3_ucs2__conversion.c,v 1.1 2026/03/23 13:09:13 nia Exp $
+
+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");
Index: pkgsrc/wm/i3/patches/patch-src_sd-daemon.c
diff -u /dev/null pkgsrc/wm/i3/patches/patch-src_sd-daemon.c:1.1
--- /dev/null   Mon Mar 23 13:09:14 2026
+++ pkgsrc/wm/i3/patches/patch-src_sd-daemon.c  Mon Mar 23 13:09:13 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_sd-daemon.c,v 1.1 2026/03/23 13:09:13 nia Exp $
+
+Use standard header for fcntl(2). Fixes implicit function declaration
+on SunOS.
+
+--- src/sd-daemon.c.orig       2026-03-23 12:18:14.370782640 +0000
++++ src/sd-daemon.c
+@@ -37,7 +37,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/fcntl.h>
++#include <fcntl.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>