From: bunk@debian.org
Control: tags 1098198 + patch
Control: tags 1098198 + pending
Dear maintainer,
I've prepared an NMU for zh-autoconvert (versioned as 0.3.16-10.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it.
cu
Adrian
diffstat for zh-autoconvert-0.3.16 zh-autoconvert-0.3.16
changelog | 8
patches/018-gcc-15.patch | 498 +++++++++++++++++++++++++++++++
+++++++++++++++
patches/series | 1
3 files changed, 507 insertions(+)
diff -Nru zh-autoconvert-0.3.16/debian/changelog zh-autoconvert-
.3.16/debian/changelog
--- zh-autoconvert-0.3.16/debian/changelog 2024-03-17 18:32:32.000000000
+0200
+++ zh-autoconvert-0.3.16/debian/changelog 2025-10-11 20:35:14.000000000
+0300
@@ -1,3 +1,11 @@
+zh-autoconvert (0.3.16-10.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add patch from LI Daobing to fix FTBFS with GCC 15.
+ (Closes: #1098198)
+
+ -- Adrian Bunk Sat, 11 Oct 2025 20:35:14 +0300
+
zh-autoconvert (0.3.16-10) unstable; urgency=medium
* Team upload.
diff -Nru zh-autoconvert-0.3.16/debian/patches/018-gcc-15.patch
h-autoconvert-0.3.16/debian/patches/018-gcc-15.patch
--- zh-autoconvert-0.3.16/debian/patches/018-gcc-15.patch 1970-01-01
02:00:00.000000000 +0200
+++ zh-autoconvert-0.3.16/debian/patches/018-gcc-15.patch 2025-10-11
20:35:14.000000000 +0300
@@ -0,0 +1,498 @@
+Description: fix compile error under gcc-15
+ fix compile error under gcc-15
+Author: Daobing Li
+Bug-Debian: https://bugs.debian.org/1098198
+Last-Update: 2025-10-02
+
+Index: zh-autoconvert/hzconvert/b2g.c
+===================================================================
+--- zh-autoconvert.orig/hzconvert/b2g.c
++++ zh-autoconvert/hzconvert/b2g.c
+@@ -36,8 +36,7 @@ extern int GtoB_count, BtoG_count;
+ #define c1 (unsigned char)(s[0])
+ #define c2 (unsigned char)(s[1])
+
+-static void g2b(s)
+- register char *s;
++static void g2b(char* s)
+ {
+ register unsigned int i;
+
+@@ -55,8 +54,7 @@ static void g2b(s)
+ s[0] = GtoB_bad1; s[1] = GtoB_bad2;
+ }
+
+-static void b2g(s)
+- register char *s;
++static void b2g(char* s)
+ {
+ register int i;
+
+@@ -77,12 +75,11 @@ static void b2g(s)
+ #undef c1
+ #undef c2
+
+-extern char *hzconvert ();
++extern char *hzconvert (char *s, int *plen, char *psaved, void
(*dbcvrt)(char*));
+ static char gb2big_savec[MAX_MODULE];
+ static char big2gb_savec[MAX_MODULE];
+
+-int gb2big_init (arg)
+- char *arg;
++int gb2big_init (char* arg)
+ {
+ /*
+ static int gb2big_inst = 0;
+@@ -97,8 +94,7 @@ int gb2big_init (arg)
+
+ }
+
+-int big2gb_init (arg)
+- char *arg;
++int big2gb_init (char* arg)
+ {
+ /*
+ static int big2gb_inst = 0;
+@@ -112,18 +108,12 @@ int big2gb_init (arg)
+ return (i++);
+ }
+
+-char *gb2big (s,plen,inst)
+- char *s;
+- int *plen;
+- int inst;
++char *gb2big (char *s, int *plen, int inst)
+ {
+ return (hzconvert (s, plen, &gb2big_savec[inst], g2b));
+ }
+
+-char *big2gb (s,plen,inst)
+- char *s;
+- int *plen;
+- int inst;
++char *big2gb (char* s, int *plen, int inst)
+ {
+ return (hzconvert (s, plen, &big2gb_savec[inst], b2g));
+ }
+Index: zh-autoconvert/include/hz.h
+===================================================================
+--- zh-autoconvert.orig/include/hz.h
++++ zh-autoconvert/include/hz.h
+@@ -36,22 +36,32 @@ Boston, MA 02111-1307, USA.
+
+ #define MAX_BUFFER 8192
+
+-char *hz2gb(),*gb2hz(); /* hz2gb.c */
+-int hz2gb_init(),gb2hz_init();
+-
+-char *gb2big(), *big2gb(); /* b2g.c */
+-int gb2big_init(), big2gb_init(); /* b2g.c */
+-
+-char *uni_utf8(), *utf8_uni(); /* unicode.c */
+-int uni_utf8_init(), utf8_uni_init(); /* unicode.c */
+-char *uni_utf7(), *utf7_uni(); /* unicode.c */
+-int uni_utf7_init(), utf7_uni_init(); /* unicode.c */
+-
+-char *gb2uni(), *uni2gb(); /* g2u.c */
+-int gb2uni_init(), uni2gb_init(); /* g2u.c */
+-
+-char *big2uni(), *uni2big(); /* b2u.c */
+-int big2uni_init(), uni2big_init(); /* b2u.c */
++char *hz2gb (char* s,int* plen,int inst);
++char *gb2hz (char* s,int* plen, int inst);
++int hz2gb_init(char*);
++int gb2hz_init(char*); /* hz2gb.c */
++
++char *gb2big (char *s, int *plen, int inst);
++char *big2gb (char* s, int *plen, int inst);
++int gb2big_init(char*);
++int big2gb_init(char*); /* b2g.c */
++
++char *utf8_uni (char* s, int* plen, int inst);
++char *uni_utf8 (char* s, int* plen, int inst);
++int uni_utf8_init(char* ), utf8_uni_init(char*); /* unicode.c */
++char *utf7_uni (char *s, int *plen, int inst);
++char *uni_utf7 (char* s,int* plen,int inst);
++int uni_utf7_init(char* ), utf7_uni_init(char*); /* unicode.c */
++
++char *gb2uni(char* s, int* plen, int inst);
++char *uni2gb(char* s, int* plen, int inst);
++int gb2uni_init(char* arg);
++int uni2gb_init(char* arg); /* g2u.c */
++
++char *big2uni(char* s, int* plen, int inst);
++char *uni2big(char* s, int* plen, int inst);
++int big2uni_init(char* arg);
++int uni2big_init(char* arg); /* b2u.c */
+
+ int j_code(char * buff,int count); /* lib.c */
+
+Index: zh-autoconvert/hzconvert/io.c
+===================================================================
+--- zh-autoconvert.orig/hzconvert/io.c
++++ zh-autoconvert/hzconvert/io.c
+@@ -24,12 +24,9 @@ Boston, MA 02111-1307, USA.
+ */
+ //$Header: /home/prog/autoconvert/hzconvert/io.c,v 1.1.1.1 2000/04/19
05:43:32 ygh Exp $
+ #include "hz.h"
+-
+-char *hzconvert (s, plen, psaved, dbcvrt)
+- char *s;
+- int *plen;
+- char *psaved; /* unprocessed char buffer pointer */
+- void (*dbcvrt)(); /* 2-byte conversion func for a hanzi */
++/* psaved: unprocessed char buffer pointer */
++/* dbcvrt: 2-byte conversion func for a hanzi */
++char *hzconvert (char *s, int *plen, char *psaved, void (*dbcvrt)(char*))
+ {
+ char *p, *pend;
+
[continued in next message]
--- SoupGate-Win32 v1.05
* Origin: you cannot sedate... all the things you hate (1:229/2)
|
