From: Yozo TODA <yozo@v007.vaio.ne.jp>
Subject: japanese/kterm fix for llvm22 (Re: [llvm22] Breakage 2026-05-28)
To: ports@openbsd.org
Date: Fri, 05 Jun 2026 01:45:12 +0900

> This was from the last experimental build before the LLVM 22 update
> was committed to base.
>
> http://build-failures.rhaalovely.net/amd64-clang/2026-05-28/
>
........
> japanese/kterm                      ports@

as a minimum fix to build kterm with LLVM22,
we only need to update patch-screen_c.

anyone please confirm and commit this?

-- yozo.

============================================================

diff -ur -x CVS -x *.orig /usr/ports/japanese/kterm/Makefile ./Makefile
--- /usr/ports/japanese/kterm/Makefile	Tue Sep 26 02:07:31 2023
+++ ./Makefile	Fri Jun  5 01:35:38 2026
@@ -3,7 +3,7 @@
 VERSION=	6.2.0
 DISTNAME=	kterm-${VERSION}
 PKGNAME=	ja-kterm-${VERSION}
-REVISION=	9
+REVISION=	10
 CATEGORIES=	japanese x11
 

 SITES=		${SITE_XCONTRIB:=applications/}
diff -ur -x CVS -x *.orig /usr/ports/japanese/kterm/patches/patch-screen_c ./patches/patch-screen_c
--- /usr/ports/japanese/kterm/patches/patch-screen_c	Sat Mar 12 04:24:44 2022
+++ ./patches/patch-screen_c	Thu Jun  4 15:05:31 2026
@@ -1,6 +1,25 @@
---- screen.c.orig	Fri Apr 28 14:22:37 2017
-+++ screen.c	Fri Apr 28 14:23:27 2017
-@@ -245,6 +245,7 @@ Reallocate(sbuf, sbufaddr, nrow, ncol, oldrow, oldcol)
+Index: screen.c
+--- screen.c.orig
++++ screen.c
+@@ -32,6 +32,7 @@
+ #include "error.h"
+ #include "data.h"
+ 

++#include <stdlib.h>
+ #include <stdio.h>
+ #include <signal.h>
+ #if defined(SVR4) || defined(hpux)
+@@ -46,9 +47,6 @@
+ #include <sys/ptem.h>
+ #endif
+ 

+-extern Char *calloc(), *malloc(), *realloc();
+-extern void free();
+-
+ ScrnBuf Allocate (nrow, ncol, addr)
+ /*
+    allocates memory for a 2-dimensional array of chars and returns a pointer
+@@ -245,6 +243,7 @@ Reallocate(sbuf, sbufaddr, nrow, ncol, oldrow, oldcol)
  #endif /* !KTERM */
  }
  

@@ -8,3 +27,16 @@
  #ifdef KTERM
  ScreenWrite (screen, str, flags, gset, length)
  #else /* !KTERM */
+@@ -912,10 +911,10 @@ ScreenResize (screen, width, height, flags)
+ 		    /* swap buffer pointers back to make all this hair work */
+ 		    SwitchBufPtrs(screen);
+ 		if (screen->altbuf) 

+-		    (void) Reallocate(&screen->altbuf, (Char **)&screen->abuf_address,
++		    (void) Reallocate(&screen->altbuf, (Bchr **)&screen->abuf_address,
+ 			 rows, cols, screen->max_row + 1, screen->max_col + 1);
+ 		move_down_by = Reallocate(&screen->allbuf,
+-					  (Char **)&screen->sbuf_address,
++					  (Bchr **)&screen->sbuf_address,
+ 					  rows + savelines, cols,
+ 					  screen->max_row + 1 + savelines,
+ 					  screen->max_col + 1);

============================================================