Tue Apr 30 22:23:08 2013 UTC ()
locale_t is surprisingly used by locale.h, so pick a different name.


(joerg)
diff -r1.7 -r1.8 pkgsrc/inputmethod/xcin/distinfo
diff -r1.1 -r1.2 pkgsrc/inputmethod/xcin/patches/patch-aj
diff -r0 -r1.1 pkgsrc/inputmethod/xcin/patches/patch-src_include_xcintool.h
diff -r0 -r1.1 pkgsrc/inputmethod/xcin/patches/patch-src_xcin__main.c
diff -r0 -r1.1 pkgsrc/inputmethod/xcin/patches/patch-src_xim.c
cvs diff -r1.7 -r1.8 pkgsrc/inputmethod/xcin/distinfo (expand / switch to unified diff)

--- pkgsrc/inputmethod/xcin/distinfo 2009/11/24 11:23:34 1.7
+++ pkgsrc/inputmethod/xcin/distinfo 2013/04/30 22:23:07 1.8
@@ -1,15 +1,18 @@ @@ -1,15 +1,18 @@
1$NetBSD: distinfo,v 1.7 2009/11/24 11:23:34 obache Exp $ 1$NetBSD: distinfo,v 1.8 2013/04/30 22:23:07 joerg Exp $
2 2
3SHA1 (xcin-2.5.3.pre2.tar.gz) = 27e4c47e09c44e92e3a3afc9e08134e1485f6795 3SHA1 (xcin-2.5.3.pre2.tar.gz) = 27e4c47e09c44e92e3a3afc9e08134e1485f6795
4RMD160 (xcin-2.5.3.pre2.tar.gz) = f1fb83d1e21a0f5dbb80c5eafdaa6c7f313ea865 4RMD160 (xcin-2.5.3.pre2.tar.gz) = f1fb83d1e21a0f5dbb80c5eafdaa6c7f313ea865
5Size (xcin-2.5.3.pre2.tar.gz) = 1433915 bytes 5Size (xcin-2.5.3.pre2.tar.gz) = 1433915 bytes
6SHA1 (patch-aa) = 9d0631ee59d376515cf260537f664dda9bd14a83 6SHA1 (patch-aa) = 9d0631ee59d376515cf260537f664dda9bd14a83
7SHA1 (patch-ab) = cf899acb6f5502175c9cbfd45da119cd6f6ddb5a 7SHA1 (patch-ab) = cf899acb6f5502175c9cbfd45da119cd6f6ddb5a
8SHA1 (patch-ac) = 63ad86449dd44ddf3db2ed661de2e290c894131f 8SHA1 (patch-ac) = 63ad86449dd44ddf3db2ed661de2e290c894131f
9SHA1 (patch-ad) = 6e59d32f5e3f8f06f8b4bcbb32e221678db74018 9SHA1 (patch-ad) = 6e59d32f5e3f8f06f8b4bcbb32e221678db74018
10SHA1 (patch-ae) = 13985687af55de0a6727150d41d2d6333d103689 10SHA1 (patch-ae) = 13985687af55de0a6727150d41d2d6333d103689
11SHA1 (patch-af) = 23dde43647de72fb6492a51016379db88f37cdd2 11SHA1 (patch-af) = 23dde43647de72fb6492a51016379db88f37cdd2
12SHA1 (patch-ag) = 009aff61710ad0da4492e366f35fa565b0abc32c 12SHA1 (patch-ag) = 009aff61710ad0da4492e366f35fa565b0abc32c
13SHA1 (patch-ah) = 0bc13a5e03157cc788228162d7f212d5741c29bf 13SHA1 (patch-ah) = 0bc13a5e03157cc788228162d7f212d5741c29bf
14SHA1 (patch-ai) = 324cd99f69bd226846dc65f100c523c056fc13c6 14SHA1 (patch-ai) = 324cd99f69bd226846dc65f100c523c056fc13c6
15SHA1 (patch-aj) = 074e2893c3c06253034ce4d1e85679e71edd483e 15SHA1 (patch-aj) = d7b9adac4d08fcee744f80aaece059bdd96ab23c
 16SHA1 (patch-src_include_xcintool.h) = 77a36ce6d4bd40433afad66813ab455e879997f3
 17SHA1 (patch-src_xcin__main.c) = d19a256c60c93da4c9162e5f6d0b3fdbb7922138
 18SHA1 (patch-src_xim.c) = 11bb79b228f9eda729f4f6a543efcdcf74538112
cvs diff -r1.1 -r1.2 pkgsrc/inputmethod/xcin/patches/patch-aj (expand / switch to unified diff)

