rpms/gcin/FC-6 .cvsignore, 1.10, 1.11 NewCJ3.cin, 1.3, 1.4 gcin.spec, 1.15, 1.16 gcin_update.patch, 1.1, 1.2 im-client.patch, 1.4, 1.5 sources, 1.10, 1.11
Chung-Yen Chang (candyz)
fedora-extras-commits at redhat.com
Sun Dec 3 07:28:10 UTC 2006
- Previous message (by thread): rpms/gcin/devel .cvsignore, 1.10, 1.11 NewCJ3.cin, 1.3, 1.4 gcin.spec, 1.16, 1.17 gcin_update.patch, 1.1, 1.2 im-client.patch, 1.4, 1.5 sources, 1.10, 1.11
- Next message (by thread): rpms/gcin/FC-5 .cvsignore, 1.10, 1.11 NewCJ3.cin, 1.3, 1.4 gcin.spec, 1.14, 1.15 gcin_update.patch, 1.1, 1.2 im-client.patch, 1.4, 1.5 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: candyz
Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31683
Modified Files:
.cvsignore NewCJ3.cin gcin.spec gcin_update.patch
im-client.patch sources
Log Message:
update to 1.3.1
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 23 Nov 2006 13:36:53 -0000 1.10
+++ .cvsignore 3 Dec 2006 07:27:37 -0000 1.11
@@ -1 +1 @@
-gcin-1.3.0.1.tar.bz2
+gcin-1.3.1.tar.bz2
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 NewCJ3.cin
Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/NewCJ3.cin,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NewCJ3.cin 23 Nov 2006 13:36:53 -0000 1.3
+++ NewCJ3.cin 3 Dec 2006 07:27:37 -0000 1.4
@@ -37,180 +37,13 @@
z Ｚ
%keyname end
%chardef begin
-` € é è¨ä¸ä½¿ç”¨ï¼Œå› 為 gcin 裡é¢æŒ‰ ` å¯ç”¨ä¾†è¼¸å…¥åŒéŸ³å—
-, ，
-,, ï¼
-,a 早知如æ¤ï¼Œä½•å¿…當åˆ
-,b å‹æ•—乃兵家常事
-,c 曾經滄海難為水
-,d 柳暗花明åˆä¸€æ‘
-,e 江山易改，本性難移
-,f åŠæ–¤å…«å…©
-,g 土法煉鋼
-,h é‡è³žä¹‹ä¸‹å¿…有勇夫
-,i 良禽擇木而棲
-,j 真金ä¸æ€•ç«ç…‰
-,k 有錢能使鬼推磨
-,l åˆç”Ÿä¹‹çŠ¢ä¸ç•è™Ž
-,m 一失足æˆåƒå¤æ¨
-,n è§£éˆ´é‚„é ˆç¹«éˆ´äºº
-,o å·é›žä¸è‘—è•æŠŠç±³
-,p 心有éˆçŠ€ä¸€é»žé€š
-,q 春宵一刻值åƒé‡‘
-,r è¸ç ´éµéž‹ç„¡è¦“處
-,s 屋æ¼å逢連夜雨
-,t 英雄難éŽç¾Žäººé—œ
-,u 山人自有妙計
-,v 如人飲水，冷暖自知
-,w 置之æ»åœ°è€Œå¾Œç”Ÿ
-,x 明æ§æ˜“躲，暗ç®é›£é˜²
-,y æ”¾ä¸‹å± åˆ€ï¼Œç«‹åœ°æˆä½›
-,z æˆèªž
-. 。
-.. ？
-.. ．
-.. ‧
-.. ï¹’
-.. ·
-.. ﹕
-.. ‥
-.. …
-... …
-... ∵
-... ∴
-' ã€
-'' "
-'' "
-'' ã€
-'' 〞
-'' ‵
-'' ′
-; ï¼›
-; ：
-; ．
-; ,
-; .
-; ;
-; 禾
-; 食
-; ã„
-; ã„¡
-; ㄤ
-; ã„¥
-;; ：
-;; …
-;; ．
-;; ï¼
-;; ？
-;; â—‹
-;; â—Ž
-;; ※
-;; §
-;; ☆
-;; ★
-;; ⊙
-;; â—
-;; â–¡
-;; â–
-;; ï¼
-;; "
-;; "
-;; ã€
-;; 〞
-;; ‵
-;; ′
-;; ‧
-;; ï¹’
-;; ·
-;; ﹕
-;; ‥
-;; ç§
-;;; …
-;;; ．
-;;; ……
-;;; ∵
-;;; ∴
-;;; ﹉
-;;; ﹊
-;;; ï¹
-;;; ﹎
-[ 「
-[ 『
-[ ã€
-[ â•
-[ â•®
-[ ＜
-[ ≦
-[ ﹤
-[ ï¿£
-[ â–”
-[ ㄦ
-[[ （
-[[ 『
-[[ 〈
-[[ 《
-[[ ã€
-[[ 〔
-[[ ï½›
-[[ ï¹™
-[[ ï¹
-[[ ï¹›
-[[ 〖
-[[[ ︵
-[[[ ï¹
-[[[ ﹃
-[[[ ︻
-[[[ ︹
-[[[ ︷
-[[[ ︿
-[[[ ︽
-] ã€
-] ã€
-] 】
-] â•°
-] ╯
-] ＞
-] ≧
-] ï¹¥
-] ＿
-] Ë
-]] ）
-]] ã€
-]] 〉
-]] 》
-]] 】
-]] 〕
-]] ï½
-]] ﹚
-]] ﹞
-]] ﹜
-]] 〗
-]]] ︶
-]]] ﹂
-]]] ﹄
-]]] ︼
-]]] ︺
-]]] ︸
-]]] ï¹€
-]]] ︾
-;a 香
-;b 師
-;bb 稱
-;c ç©
-;cu 稅
-;d å£
-;e 飯
-;f 秋
-;fh 秒
-;g 程
-;h 種
;i 我
-;i; ç§
;ia 我是
;iai 我是我
;iao 我是他
;iau 我是ä½
;ib 我愛
+;ib 我用
;ibi 我愛我
;ibo 我愛他
;ibu 我愛ä½
@@ -219,15 +52,35 @@
;idm 我想è¦
;ido 我想他
;idu 我想ä½
+;idyn 我想通了
;if 我願
;ify 我願æ„
;ig 我在
+;igrl 我在哪裡
;ih 我的
[...177750 lines suppressed...]
+bbtt; é«’
+bbyo; è³…
+bbyr; è³
+bcii; è³»
+bcyr; è³
+buch; ç‡
+buog; ç¢
+buto; 瞨
+dbdb; 棗
+fbok; æ•ž
+fbrf; 烔
+fdha; 糌
+fdyj; ç²¹
+fdyr; 粘
+ffbf; 縈
+ffbg; å¡‹
+fkbu; 眷
+giks; 劫
+gofb; 趙
+grgr; å–†
+grtr; 嘉
+haha; 馫
+hdln; å‰
+hebt; 盥
+hhsl; å¯
+hmnl; 邸
+homm; å¾
+homn; è¡™
+houk; å¾®
+hoys; 徬
+hqhm; 牴
+hrhp; èˆ
+hyhe; 艘
+hyhe; 舨
+ifru; 祀
+iinl; ç¥
+imy; 凜
+jjbb; è¼£
+jjhb; ç«Š
+jjho; 窳
+jjip; è½—
+jjkn; 究
+jjmg; 窒
+jjmu; è»
+jjoj; æ–¡
+jjon; ä¹¾
+jjq; 轃
+jjsu; 窟
+jjyk; è½
+juln; 剜
+kbnl; 郗
+khwg; 玀
+khyj; ç
+khyk; ç„
+lbau; 幌
+lihj; èŒ
+limb; è •
+lior; 蜘
+litm; èž¼
+liyj; 蚪
+liyk; 蛟
+mbhf; é¸
+mbsm; ç¿®
+mbtk; 霙
+mbyv; é„
+mgau; ç‘
+mgbd; ç¤
+mgbm; çŠ
+mgbu; 瑤
+mghn; ç
+mgjr; ç¯
+mgkr; çˆ
+mgmg; 臸
+mgoi; 玳
+mgok; 玫
+mgon; ç´
+mgq; 臻
+mgq; 瑧
+mgtc; çª
+mgtg; 瑾
+mgtk; ç’ž
+mgyj; ç’‰
+mgyo; ç’©
+mgyu; ç¥
+mmhf; 醺
+mnoh; 殤
+mrdm; ç µ
+mrno; ç
+mrog; 碓
+mrtc; 碘
+mrti; 礡
+mrw; 碅
+mwhr; é…ª
+nbks; 觔
+nfhf; 鯀
+nlhg; 陞
+nlhj; é™´
+nlhm; 陲
+nlmu; 阨
+nloi; é™°
+nltt; 隘
+oihe; 餿
+oihi; 餓
+oipu; 飩
+oitg; 饉
+okog; 矬
+omnl; 佤
+onmm; æ°¬
+ooln; æ°Ÿ
+opbc; 貸
+ormc; é œ
+pfmc; 顈
+qdmi; 耨
+rmhd; è·º
+rmho; 蹤
+rmii; 躕
+rmnd; è·º
+rmor; 蹌
+rmsr; è·¼
+rmtt; è·°
+rmub; 踹
+rrik; ç¸
+rrir; è·†
+rrsr; è·¼
+rrwj; 蹕
+rshf; 鶚
+sfhb; é©•
+sfhp; 騬
+sfmf; 騵
+srnl; 邵
+srtq; ç¾£
+svnl; é‚”
+tcno; æ‰
+tgbu; 覲
+tgio; 羨
+tgks; 勤
+tihf; 鶿
+tmnl; é„ž
+vfbe; 綬
+vfbr; 絧
+vfbv; ç¶
+vfbv; 纓
+vfgc; 纈
+vfhb; 綿
+vfhe; ç·ž
+vfhf; 鸞
+vfhp; 總
+vfja; ç·’
+vfjc; 縯
+vfki; ç´˜
+vfmi; 縟
+vfni; 纔
+vfnu; çµ»
+vfob; 綸
+vfpu; ç¸
+vfsu; ç´€
+vfyb; ç¸
+vfyj; 綽
+vfyk; ç´‹
+vvru; é‚•
+vvwd; 綑
+yhmc; é¡
+yoln; 劇
+yrbn; 嬴
+yrff; 讜
+yrgr; è†
+yrhe; è
+yrhr; 詬
+yrhs; 誘
+yrir; è©’
+yrjm; è«
+yrmj; èš
+yrmr; 訶
+yrnb; èŽ
+yrob; 訥
+yrog; è©®
+yron; 訖
+yrop; è«—
+yrpa; 諧
+yrpd; 訑
+yrsr; è©”
+yrtd; 諜
+yrya; 諳
+yryb; 謫
+yryd; è«„
+yryk; 詨
+yrys; 謗
+ysok; æ—
+ysoy; æ—ƒ
+ythf; 鸕
+yyhn; 颯
+noi; é™°
+osr; 倨
+aasj; é—¢
+bubd; ç¬
+ggfb; 趙
+iibr; 禂
+iihu; 冼
+iiru; 祀
%chardef end
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gcin.spec 23 Nov 2006 13:42:53 -0000 1.15
+++ gcin.spec 3 Dec 2006 07:27:38 -0000 1.16
@@ -1,6 +1,6 @@
Name: gcin
-Version: 1.3.0.1
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
Summary: Input method for Traditional Chinese
Group: System Environment/Libraries
@@ -109,6 +109,9 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Sun Dec 03 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.1-1
+- update to 1.3.1
+
* Thu Nov 23 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.0.1-2
- rebuild
gcin_update.patch:
Index: gcin_update.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin_update.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcin_update.patch 23 Nov 2006 13:42:53 -0000 1.1
+++ gcin_update.patch 3 Dec 2006 07:27:38 -0000 1.2
@@ -1,404 +1,11 @@
-diff -urN gcin-1.3.0.1.orig/gcin.h gcin-1.3.0.1/gcin.h
---- gcin-1.3.0.1.orig/gcin.h 2006-10-05 14:05:00.000000000 +0800
-+++ gcin-1.3.0.1/gcin.h 2006-11-22 18:00:42.000000000 +0800
-@@ -117,6 +117,7 @@
- gboolean utf8_str_eq(char *a, char *b, int len);
- void utf8cpyN(char *t, char *s, int N);
- int utf8_str_N(char *str);
-+void utf8cpyn(char *t, char *s, int n);
-
- void get_gcin_dir(char *tt);
- Atom get_gcin_atom(Display *dpy);
-diff -urN gcin-1.3.0.1.orig/gtab.c gcin-1.3.0.1/gtab.c
---- gcin-1.3.0.1.orig/gtab.c 2006-11-20 13:04:59.000000000 +0800
-+++ gcin-1.3.0.1/gtab.c 2006-11-22 18:00:14.000000000 +0800
-@@ -80,13 +80,15 @@
- return strlen(a) - strlen(b);
- }
-
--#define tblch(i) (cur_inmd->key64 ? cur_inmd->tbl64[i].ch:cur_inmd->tbl[i].ch)
--#define Max_tab_key_num (cur_inmd->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
-+#define tblch2(inm, i) (inm->key64 ? inm->tbl64[i].ch:inm->tbl[i].ch)
-+#define tblch(i) tblch2(cur_inmd, i)
-+#define Max_tab_key_num1(inm) (inm->key64 ? MAX_TAB_KEY_NUM64 : MAX_TAB_KEY_NUM)
-+#define Max_tab_key_num Max_tab_key_num1(cur_inmd)
- void set_key_codes_label(char *s);
-
- void lookup_gtab(char *ch, char out[])
- {
-- char *tbuf[32];
-+ char *tbuf[128];
- int tbufN=0;
- INMD *tinmd = &inmd[default_input_method];
-
-@@ -98,7 +100,7 @@
-
- int i;
- for(i=0; i < tinmd->DefChars; i++) {
-- char *chi = tblch(i);
-+ char *chi = tblch2(tinmd, i);
-
- if (!(chi[0] & 0x80))
- continue;
-@@ -112,7 +114,7 @@
- int tlen=0;
- char t[CH_SZ * MAX_TAB_KEY_NUM64 + 1];
-
-- for(j=Max_tab_key_num - 1; j>=0; j--) {
-+ for(j=Max_tab_key_num1(tinmd) - 1; j>=0; j--) {
-
- int sh = j * KeyBits;
- int k = (key >> sh) & 0x3f;
-@@ -516,8 +518,6 @@
-
- fclose(fp);
-
-- inp->max_keyN = 5;
--
- if (usenow) {
- cur_inmd=inp;
- // reset_inp();
-@@ -525,7 +525,6 @@
- DispInArea();
- }
-
--
- dbg("key64: %d\n", inp->key64);
-
- if (gtab_space_auto_first == GTAB_space_auto_first_none)
-@@ -689,7 +688,9 @@
-
- static u_int vmask[]=
- { 0,
-- 0x3f<<24, (0x3f<<24)|(0x3f<<18), (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
-+ (0x3f<<24),
-+ (0x3f<<24)|(0x3f<<18),
-+ (0x3f<<24)|(0x3f<<18)|(0x3f<<12),
- (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6),
- (0x3f<<24)|(0x3f<<18)|(0x3f<<12)|(0x3f<<6)|0x3f
- };
-@@ -881,7 +882,9 @@
- strcat(strcat(tt, seltab[i]), " ");
- strcat(tt, "</span>");
- } else {
-- strcat(strcat(tt, seltab[i]), " ");
-+ char uu[512];
-+ utf8cpyn(uu, seltab[i], 6);
-+ strcat(strcat(tt, uu), " ");
- }
- } else {
- extern gboolean b_use_full_space;
-@@ -960,14 +963,13 @@
-
- bzero(seltab_phrase, sizeof(seltab_phrase));
-
--
- // dbg("uuuuu %x %x\n", key, kbstate);
-
- if (!cur_inmd)
- return 0;
-
- if (kbstate & (Mod1Mask|ControlMask)) {
-- return 0;
-+ return 0;
- }
-
-
-@@ -1074,7 +1076,6 @@
-
- if (wild_mode) {
- // request from tetralet
-- dbg("zzz %d %d\n",wild_page, defselN);
- if (!wild_page && defselN < cur_inmd->M_DUP_SEL) {
- sel1st_i = 0;
- goto direct_select;
-@@ -1189,7 +1190,6 @@
-
- pselkey=ptr_selkey(key);
-
--
- if (!pselkey && (key < 32 || key > 0x7e) && (gtab_full_space_auto_first || spc_pressed)) {
- // dbg("%x %x sel1st_i:%d '%c'\n", pselkey, key, sel1st_i, seltab[sel1st_i][0]);
- if (seltab[sel1st_i][0])
-@@ -1198,7 +1198,6 @@
- return 0;
- }
-
--
- inkey=cur_inmd->keymap[key];
-
- // dbg("spc_pressed %d %d %d\n", spc_pressed, last_full, cur_inmd->MaxPress);
-@@ -1308,8 +1307,9 @@
- return 0;
- }
-
-- if (defselN)
-+ if (defselN) {
- goto YYYY;
-+ }
- }
- } /* switch */
-
-@@ -1347,19 +1347,11 @@
- s1++;
-
- last_idx=s1;
-+
- #if 0
-- dbg("inch %d %d val:%x\n", inch[0], inch[1], val);
-- u_char *tbl_ch = tblch(s1);
-- dbg("s1:%d e1:%d key:%llx ci:%d vmask[ci]:%llx ch:%c%c%c and:%x\n", s1, e1, CONVT2(cur_inmd, s1),
-- ci, vmaskci, tbl_ch[0], tbl_ch[1], tbl_ch[2], CONVT2(cur_inmd, s1) & vmask[ci]);
--
-- dbg("pselkey:%x %d defselN:%d\n", pselkey,
-- (CONVT2(cur_inmd, s1) & vmask[ci])!=val,
-- defselN);
-+ dbg("ci:%d %d\n", ci, ((CONVT2(cur_inmd, s1) & vmaskci)!=val));
+--- gcin-1.3.1/gtab.h.orig 2006-11-22 15:15:11.000000000 +0800
++++ gcin-1.3.1/gtab.h 2006-12-03 15:15:24.000000000 +0800
+@@ -104,7 +104,7 @@
+ #define GTAB_LIST "gtab.list"
+
+ #if 1
+-#define NEED_SWAP (__BYTE_ORDER == __BIG_ENDIAN && 1)
++#define NEED_SWAP (__BYTE_ORDER == __BIG_ENDIAN && 0)
+ #else
+ #define NEED_SWAP (1)
#endif
-
-- vmaskci = cur_inmd->key64 ? vmask64[ci]:vmask[ci];
--
- if ((CONVT2(cur_inmd, s1) & vmaskci)!=val || (wild_mode && defselN) ||
- ((ci==cur_inmd->MaxPress||spc_pressed) && defselN &&
- (pselkey && ( pendkey || spc_pressed)) ) ) {
-@@ -1412,7 +1404,6 @@
- j=s1;
-
- if (ci < cur_inmd->MaxPress && !spc_pressed && !pendkey) {
-- int shiftb=(KEY_N - 1 -ci) * KeyBits;
-
- exa_match=0;
- bzero(seltab, sizeof(seltab));
-@@ -1423,32 +1414,29 @@
- j++;
- }
-
--
- defselN=exa_match;
-
- if (defselN > cur_inmd->M_DUP_SEL)
- defselN--;
-
-+ int shiftb=(KEY_N - 1 -ci) * KeyBits;
-+
- if (gtab_disp_partial_match)
-- while((CONVT2(cur_inmd, j) & vmask[ci])==val && j<e1) {
-+ while((CONVT2(cur_inmd, j) & vmaskci)==val && j<e1) {
- int fff=cur_inmd->keycol[(CONVT2(cur_inmd, j)>>shiftb) & 0x3f];
- u_char *tbl_ch = tblch(j);
--
-+#if 0
-+ dbg("jj %d", fff); utf8_putchar(tbl_ch); dbg("\n");
-+#endif
- if (!seltab[fff][0] || seltab_phrase[fff] ||
- (bchcmp(seltab[fff], tbl_ch)>0 && fff > exa_match)) {
- #if 0
-- if (tbl_ch[0] >= 0x80) {
-- bchcpy(seltab[fff], tbl_ch);
-- defselN++;
-- }
-- else
-- if (!seltab[fff][0]) {
-- load_phr(j, seltab[fff]);
-- seltab_phrase[fff] = TRUE;
-- }
--#endif
- if (!(seltab_phrase[fff] = load_seltab(j, fff)))
- defselN++;
-+#else
-+ seltab_phrase[fff] = load_seltab(j, fff);
-+ defselN++;
-+#endif
- }
-
- j++;
-diff -urN gcin-1.3.0.1.orig/locale.c gcin-1.3.0.1/locale.c
---- gcin-1.3.0.1.orig/locale.c 2006-10-05 14:05:16.000000000 +0800
-+++ gcin-1.3.0.1/locale.c 2006-11-22 18:00:41.000000000 +0800
-@@ -165,3 +165,19 @@
-
- return N;
- }
-+
-+void utf8cpyn(char *t, char *s, int n)
-+{
-+ int tn=0;
-+ int i;
-+
-+ for (i=0; i < n && *s; i++) {
-+ int sz = utf8_sz(s);
-+
-+ memcpy(t+tn, s, sz);
-+ tn+=sz;
-+ s+=sz;
-+ }
-+
-+ t[tn]=0;
-+}
-diff -urN gcin-1.3.0.1.orig/tsin-parse.c gcin-1.3.0.1/tsin-parse.c
---- gcin-1.3.0.1.orig/tsin-parse.c 2006-10-20 15:06:34.000000000 +0800
-+++ gcin-1.3.0.1/tsin-parse.c 2006-11-22 11:08:59.000000000 +0800
-@@ -96,7 +96,7 @@
- if (i < plen)
- continue;
-
-- int score;
-+ float score;
-
- score = plen;
- if (match_len > plen) {
-@@ -116,7 +116,7 @@
- continue;
- }
-
-- score = usecount + 50 * plen * plen;
-+ score = (float)usecount + 200 * plen * plen * plen;
-
- if (pbestscore >= score)
- continue;
---- gcin-1.3.0.1/gcin2tab.c.orig 2006-08-20 16:26:34.000000000 +0800
-+++ gcin-1.3.0.1/gcin2tab.c 2006-11-23 17:31:11.000000000 +0800
-@@ -13,7 +13,7 @@
- #include <string.h>
- #include "gcin.h"
- #include "gtab.h"
--
-+#include "gcin-endian.h"
-
- FILE *fr, *fw;
- int lineno;
-@@ -149,13 +149,7 @@
- if (a->key > b->key) return 1;
- if (a->key < b->key) return -1;
-
--#if FREEBSD
-- if (a->oseq > b->oseq) return 1;
-- if (a->oseq < b->oseq) return -1;
-- return 0;
--#else
- return a->oseq - b->oseq;
--#endif
- }
-
-
-@@ -166,13 +160,7 @@
- if (a->key > b->key) return 1;
- if (a->key < b->key) return -1;
-
--#if FREEBSD
-- if (a->oseq > b->oseq) return 1;
-- if (a->oseq < b->oseq) return -1;
-- return 0;
--#else
- return a->oseq - b->oseq;
--#endif
- }
-
-
-@@ -423,7 +411,6 @@
-
- if ((len=strlen(arg)) <= CH_SZ && (arg[0] & 0x80)) {
- char out[CH_SZ+1];
-- int u8len = utf8_sz(arg);
-
- bzero(out, sizeof(out));
- memcpy(out, arg, len);
-@@ -446,7 +433,7 @@
- }
-
- if (len > MAX_CIN_PHR)
-- p_err("phrase too long: %s\n", arg);
-+ p_err("phrase too long: %s max:%d bytes\n", arg, MAX_CIN_PHR);
-
- phridx = trealloc(phridx, int, phr_cou+1);
- phridx[phr_cou++]=prbf_cou;
-@@ -467,7 +454,6 @@
- qsort(itar, chno,sizeof(ITEM2), qcmp2);
-
-
--
- if (key64) {
- for(i=0;i<chno;i++) {
- if (!i || memcmp(&itar64[i], &itar64[i-1], sizeof(ITEM64))) {
-@@ -486,20 +472,23 @@
- th.DefC=chno;
- cur_inmd->DefChars = chno;
-
-+#if FREEBSD
-+#define _sort mergesort
-+#else
-+#define _sort qsort
-+#endif
-+
- if (key64)
-- qsort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
-+ _sort(itmp64,chno,sizeof(ITEM2_64),qcmp_64);
- else
-- qsort(itmp,chno,sizeof(ITEM2),qcmp);
--
-+ _sort(itmp,chno,sizeof(ITEM2),qcmp);
-
- if (key64) {
-- for(i=0;i<chno;i++) {
-+ for(i=0;i<chno;i++)
- memcpy(&itout64[i],&itmp64[i],sizeof(ITEM64));
-- }
- } else {
-- for(i=0;i<chno;i++) {
-+ for(i=0;i<chno;i++)
- memcpy(&itout[i],&itmp[i],sizeof(ITEM));
-- }
- }
-
-
-@@ -526,24 +515,49 @@
-
- printf("Defined Characters:%d\n", chno);
-
-+#if NEED_SWAP
-+ to_gcin_endian_4(&th.version);
-+ to_gcin_endian_4(&th.flag);
-+ to_gcin_endian_4(&th.space_style);
-+ to_gcin_endian_4(&th.KeyS);
-+ to_gcin_endian_4(&th.MaxPress);
-+ to_gcin_endian_4(&th.M_DUP_SEL);
-+ to_gcin_endian_4(&th.DefC);
-+#endif
- fwrite(&th,1,sizeof(th),fw);
- fwrite(keymap, 1, KeyNum, fw);
- fwrite(kname, CH_SZ, KeyNum, fw);
- fwrite(idx1, sizeof(gtab_idx1_t), KeyNum+1, fw);
-
- if (key64) {
-+#if NEED_SWAP
-+ for(i=0; i < chno; i++) {
-+ to_gcin_endian_8(&itout64[i].key);
-+ }
-+#endif
- fwrite(itout64, sizeof(ITEM64), chno, fw);
- #if 0
- for(i=0; i < 100; i++)
- dbg("%d] %c%c%c\n", i, itout64[i].ch[0], itout64[i].ch[1], itout64[i].ch[2]);
- #endif
- }
-- else
-+ else {
-+#if NEED_SWAP
-+ for(i=0; i < chno; i++) {
-+ to_gcin_endian_4(&itout[i].key);
-+ }
-+#endif
- fwrite(itout, sizeof(ITEM), chno, fw);
-+ }
-
- if (phr_cou) {
- phridx[phr_cou++]=prbf_cou;
- printf("phrase count:%d\n", phr_cou);
-+#if NEED_SWAP
-+ for(i=0; i < 100; i++)
-+ to_gcin_endian_4(&phridx[i]);
-+ to_gcin_endian_4(&phr_cou);
-+#endif
- fwrite(&phr_cou, sizeof(int), 1, fw);
- fwrite(phridx, sizeof(int), phr_cou, fw);
- fwrite(phrbuf,1,prbf_cou,fw);
im-client.patch:
Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/im-client.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- im-client.patch 23 Nov 2006 13:36:53 -0000 1.4
+++ im-client.patch 3 Dec 2006 07:27:38 -0000 1.5
@@ -14,15 +14,6 @@
diff -urN gcin-1.3.0.1.orig/im-client/Makefile gcin-1.3.0.1/im-client/Makefile
--- gcin-1.3.0.1.orig/im-client/Makefile 2006-11-15 13:04:52.000000000 +0800
+++ gcin-1.3.0.1/im-client/Makefile 2006-11-23 16:24:35.000000000 +0800
-@@ -10,7 +10,7 @@
- -DCLIENT_LIB=1 -DGCIN_BIN_DIR=\"$(GCIN_BIN_DIR)\" \
- -DDEBUG="0$(GCIN_DEBUG)" -DGCIN_TABLE_DIR=\"$(GCIN_TABLE_DIR)\" \
- -DFREEBSD=$(FREEBSD)
--OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt.o
-+OBJS = gcin-im-client.o im-addr.o gcin-conf.o util.o gcin-crypt-fpic.o
-
- .c.E:
- $(CC) $(CFLAGS) -E -o $@ $<
@@ -27,9 +27,9 @@
LOCALLIB=/usr/local/$(LIB)
@@ -36,16 +27,6 @@
ln -sf $(SOFILEVER) $(SOFILE).1
install -d $(includedir)
install -m 444 gcin-im-client.h $(includedir)
-@@ -43,6 +43,9 @@
- im-addr.o: ../im-srv/im-addr.c
- $(CC) -c -fpic $(CFLAGS) -o $@ $<
-
-+gcin-crypt-fpic.o: gcin-crypt.c
-+ $(CC) -c -fpic $(CFLAGS) -o $@ $<
-+
- clean:
- rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
-
diff -urN gcin-1.3.0.1.orig/Makefile gcin-1.3.0.1/Makefile
--- gcin-1.3.0.1.orig/Makefile 2006-11-21 11:03:53.000000000 +0800
+++ gcin-1.3.0.1/Makefile 2006-11-23 16:26:15.000000000 +0800
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 23 Nov 2006 13:36:53 -0000 1.10
+++ sources 3 Dec 2006 07:27:38 -0000 1.11
@@ -1 +1 @@
-ff15fafd546f1fa33c945c2896a39a87 gcin-1.3.0.1.tar.bz2
+3b6fb7483bc894af3ba787268584b3c2 gcin-1.3.1.tar.bz2
- Previous message (by thread): rpms/gcin/devel .cvsignore, 1.10, 1.11 NewCJ3.cin, 1.3, 1.4 gcin.spec, 1.16, 1.17 gcin_update.patch, 1.1, 1.2 im-client.patch, 1.4, 1.5 sources, 1.10, 1.11
- Next message (by thread): rpms/gcin/FC-5 .cvsignore, 1.10, 1.11 NewCJ3.cin, 1.3, 1.4 gcin.spec, 1.14, 1.15 gcin_update.patch, 1.1, 1.2 im-client.patch, 1.4, 1.5 sources, 1.10, 1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list