CVS commit: pkgsrc/inputmethod/Chinput

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Jan  4 17:41:56 UTC 2026

Modified Files:
        pkgsrc/inputmethod/Chinput: distinfo
        pkgsrc/inputmethod/Chinput/patches: patch-aa patch-ai
Added Files:
        pkgsrc/inputmethod/Chinput/patches: patch-src_IMdkit_lib_Makefile

Log Message:
Chinput: fix build on NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/inputmethod/Chinput/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/inputmethod/Chinput/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 pkgsrc/inputmethod/Chinput/patches/patch-ai
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/inputmethod/Chinput/patches/patch-src_IMdkit_lib_Makefile

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

Modified files:

Index: pkgsrc/inputmethod/Chinput/distinfo
diff -u pkgsrc/inputmethod/Chinput/distinfo:1.8 pkgsrc/inputmethod/Chinput/distinfo:1.9
--- pkgsrc/inputmethod/Chinput/distinfo:1.8     Tue Oct 26 10:49:30 2021
+++ pkgsrc/inputmethod/Chinput/distinfo Sun Jan  4 17:41:56 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2021/10/26 10:49:30 nia Exp $
+$NetBSD: distinfo,v 1.9 2026/01/04 17:41:56 wiz Exp $
 
 BLAKE2s (Chinput-3.0.tar.gz) = adf120d4f8fc6123113290144f5da706de4c81fcfe0c5c4f90b389c39adfd89e
 SHA512 (Chinput-3.0.tar.gz) = 386abfd5511845f4b06f06e1412f063359886ff3ad19ce14fb96f0814eac02ccc4bbf610c9e34b006d02a2dfaad0b56c90dfe90a45f0fd241768d1c43ff15354
 Size (Chinput-3.0.tar.gz) = 484374 bytes
-SHA1 (patch-aa) = c014ab66c2e6f32d66b55dec073ad9fccc1c5df0
+SHA1 (patch-aa) = 29cc1586f52893579ac432e7ac5e8464b4415a7c
 SHA1 (patch-ab) = e2b98ae50ddc28c986e3235345a67af964f02a60
 SHA1 (patch-ac) = f4d45c2ea45e3e8288cdb0363dc9dba127288990
 SHA1 (patch-ad) = 8a9fb407307bcd823e6050ab65e9e20bb512e367
@@ -11,5 +11,6 @@ SHA1 (patch-ae) = f3854f86cb2780bf710db8
 SHA1 (patch-af) = db621ebb06d22d948513451c4b5b670494dd5d46
 SHA1 (patch-ag) = ca121a6672f02808275b6ffe73ad1f2287e75443
 SHA1 (patch-ah) = 88caa0cd5a7c689c28096b2f6537570c6dc7b493
-SHA1 (patch-ai) = 79d0e1ac1d99fe4cb79eea957ba9f1153c39a783
+SHA1 (patch-ai) = cf11715e7d68625b1c38d40457467bd09351e494
 SHA1 (patch-aj) = 7ba12e09e26b289be34e07c9e84eb2c69e890299
+SHA1 (patch-src_IMdkit_lib_Makefile) = ca68bddb504f3548b3740697906928ca47962bb2

Index: pkgsrc/inputmethod/Chinput/patches/patch-aa
diff -u pkgsrc/inputmethod/Chinput/patches/patch-aa:1.1.1.1 pkgsrc/inputmethod/Chinput/patches/patch-aa:1.2
--- pkgsrc/inputmethod/Chinput/patches/patch-aa:1.1.1.1 Sat Jun 15 09:31:39 2002
+++ pkgsrc/inputmethod/Chinput/patches/patch-aa Sun Jan  4 17:41:56 2026
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/06/15 09:31:39 shell Exp $
+$NetBSD: patch-aa,v 1.2 2026/01/04 17:41:56 wiz Exp $
 
---- src/Makefile.orig  Mon Jun 10 21:05:56 2002
+--- src/Makefile.orig  2000-07-09 10:46:45.000000000 +0000
 +++ src/Makefile
 @@ -1,20 +1,16 @@
  
@@ -16,7 +16,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/06/15 0
  
  #CFLAGS =  -Wall -g -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce  -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE   -DFUNCPROTO=15 