--- pkgsrc/inputmethod/xcin/patches/patch-aj 2009/11/24 11:23:34 1.1
+++ pkgsrc/inputmethod/xcin/patches/patch-aj 2013/04/30 22:23:07 1.2
@@ -1,21 +1,30 @@ @@ -1,21 +1,30 @@
1$NetBSD: patch-aj,v 1.1 2009/11/24 11:23:34 obache Exp $ 1$NetBSD: patch-aj,v 1.2 2013/04/30 22:23:07 joerg Exp $
2 2
3for process jyutping.cin. 3for process jyutping.cin.
4 4
5--- src/util/cin2tab/cin2tab.c.orig 2001-10-04 16:39:49.000000000 +0000 5--- src/util/cin2tab/cin2tab.c.orig 2001-10-04 16:39:49.000000000 +0000
6+++ src/util/cin2tab/cin2tab.c 6+++ src/util/cin2tab/cin2tab.c
7@@ -74,12 +74,12 @@ static struct cin cinfunc[] = { 7@@ -74,12 +74,12 @@ static struct cin cinfunc[] = {
8 int 8 int
9 cmd_arg(char *cmd, int cmdlen, ...) 9 cmd_arg(char *cmd, int cmdlen, ...)
10 { 10 {
11- char line[256], *s=line, *arg; 11- char line[256], *s=line, *arg;
12+ char line[512], *s=line, *arg; 12+ char line[512], *s=line, *arg;
13 int arglen, n_read=1; 13 int arglen, n_read=1;
14 va_list list; 14 va_list list;
15  15
16 va_start(list, cmdlen); 16 va_start(list, cmdlen);
17- if (! get_line(line, 256, cintab.fr, &(cintab.lineno), "#\n")) 17- if (! get_line(line, 256, cintab.fr, &(cintab.lineno), "#\n"))
18+ if (! get_line(line, 512, cintab.fr, &(cintab.lineno), "#\n")) 18+ if (! get_line(line, 512, cintab.fr, &(cintab.lineno), "#\n"))
19 return 0; 19 return 0;
20  20
21 cmd[0] = '\0'; 21 cmd[0] = '\0';
 22@@ -233,7 +233,7 @@ print_usage(void)
 23 }
 24
 25 static void
 26-cin2tab_setlocale(locale_t *locale)
 27+cin2tab_setlocale(xcin_locale_t *locale)
 28 {
 29 char loc_return[128], enc_return[128];
 30 int ret;
File Added: pkgsrc/inputmethod/xcin/patches/patch-src_include_xcintool.h
$NetBSD: patch-src_include_xcintool.h,v 1.1 2013/04/30 22:23:07 joerg Exp $

--- src/include/xcintool.h.orig	2013-04-30 11:13:51.000000000 +0000
+++ src/include/xcintool.h
@@ -202,12 +202,12 @@ typedef struct {
     char *lc_messages;
     char *encoding;
     int encid, locid;
-} locale_t;
+} xcin_locale_t;
 
 typedef struct {
     int argc;			/* Command line arguement list */
     char **argv;
-    locale_t locale;            /* Locale name. */
+    xcin_locale_t locale;            /* Locale name. */
     char *usrhome;		/* User home directory. */
     char *default_dir;          /* Default module directory. */
     char *user_dir;             /* User data directory. */
File Added: pkgsrc/inputmethod/xcin/patches/patch-src_xcin__main.c
$NetBSD: patch-src_xcin__main.c,v 1.1 2013/04/30 22:23:07 joerg Exp $

--- src/xcin_main.c.orig	2013-04-30 11:14:44.000000000 +0000
+++ src/xcin_main.c
@@ -56,7 +56,7 @@ void xim_init(xccore_t *xccore);
 static void
 xcin_setlocale(void)
 {
-    locale_t *locale = &(xcin_core.xcin_rc.locale);
+    xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
     char loc_return[128], enc_return[128];
 
     set_perr("xcin");
@@ -324,7 +324,7 @@ read_core_config_locale(void)
     char *cmd[2], value[256], *s, loc_buf[64], *loc_name=NULL;
     char *fmt = N_("%s:\n\tlocale section \"%s\": %s: value not specified.\n");
     xcin_rc_t *xrc = &(xcin_core.xcin_rc);
-    locale_t *locale = &(xcin_core.xcin_rc.locale);
+    xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
 /*
  *  Determine the true locale setting name.
  */
@@ -401,7 +401,7 @@ read_core_config_IM(void)
     char *cmd[2], value[256], *s, *s1, objname[100], objenc[100];
     char *fmt = N_("%s:\n\tIM section \"%s\": %s: value not specified.\n");
     xcin_rc_t *xrc = &(xcin_core.xcin_rc);
-    locale_t *locale = &(xcin_core.xcin_rc.locale);
+    xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
     int setkey;
 /*
  *  Go to each CINPUT sub-node and read important keywords.
File Added: pkgsrc/inputmethod/xcin/patches/patch-src_xim.c
$NetBSD: patch-src_xim.c,v 1.1 2013/04/30 22:23:07 joerg Exp $

--- src/xim.c.orig	2013-04-30 11:14:40.000000000 +0000
+++ src/xim.c
@@ -1029,7 +1029,7 @@ xim_init(xccore_t *core)
     XIMTriggerKeys on_keys;
     XIMEncodings encodings;
     Window mainwin;
-    locale_t *locale;
+    xcin_locale_t *locale;
     int i;
 
     transport_type = TRANSPORT_X;