Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Samuli Suominen (ssuominen)" <ssuominen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-i18n/xcin/files: xcin-2.5.3_pre3-glibc-2.10.patch
Date: Tue, 29 Dec 2009 16:10:08
Message-Id: E1NPee6-0003pO-CB@stork.gentoo.org
1 ssuominen 09/12/29 16:10:06
2
3 Added: xcin-2.5.3_pre3-glibc-2.10.patch
4 Log:
5 Fix building with GLIBC 2.10+ wrt #298015.
6 (Portage version: 2.2_rc61/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-i18n/xcin/files/xcin-2.5.3_pre3-glibc-2.10.patch?rev=1.1&content-type=text/plain
13
14 Index: xcin-2.5.3_pre3-glibc-2.10.patch
15 ===================================================================
16 diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En
17 --- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/En/internal/module.En 2000-12-13 18:55:41.000000000 +0200
18 +++ xcin-2.5.2.99.pre2+cvs20030224/doc/En/internal/module.En 2009-12-29 18:09:20.000000000 +0200
19 @@ -481,13 +481,13 @@
20 char *lc_ctype; /* LC_CTYPE locale category name */
21 char *lc_messages; /* LC_MESSAGES locale category name */
22 char *encoding; /* encoding name */
23 - } locale_t;
24 + } xcin_locale_t;
25
26 typedef struct {
27 char *rcfile; /* rcfile name. */
28 char *default_dir; /* Default module directory. */
29 char *user_dir; /* User data directory. */
30 - locale_t locale; /* Locale name. */
31 + xcin_locale_t locale; /* Locale name. */
32 } xcin_rc_t;
33
34 The return value of this function is True when excuting successfully,
35 diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module
36 --- xcin-2.5.2.99.pre2+cvs20030224.orig/doc/internal/module 2002-10-29 13:53:42.000000000 +0200
37 +++ xcin-2.5.2.99.pre2+cvs20030224/doc/internal/module 2009-12-29 18:09:24.000000000 +0200
38 @@ -423,13 +423,13 @@
39 char *lc_ctype; /* LC_CTYPE locale category name */
40 char *lc_messages; /* LC_MESSAGES locale category name */
41 char *encoding; /* encoding name */
42 - } locale_t;
43 + } xcin_locale_t;
44
45 typedef struct {
46 char *rcfile; /* rcfile name. */
47 char *default_dir; /* Default module directory. */
48 char *user_dir; /* User data directory. */
49 - locale_t locale; /* Locale name. */
50 + xcin_locale_t locale; /* Locale name. */
51 } xcin_rc_t;
52
53 本函式若成功傳回 True, 失敗傳回 False。
54 diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h
55 --- xcin-2.5.2.99.pre2+cvs20030224.orig/src/include/xcintool.h 2002-10-29 13:53:42.000000000 +0200
56 +++ xcin-2.5.2.99.pre2+cvs20030224/src/include/xcintool.h 2009-12-29 18:09:01.000000000 +0200
57 @@ -202,12 +202,12 @@
58 char *lc_messages;
59 char *encoding;
60 int encid, locid;
61 -} locale_t;
62 +} xcin_locale_t;
63
64 typedef struct {
65 int argc; /* Command line arguement list */
66 char **argv;
67 - locale_t locale; /* Locale name. */
68 + xcin_locale_t locale; /* Locale name. */
69 char *usrhome; /* User home directory. */
70 char *default_dir; /* Default module directory. */
71 char *user_dir; /* User data directory. */
72 diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c
73 --- xcin-2.5.2.99.pre2+cvs20030224.orig/src/util/cin2tab/cin2tab.c 2009-12-29 18:07:44.000000000 +0200
74 +++ xcin-2.5.2.99.pre2+cvs20030224/src/util/cin2tab/cin2tab.c 2009-12-29 18:09:12.000000000 +0200
75 @@ -233,7 +233,7 @@
76 }
77
78 static void
79 -cin2tab_setlocale(locale_t *locale)
80 +cin2tab_setlocale(xcin_locale_t *locale)
81 {
82 char loc_return[128], enc_return[128];
83 int ret;
84 diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c
85 --- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xcin_main.c 2003-01-20 19:50:05.000000000 +0200
86 +++ xcin-2.5.2.99.pre2+cvs20030224/src/xcin_main.c 2009-12-29 18:09:06.000000000 +0200
87 @@ -56,7 +56,7 @@
88 static void
89 xcin_setlocale(void)
90 {
91 - locale_t *locale = &(xcin_core.xcin_rc.locale);
92 + xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
93 char loc_return[128], enc_return[128];
94
95 set_perr("xcin");
96 @@ -332,7 +332,7 @@
97 char *cmd[2], value[256], *s, loc_buf[64], *loc_name=NULL;
98 char *fmt = N_("%s:\n\tlocale section \"%s\": %s: value not specified.\n");
99 xcin_rc_t *xrc = &(xcin_core.xcin_rc);
100 - locale_t *locale = &(xcin_core.xcin_rc.locale);
101 + xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
102 /*
103 * Determine the true locale setting name.
104 */
105 @@ -409,7 +409,7 @@
106 char *cmd[2], value[256], *s, *s1, objname[100], objenc[100];
107 char *fmt = N_("%s:\n\tIM section \"%s\": %s: %s.\n");
108 xcin_rc_t *xrc = &(xcin_core.xcin_rc);
109 - locale_t *locale = &(xcin_core.xcin_rc.locale);
110 + xcin_locale_t *locale = &(xcin_core.xcin_rc.locale);
111 int setkey;
112 /*
113 * Go to each CINPUT sub-node and read important keywords.
114 diff -ur xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c xcin-2.5.2.99.pre2+cvs20030224/src/xim.c
115 --- xcin-2.5.2.99.pre2+cvs20030224.orig/src/xim.c 2009-12-29 18:07:44.000000000 +0200
116 +++ xcin-2.5.2.99.pre2+cvs20030224/src/xim.c 2009-12-29 18:09:06.000000000 +0200
117 @@ -1032,7 +1032,7 @@
118 XIMTriggerKeys on_keys;
119 XIMEncodings encodings;
120 Window mainwin;
121 - locale_t *locale;
122 + xcin_locale_t *locale;
123 char* imlocale = NULL;
124 int i;
Report Message
Find on MARC Find on Google Groups