-DNARROWPROTO
 -CFLAGS =  -Wall -g -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce
-+CFLAGS +=  -Wall -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce
++CFLAGS +=  -Wall -DFOR_PILOT_COMPAT -O2 -fno-strength-reduce -Wno-implicit-function-declaration
  
  INC = -I./include -I./IMdkit/include -I/usr/include -I/usr/X11R6/include   
  
@@ -25,7 +25,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/06/15 0
  
  SRC = chinput.c init.c server.c config.c color.c util.c convert.c IC.c XIM.c focus.c root.c overspot.c onspot.c offspot.c voice.c keyboard.c handw.c hwengine.c loop.c 
  
-@@ -23,7 +19,7 @@
+@@ -23,7 +19,7 @@ OBJ = $(SRC:.c=.o)
  all: chinput
  
  chinput: IMdkit/lib/libXimd.a $(OBJ) 

Index: pkgsrc/inputmethod/Chinput/patches/patch-ai
diff -u pkgsrc/inputmethod/Chinput/patches/patch-ai:1.1 pkgsrc/inputmethod/Chinput/patches/patch-ai:1.2
--- pkgsrc/inputmethod/Chinput/patches/patch-ai:1.1     Tue Jul 24 15:14:50 2007
+++ pkgsrc/inputmethod/Chinput/patches/patch-ai Sun Jan  4 17:41:56 2026
@@ -1,13 +1,14 @@
-$NetBSD: patch-ai,v 1.1 2007/07/24 15:14:50 joerg Exp $
+$NetBSD: patch-ai,v 1.2 2026/01/04 17:41:56 wiz Exp $
 
---- src/IMdkit/lib/IMConn.c.orig       2007-07-24 14:18:46.000000000 +0000
+--- src/IMdkit/lib/IMConn.c.orig       2000-07-02 02:01:01.000000000 +0000
 +++ src/IMdkit/lib/IMConn.c
-@@ -30,7 +30,7 @@ IN CONNECTION WITH THE USE OR PERFORMANC
+@@ -30,7 +30,8 @@ IN CONNECTION WITH THE USE OR PERFORMANC
  ******************************************************************/
  
  #include <X11/Xlib.h>
 -#include <malloc.h>
 +#include <stdlib.h>
++#include <string.h>
  #include "IMdkit.h"
  #include <stdarg.h>
  

Added files:

Index: pkgsrc/inputmethod/Chinput/patches/patch-src_IMdkit_lib_Makefile
diff -u /dev/null pkgsrc/inputmethod/Chinput/patches/patch-src_IMdkit_lib_Makefile:1.1
--- /dev/null   Sun Jan  4 17:41:56 2026
+++ pkgsrc/inputmethod/Chinput/patches/patch-src_IMdkit_lib_Makefile    Sun Jan  4 17:41:56 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_IMdkit_lib_Makefile,v 1.1 2026/01/04 17:41:56 wiz Exp $
+
+--- src/IMdkit/lib/Makefile.orig       2026-01-04 17:38:19.038750404 +0000
++++ src/IMdkit/lib/Makefile
+@@ -1,7 +1,7 @@
+ 
+ CC = gcc
+ #CFLAGS =  -c -O2 -fno-strength-reduce -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE=500L -D_BSD_SOURCE -D_SVID_SOURCE   -DFUNCPROTO=15 -DNARROWPROTO   -DUNIXCONN 
-DTCPCONN -DXIM_t -DTRANS_SERVER
+-CFLAGS =  -c -O2 -fno-strength-reduce -DXIM_t -DTRANS_SERVER
++CFLAGS =  -c -O2 -fno-strength-reduce -DXIM_t -DTRANS_SERVER -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -Wno-implicit-int
+ INC = -I../include -I/usr/X11R6/include   
+ 
+ 
+@@ -12,7 +12,7 @@ OBJ = $(SRC:.c=.o)
+ all: libXimd.a
+ 
+ libXimd.a: $(OBJ)
+-      ar clq libXimd.a $(OBJ)
++      ar cq libXimd.a $(OBJ)
+       ranlib libXimd.a
+ 
+ .c.o: