Description: Fix FTBFS with GCC C23 semantics: give the proc function
 pointer its real type int (*)(Character *, Character *) (it is always
 assigned/called with that signature) and complete the internal
 prototypes in libkakasi.h, which otherwise conflict with the old-style
 definitions when empty parentheses mean (void).
Author: tangxiaofeng <tangxiaofeng@kylinos.cn>
Origin: other
Forwarded: no
Last-Update: 2026-09-02

--- kakasi-2.3.6.orig/lib/libjj2.c
+++ kakasi-2.3.6/lib/libjj2.c
@@ -201,7 +201,7 @@ static void
 J2convert(m, n, proc)
      Character *m;
      Character *n;
-     int (*proc)();
+     int (*proc)(Character *, Character *);
 {
     int mp=0, np=0;
     int ret;
--- kakasi-2.3.6.orig/lib/libkakasi.c
+++ kakasi-2.3.6/lib/libkakasi.c
@@ -97,7 +97,7 @@ Character right_paren[KAKASIBUF];
 
 #ifdef LIBRARY
 extern FILE *kanwadict;
-static int (*proc[8])()={NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+static int (*proc[8])(Character *, Character *)={NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
 /* ASCII, JISROMAN, KATAKANA, GRAPHIC, ZENKAKU-KIGOU, ZENKAKU-KATAKANA, ZENKAKU-HIRAGANA, KANJI, */
 #endif
 
@@ -121,7 +121,7 @@ KAKASI_ATTR void digest_start_copy PARAM
 KAKASI_ATTR void put_separator PARAMS((void));
 KAKASI_ATTR void putchars PARAMS((Character *results));
 KAKASI_ATTR void digest_out PARAMS((Character *c, int ret));
-KAKASI_ATTR int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void)));
+KAKASI_ATTR int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(Character *, Character *)));
 KAKASI_ATTR void digest_shift PARAMS((Character *c, int s));
 #ifdef LIBRARY
 static void free_jisyo PARAMS((void));
@@ -240,7 +240,7 @@ digest(c, clen, r, rlen, type, proc)
      Character *r;
      int rlen;
      int type;
-     int (*proc)();
+     int (*proc)(Character *, Character *);
 {
     int ret, i, j, k;
     Character new;
@@ -337,7 +337,7 @@ kakasi_getopt_argv(argc, argv)
 #ifndef LIBRARY
     Character c[KAKASIBUF], r[KAKASIBUF];
     int clen, ptype, pctype;
-    static int (*proc[8])()={NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+    static int (*proc[8])(Character *, Character *)={NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
     /* ASCII, JISROMAN, KATAKANA, GRAPHIC, ZENKAKU-KIGOU, ZENKAKU-KATAKANA, ZENKAKU-HIRAGANA, KANJI, */
 #endif
 
--- kakasi-2.3.6.orig/lib/libkakasi.h
+++ kakasi-2.3.6/lib/libkakasi.h
@@ -38,12 +38,12 @@ int kakasi_free PARAMS((char *p));
 /*
  * NOTE: these are internal functions. Do not use.
  */
-void digest_start_copy();
+void digest_start_copy(struct character *, struct character *);
 void put_separator();
-void putchars();
-void digest_out();
-int digest();
-void digest_shift();
+void putchars(struct character *);
+void digest_out(struct character *, int);
+int digest(struct character *, int, struct character *, int, int, int (*)(struct character *, struct character *));
+void digest_shift(struct character *, int);
 
 void setcharbuffer PARAMS((unsigned char *s));
 char *getpbstr PARAMS((void));
--- kakasi-2.3.6.orig/src/jj2.c
+++ kakasi-2.3.6/src/jj2.c
@@ -201,7 +201,7 @@ static void
 J2convert(m, n, proc)
      Character *m;
      Character *n;
-     int (*proc)();
+     int (*proc)(Character *, Character *);
 {
     int mp=0, np=0;
     int ret;
--- kakasi-2.3.6.orig/src/kakasi.c
+++ kakasi-2.3.6/src/kakasi.c
@@ -97,7 +97,7 @@ Character right_paren[KAKASIBUF];
 
 #ifdef LIBRARY
 extern FILE *kanwadict;
-static int (*proc[8])()={NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+static int (*proc[8])(Character *, Character *)={NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
 /* ASCII, JISROMAN, KATAKANA, GRAPHIC, ZENKAKU-KIGOU, ZENKAKU-KATAKANA, ZENKAKU-HIRAGANA, KANJI, */
 #endif
 
@@ -121,7 +121,7 @@ KAKASI_ATTR void digest_start_copy PARAM
 KAKASI_ATTR void put_separator PARAMS((void));
 KAKASI_ATTR void putchars PARAMS((Character *results));
 KAKASI_ATTR void digest_out PARAMS((Character *c, int ret));
-KAKASI_ATTR int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(void)));
+KAKASI_ATTR int digest PARAMS((Character *c, int clen, Character *r, int rlen, int type, int (*proc)(Character *, Character *)));
 KAKASI_ATTR void digest_shift PARAMS((Character *c, int s));
 #ifdef LIBRARY
 static void free_jisyo PARAMS((void));
@@ -240,7 +240,7 @@ digest(c, clen, r, rlen, type, proc)
      Character *r;
      int rlen;
      int type;
-     int (*proc)();
+     int (*proc)(Character *, Character *);
 {
     int ret, i, j, k;
     Character new;
@@ -337,7 +337,7 @@ kakasi_getopt_argv(argc, argv)
 #ifndef LIBRARY
     Character c[KAKASIBUF], r[KAKASIBUF];
     int clen, ptype, pctype;
-    static int (*proc[8])()={NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
+    static int (*proc[8])(Character *, Character *)={NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
     /* ASCII, JISROMAN, KATAKANA, GRAPHIC, ZENKAKU-KIGOU, ZENKAKU-KATAKANA, ZENKAKU-HIRAGANA, KANJI, */
 #endif
 

