CVS commit: pkgsrc/misc/tmux

["Jonathan Schleifer" <js%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   js
Date:           Sun Oct  5 10:53:23 UTC 2025

Modified Files:
        pkgsrc/misc/tmux: Makefile distinfo
Added Files:
        pkgsrc/misc/tmux/patches: patch-client.c patch-compat_imsg-buffer.c
            patch-proc.c patch-tmux.c

Log Message:
Make misc/tmux build on QNX

It only somewhat works so far. It starts and can be used, however it seems to
not play nice with QNX's terminal yet and there is corruption. It almost looks
like it gets the terminal size wrong.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/misc/tmux/Makefile
cvs rdiff -u -r1.59 -r1.60 pkgsrc/misc/tmux/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/misc/tmux/patches/patch-client.c
cvs rdiff -u -r0 -r1.1 pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c \
    pkgsrc/misc/tmux/patches/patch-proc.c \
    pkgsrc/misc/tmux/patches/patch-tmux.c

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

Modified files:

Index: pkgsrc/misc/tmux/Makefile
diff -u pkgsrc/misc/tmux/Makefile:1.67 pkgsrc/misc/tmux/Makefile:1.68
--- pkgsrc/misc/tmux/Makefile:1.67      Sun Oct 27 17:53:30 2024
+++ pkgsrc/misc/tmux/Makefile   Sun Oct  5 10:53:23 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2024/10/27 17:53:30 leot Exp $
+# $NetBSD: Makefile,v 1.68 2025/10/05 10:53:23 js Exp $
 
 DISTNAME=      tmux-3.5a
 CATEGORIES=    misc
@@ -40,7 +40,7 @@ BUILDLINK_TRANSFORM+= opt:-D_XPG4_2:-D_X
 CPPFLAGS+=     -D__DARWIN_VERS_1050=0
 .endif
 
-.if ${OPSYS} == "Darwin"
+.if ${OPSYS} == "Darwin" || ${OPSYS} == "QNX"
 CONFIGURE_ARGS+=       --enable-utf8proc
 .include "../../converters/utf8proc/buildlink3.mk"
 .endif

Index: pkgsrc/misc/tmux/distinfo
diff -u pkgsrc/misc/tmux/distinfo:1.59 pkgsrc/misc/tmux/distinfo:1.60
--- pkgsrc/misc/tmux/distinfo:1.59      Sun Oct 27 17:53:30 2024
+++ pkgsrc/misc/tmux/distinfo   Sun Oct  5 10:53:23 2025
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.59 2024/10/27 17:53:30 leot Exp $
+$NetBSD: distinfo,v 1.60 2025/10/05 10:53:23 js Exp $
 
 BLAKE2s (tmux-3.5a.tar.gz) = 9dc22390e1eee87b1c7f3edf102752edbc8bd9d669403ba539485ceaf6f0022a
 SHA512 (tmux-3.5a.tar.gz) = 2383e99aec2dcdb1d899793d5ecab40a68b921194f84770d3f4d19712bfc85590657a99d2a9a7bec36d4ba5ab39fa713f13937b0acad3b61cd9b2302dba61d43
 Size (tmux-3.5a.tar.gz) = 715619 bytes
+SHA1 (patch-client.c) = a3c6ab2922386acb21bd498e9639c1636c7422d0
 SHA1 (patch-compat_daemon-darwin.c) = e8feeb4b100e73ab197eb2fd776fa648a1da28e4
+SHA1 (patch-compat_imsg-buffer.c) = 1f9ab61e58f948a7af8d3fb84702a0b89dd357f5
 SHA1 (patch-compat_queue.h) = a65435dedb40f653f3c2650a6d2189743f5a6dcd
 SHA1 (patch-osdep-darwin.c) = 715b1e206add7d911edec381942706220ea2fbb6
+SHA1 (patch-proc.c) = 34a8b3d6d4913d94b323697c52fe5f786af65e10
+SHA1 (patch-tmux.c) = c864ac86eb9a3c2c1fe55ed5b1a32501cc71af4d

Added files:

Index: pkgsrc/misc/tmux/patches/patch-client.c
diff -u /dev/null pkgsrc/misc/tmux/patches/patch-client.c:1.3
--- /dev/null   Sun Oct  5 10:53:23 2025
+++ pkgsrc/misc/tmux/patches/patch-client.c     Sun Oct  5 10:53:23 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-client.c,v 1.3 2025/10/05 10:53:23 js Exp $
+
+--- client.c.orig      2024-10-02 08:41:47.000000000 +0000
++++ client.c
+@@ -32,6 +32,10 @@
+ 
+ #include "tmux.h"
+ 
++#ifndef SA_RESTART
++# define SA_RESTART 0
++#endif
++
+ static struct tmuxproc        *client_proc;
+ static struct tmuxpeer        *client_peer;
+ static uint64_t                client_flags;

Index: pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c
diff -u /dev/null pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c:1.1
--- /dev/null   Sun Oct  5 10:53:23 2025
+++ pkgsrc/misc/tmux/patches/patch-compat_imsg-buffer.c Sun Oct  5 10:53:23 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-compat_imsg-buffer.c,v 1.1 2025/10/05 10:53:23 js Exp $
+
+--- compat/imsg-buffer.c.orig  2024-01-17 10:56:43.000000000 +0000
++++ compat/imsg-buffer.c
+@@ -45,6 +45,10 @@
+ #undef be64toh
+ #define be64toh ntohll
+ 
++#if defined(__QNX__) && !defined(IOV_MAX)
++# define IOV_MAX 16
++#endif
++
+ static int    ibuf_realloc(struct ibuf *, size_t);
+ static void   ibuf_enqueue(struct msgbuf *, struct ibuf *);
+ static void   ibuf_dequeue(struct msgbuf *, struct ibuf *);
Index: pkgsrc/misc/tmux/patches/patch-proc.c
diff -u /dev/null pkgsrc/misc/tmux/patches/patch-proc.c:1.1
--- /dev/null   Sun Oct  5 10:53:23 2025
+++ pkgsrc/misc/tmux/patches/patch-proc.c       Sun Oct  5 10:53:23 2025
@@ -0,0 +1,15 @@
+$NetBSD: patch-proc.c,v 1.1 2025/10/05 10:53:23 js Exp $
+
+--- proc.c.orig        2024-02-13 10:16:07.000000000 +0000
++++ proc.c
+@@ -33,6 +33,10 @@
+ 
+ #include "tmux.h"
+ 
++#ifndef SA_RESTART
++# define SA_RESTART 0
++#endif
++
+ struct tmuxproc {
+       const char       *name;
+       int               exit;
Index: pkgsrc/misc/tmux/patches/patch-tmux.c
diff -u /dev/null pkgsrc/misc/tmux/patches/patch-tmux.c:1.1
--- /dev/null   Sun Oct  5 10:53:23 2025
+++ pkgsrc/misc/tmux/patches/patch-tmux.c       Sun Oct  5 10:53:23 2025
@@ -0,0 +1,27 @@
+$NetBSD: patch-tmux.c,v 1.1 2025/10/05 10:53:23 js Exp $
+
+--- tmux.c.orig        2024-10-05 05:57:07.000000000 +0000
++++ tmux.c
+@@ -22,7 +22,9 @@
+ 
+ #include <errno.h>
+ #include <fcntl.h>
+-#include <langinfo.h>
++#ifndef __QNX__
++# include <langinfo.h>
++#endif
+ #include <locale.h>
+ #include <pwd.h>
+ #include <signal.h>
+@@ -361,9 +363,11 @@ main(int argc, char **argv)
+           setlocale(LC_CTYPE, "C.UTF-8") == NULL) {
+               if (setlocale(LC_CTYPE, "") == NULL)
+                       errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
++#ifndef __QNX__
+               s = nl_langinfo(CODESET);
+               if (strcasecmp(s, "UTF-8") != 0 && strcasecmp(s, "UTF8") != 0)
+                       errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);
++#endif
+       }
+ 
+       setlocale(LC_TIME, "");