rpms/gcin/FC-3 gcin_update.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 NewCJ3.cin, 1.1, 1.2 gcin.spec, 1.13, 1.14 im-client.patch, 1.3, 1.4 sources, 1.9, 1.10
Chung-Yen Chang (candyz)
fedora-extras-commits at redhat.com
Thu Nov 23 13:55:44 UTC 2006
- Previous message (by thread): rpms/gcin/FC-4 gcin_update.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec, 1.14, 1.15 im-client.patch, 1.3, 1.4 sources, 1.9, 1.10
- Next message (by thread): rpms/jd/devel .cvsignore, 1.21, 1.22 jd.spec, 1.28, 1.29 sources, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: candyz
Update of /cvs/extras/rpms/gcin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1413
Modified Files:
.cvsignore NewCJ3.cin gcin.spec im-client.patch sources
Added Files:
gcin_update.patch
Log Message:
update to 1.3.0.1
gcin_update.patch:
--- NEW FILE gcin_update.patch ---
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));
#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);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 15 Nov 2006 07:21:32 -0000 1.9
+++ .cvsignore 23 Nov 2006 13:55:13 -0000 1.10
@@ -1 +1 @@
-gcin-1.2.9.tar.bz2
+gcin-1.3.0.1.tar.bz2
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.1 -r 1.2 NewCJ3.cin
Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/NewCJ3.cin,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewCJ3.cin 15 Nov 2006 07:21:32 -0000 1.1
+++ NewCJ3.cin 23 Nov 2006 13:55:13 -0000 1.2
@@ -40,6 +40,32 @@
` ⬠é è¨ä¸ä½¿ç¨ï¼å çº 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 æèª
. ã
.. ï¼
.. ï¼
@@ -52,7 +78,6 @@
... â¦
... âµ
... â´
-.; é»
' ã
'' "
'' "
@@ -169,38 +194,549 @@
]]] ï¹
]]] ︾
;a é¦
-;b 稱
+;b 師
+;bb 稱
;c ç©
;cu ç¨
;d å£
;e 飯
;f ç§
+;fh ç§
;g ç¨
;h 種
;i æ
-;ii æå
;i; ç§
+;ia ææ¯
+;iai ææ¯æ
+;iao ææ¯ä»
+;iau ææ¯ä½
+;ib ææ
+;ibi æææ
+;ibo ææä»
+;ibu ææä½
+;id ææ³
+;idi ææ³æ
+;idm ææ³è¦
+;ido ææ³ä»
+;idu ææ³ä½
+;if æé¡
+;ify æé¡æ
+;ig æå¨
+;ih æç
+;ihb æçæ
+;ihbp æçææ
+;ihp æçå¿
+;ii æçº
+;iii æçºæ
+;iio æçºä»
+;iip æè½
+;iiu æçºä½
+;ik ææ
+;il æ被
+;ili æ被æ
+;ilo æ被ä»
+;ilu æ被ä½
+;im æè¦
+;imb æå
+;imd æä¸æ³
+;imf æä¸
+;imi æè¦æ
+;imm æä¸å
+;imo æè¦ä»
+;imu æè¦ä½
+;imv æä¸è¦
+;imz æä¸æ
+;io æå
+;ip ææ¨
+;ipi ææ¨æ
+;ipo ææ¨ä»
+;ipu ææ¨ä½
+;ir æå
+;iri æåæ
+;irih æåæç
+;iro æåä»
+;iroh æåä»ç
+;iru æåä½
+;iruh æåä½ ç
+;is æå·²
+;isv æå·²ç¶
+;iu æè¡
+;iv æ給
+;ivi æ給æ
+;ivo æ給ä»
+;ivu æ給ä½
+;iy æé
+;iz ææ
+;izi æè®æ
+;izo æè®ä»
+;izu æè®ä½
+;izv æè®
;j 館
;k ç§
;l å©
;l ç§
-;l; ç§
;m ç§
;n é£
-;o 飲
+;o ä»
+;oa ä»æ¯
+;oai ä»æ¯æ
+;oao ä»æ¯ä»
+;oau ä»æ¯ä½
+;ob ä»æ
+;obi ä»ææ
+;obo ä»æä»
+;obu ä»æä½
+;od ä»æ³
+;odi ä»æ³æ
+;odm ä»æ³è¦
+;odo ä»æ³ä»
+;odu ä»æ³ä½
+;of ä»é¡
+;ofy ä»é¡æ
+;og ä»å¨
+;oh ä»ç
+;ohb ä»çæ
+;ohbp ä»çææ
+;ohp ä»çå¿
+;oi ä»çº
+;oii ä»çºæ
+;oio ä»çºä»
+;oip ä»è½
+;oiu ä»çºä½
+;ok ä»æ
+;ol ä»è¢«
+;oli ä»è¢«æ
+;olo ä»è¢«ä»
+;olu ä»è¢«ä½
+;om ä»è¦
+;omb ä»å
+;omd ä»ä¸æ³
+;omf ä»ä¸
+;omi ä»è¦æ
+;omm ä»ä¸å
+;omo ä»è¦ä»
+;omu ä»è¦ä½
+;omv ä»ä¸è¦
+;omz ä»ä¸æ
+;oo ä»å
+;op ä»æ¨
+;opi ä»æ¨æ
+;opo ä»æ¨ä»
+;opu ä»æ¨ä½
+;or ä»å
+;ori ä»åæ
+;orih ä»åæç
+;oro ä»åä»
+;oroh ä»åä»ç
+;oru ä»åä½
+;oruh ä»åä½ ç
+;os ä»å·²
+;osv ä»å·²ç¶
+;ou ä»è¡
+;ov ä»çµ¦
+;ovi ä»çµ¦æ
+;ovo ä»çµ¦ä»
+;ovu ä»çµ¦ä½
[...21102 lines suppressed...]
+;ytje æè§è
æ¸
+;ytjy å°±æ¥è¼å°
+;ytko 親å大使
+;ytky åè«å¤§æ¼å¿æ»
+;ytlj 亡ç¾è£ç¢
+;ytmf å»è¦èå
+;ytmg èé©ä¸å ´
+;ytml æå
¶é
è
+;ytmn èè½å¹³é½è¢«ç¬æ¬º
+;ytmo ç¢æ¥å·¥äºº
+;ytmw æ¾è©ä¸ç¾
+;ytnr å¸äºå°æ°
+;ytod å¸äºç¡è³´
+;ytoh å¤å¹ä½å
+;ytoj è·è±ä½¿è
+;ytoo æè¥ç¡äºº
+;ytqo é義責任
+;ytsy é·åæ¹é
+;ytth éèå¢ç
+;ytto ç¢æ¥é©å½
+;ytty éçå
¶è©
+;ytve 諱è«å¦æ·±
+;ytwe éè¦ç½°æ³
+;ytyq æ°è交æ¿
+;ytyt 主è§ä¸»ç¾©
+;ytyy éèè¿æ°
+;yuah é«å±±æ¯è¡
+;yuar é¢å±±éè·¯
+;yuee 童山濯濯
+;yuee é«å±±æµæ°´
+;yume éå±±ç©æ°´
+;yuog é¢å¶åå
+;yuph è¨åºå¿
è¡
+;yuyh é å±±éå
+;yuyo é¾å±±æå
+;yvfy é£çºå
è
+;yvfy é¢ç¶åé
+;yvhw 謬以åé
+;yvid å£æ·è³æ¬
+;yvjy æ以è¼é
+;yvkq è¨ç·´æç´
+;yvlh é«ç´ä¸å¸
+;yvlt é¢éèäº
+;yvmt èè®ä¸é©
+;yvmv é£ç¶¿ä¸çµ
+;yvmv é£ç¶¿ä¸æ·
+;yvmv é£çºä¸æ·
+;yvol æ°ç´å
¨æ¸
+;yvot é£ç·ä½æ¥
+;yvoy é©å©å¹´é½¡
+;yvpp è¿éæ
æ¯
+;yvqr 親å¦æ足
+;yvtm æ°å©çç¾
+;yvva å¤ä»¥ç¹¼æ¥
+;yvvw 交é¿æ¨å
+;yvvy æ²ç¶µå¨è¦ª
+;yvya ç¢ç¶æ°è
+;yvyf 諸å¦æ¤é¡
+;yvyg å£æ·å¸å ´
+;yvym 說好說æ¹
+;yvyt 享æ¨ä¸»ç¾©
+;yvyv éå§éå§å½
+;yvyw é³é¿ææ
+;ywhe æææ³æ¹§
+;ywiy 亡åä¹é³
+;ywkh é¢ç²å¤§å¸
+;ywki å¸å大å»
+;ywlo æ£ç²æ³å
µ
+;ywmm æ°å¢¨è¥¿å¥å·
+;ywmy æ½æ©ä¸æå ±
+;ywnt å¿æ©è² 義
+;ywny ç« åå°èªª
+;ywsj èç¾å寵
+;ywyt å¸å主義
+;yyay é«è«éè«
+;yybf æ¦è¦ªç¦é°
+;yycr é«éå
¬è·¯
+;yycr é«ééµè·¯
+;yydc æ´éæ¨çå°
+;yydd é½é½æ´æ´
+;yyde æ´éæ¨æ²³
+;yydt ééç¸å°
+;yyei 交éæ³åº
+;yyen ééæ³å¤
+;yyeu é¼ä¸æ¢å±±
+;yyff è¿·è¿·ç³ç³
+;yygg ééå°å°
+;yygg 親親ç±ç±
+;yyha éè¨è¡æ
+;yyhh èèç風
+;yyhh é«é«èè
+;yyhj é è¬ çäº
+;yyhk ééèªå¨
+;yyhl è¨è«èªç±
+;yyhq é²é失æ
+;yyht ææç義
+;yyhu æ¾èæ¸å±±
+;yyhv è¾£ç£å
é¬
+;yyhw 迢迢åé
+;yyhy è¨è«èæ¢
+;yyhy 說話ç®è©±
+;yyia ç«è«ä¹é
+;yyif æ¥æ¥çºç
+;yyiw é è¬ æç¾
+;yyiw è¬ è¨æç¾
+;yyjj 交éäºæ
+;yyjj èè實實
+;yyjm ééäºç
+;yyjo 交éå®å
¨
+;yyjs èéè馬
+;yyjy å
é輪迴
+;yyjy è«è«æå°
+;yyjy è«è«æ誨
+;yykh 交é大å¸
+;yykl å
å
大é
+;yykp 亢é¾ææ
+;yyky é«é«å¨ä¸
+;yyky 親ä¸å 親
+;yyky 調è©æ¶è¨
+;yylb 訴è¨è²»ç¨
+;yyma å¡éé»å½±
+;yymb 交éå·¥å
·
+;yymb ç«æ¼ä¸æä¹å°
+;yymb é«èä¸åå¯
+;yymb è©©è©æ賦
+;yymg éæä¸å»
+;yymh é«æ¥é²è¡¢
+;yymi æèå½¢æ
+;yymm ä¸ä¸ä¸ä¸
+;yymm æ¹æ¹æ£æ£
+;yymo éé¿ä¸è
+;yymt é²éå
©é£
+;yymt æ¢æ¼è³å
+;yymv é 親ä¸å¦è¿é°
+;yymw 豪æ¾ä¸ç¾
+;yymy å
親ä¸èª
+;yymy äºäºçç«
+;yynh éç« å»ºç¯
+;yynj 說æ解å
+;yynn 許許å¤å¤
+;yynv è«èè²è®
+;yynv è©èå¤è®
+;yyny è©è¨å¤ç«¯
+;yyoa éæ²äººé
+;yyoh å
親ç¡é
+;yyoh ééé å
+;yyoh èªé³ä¿¡ç®±
+;yyoj ææ²å´æ
+;yyol æé飾é
+;yyoo é«é«ä½ä½
+;yyop éé人æ
+;yyor è¨èªç¡å³
+;yyos ç«¥é¡é¶´é«®
+;yyos ç«¥è¨ç¡å¿
+;yyot ééç¡æ
+;yyov éåæ¢ç´
+;yyoy è¿·éç¥è¿
+;yyoy æ°æåéå
+;yypb 主è¨æ¶é«
+;yypd è¨ä¸å¿ä¾
+;yyph 謹è¨æ
è¡
+;yyqb 交éè¦å
+;yyqb éæ²è¦å
+;yyqo å°±æ¤æä½
+;yyqq é®é®æ©æ©
+;yyrm é½é½åç¾
+;yyru éåå£å²¸
+;yysn é è¿é¦³å
+;yysn è¬è¬åå
+;yysq è¾è¾é£æ
+;yytb é«æå
¸å
+;yytj è¨éå
¶å¯¦
+;yytj æ²è©åç´¢
+;yytj ææè½ç©º
+;yytm æ¥æ¥é©é
+;yyto è¾äº¥é©å½
+;yytq è¿è¿´æ²æ
+;yytt è¾è¾è¦è¦
+;yyty ç«èª æ¡è¿
+;yyvc é²éç¶è°·
+;yyvv è°è«ç´ç´
+;yyvv 詳詳細細
+;yyvy 豪è¨å£¯èª
+;yywg éæ¥ç°å°
+;yyyc è¢è¢è«¸å
¬
+;yyyg 亦æ¥äº¦è¶¨
+;yyyj è²åæå
+;yyyl 追亡éå
+;yyym é 交è¿æ»
+;yyym æ£æå°±æ¦
+;yyyn æ¥æ¥é«é
+;yyyt éé主義
+;yyyt è¿æ°éè
+;yyyu 調èé¢å±±
+;yyyv é«é½¡ç¢å©¦
+;yyyy è¨è©è¾¯è«
+;yyyy è¬ è¨æ¢æ¼æºè
+;yyyy æ¾è¨é«è«
+zhaou ç½æ¥ä¾å±±ç¡ï¼é»æ²³å
¥æµ·æµï¼æ¬²çª®åéç®ï¼æ´ä¸ä¸å±¤æ¨ã
%chardef end
Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/gcin.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gcin.spec 15 Nov 2006 07:35:40 -0000 1.13
+++ gcin.spec 23 Nov 2006 13:55:13 -0000 1.14
@@ -1,6 +1,6 @@
Name: gcin
-Version: 1.2.9
-Release: 2%{?dist}
+Version: 1.3.0.1
+Release: 1%{?dist}
Summary: Input method for Traditional Chinese
Group: System Environment/Libraries
@@ -15,6 +15,7 @@
Patch3: configure.patch
Patch4: newcj3.patch
Patch5: tray.patch
+Patch6: gcin_update.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: qt-devel, gtk2-devel, desktop-file-utils
@@ -33,8 +34,9 @@
%patch3 -p1 -b .configure
%patch4 -p1 -b .newcj3
%patch5 -p1 -b .tray
-cp -f gcinicon/gtab.list data/
-cp -f gcinicon/*.png icons/
+%patch6 -p1 -b .up
+#cp -f gcinicon/gtab.list data/
+#cp -f gcinicon/*.png icons/
find . -name \*.h -o -name \*.c | xargs chmod ugo-x
sed -i.strip -e 's|install[ \t][ \t]*-s|install|' Makefile
echo "#!/bin/bash" > scripts/noseeing-inst.tmp
@@ -107,6 +109,9 @@
%{_libdir}/libgcin-im-client.so*
%changelog
+* Thu Nov 23 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.0.1-1
+- update to 1.3.0.1
+
* Wed Nov 15 2006 Chung-Yen Chang <candyz0416 at gmail.com> - 1.2.9-2
- add tray.patch
im-client.patch:
Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/im-client.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- im-client.patch 15 Nov 2006 07:21:32 -0000 1.3
+++ im-client.patch 23 Nov 2006 13:55:13 -0000 1.4
@@ -1,6 +1,20 @@
---- gcin-1.2.8/im-client/Makefile.im-client 2006-10-14 13:12:51.000000000 +0800
-+++ gcin-1.2.8/im-client/Makefile 2006-10-20 09:48:35.000000000 +0800
-@@ -6,7 +6,7 @@
+diff -urN gcin-1.3.0.1.orig/gtk-im/Makefile gcin-1.3.0.1/gtk-im/Makefile
+--- gcin-1.3.0.1.orig/gtk-im/Makefile 2006-10-14 13:16:16.000000000 +0800
++++ gcin-1.3.0.1/gtk-im/Makefile 2006-11-23 16:24:35.000000000 +0800
+@@ -20,8 +20,7 @@
+ .c.o:
+ $(CC) -c -fpic $(CFLAGS) -o $@ $<
+
+-im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so
+- export LD_RUN_PATH=$(gcinlibdir) ;\
++im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
+ $(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
+ rm -f core.*
+
+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)
@@ -22,7 +36,7 @@
ln -sf $(SOFILEVER) $(SOFILE).1
install -d $(includedir)
install -m 444 gcin-im-client.h $(includedir)
-@@ -35,6 +36,9 @@
+@@ -43,6 +43,9 @@
im-addr.o: ../im-srv/im-addr.c
$(CC) -c -fpic $(CFLAGS) -o $@ $<
@@ -30,25 +44,25 @@
+ $(CC) -c -fpic $(CFLAGS) -o $@ $<
+
clean:
- rm -f *.o *.so *~ *.E *.db config.mak tags core.* .depend
+ rm -f *.o *.so *.so.* *~ *.E *.db config.mak tags core.* .depend
---- gcin-1.2.8/Makefile.im-client 2006-10-19 15:33:27.000000000 +0800
-+++ gcin-1.2.8/Makefile 2006-10-20 09:15:50.000000000 +0800
-@@ -8,10 +8,11 @@
+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
+@@ -8,10 +8,10 @@
gcin_pho_o = win-pho.o pho.o pho-util.o pho-sym.o table-update.o pho-dbg.o
gcin_gtab_o = gtab.o win-gtab.o gtab-util.o
-GCIN_SO= gcin1.so
-+gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o
-+#GCIN_SO= gcin1.so
++gcin1_o= intcode.o win-int.o win-message.o phrase.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o
- OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o \
+ OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
- gcin-switch.o tray.o eggtrayicon.o $(GCIN_SO) \
+ gcin-switch.o tray.o eggtrayicon.o $(gcin1_o) \
$(gcin_tsin_o) $(gcin_pho_o) $(gcin_gtab_o)
OBJS_TSLEARN=tslearn.o util.o gcin-conf.o pho-util.o tsin-util.o gcin-send.o pho-sym.o \
-@@ -70,8 +71,7 @@
+@@ -71,8 +71,7 @@
if [ $(QT_IM) = 'Y' ]; then $(MAKE) -C qt-im; fi
gcin: $(OBJS) $(IMdkitLIB) $(im-srv)
@@ -58,20 +72,20 @@
rm -f core.*
ln -sf $@ $@.test
-@@ -124,9 +124,9 @@
+@@ -125,9 +124,9 @@
pin-juyin: $(OBJS_pin_juyin)
$(CC) -o $@ $(OBJS_pin_juyin) $(LDFLAGS)
--gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
+-gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
-gcin1.so: $(gcin1_so)
- $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
-+#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico
++#gcin1_so= intcode.pico win-int.pico win-message.pico phrase.pico win-sym.pico win-inmd-switch.pico pinyin.pico win-pho-near.pico
+#gcin1.so: $(gcin1_so)
+# $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS)
### making the following as .so actuall makes the RSS larger
gcin_gtab_so = gtab.pico win-gtab.pico gtab-util.pico
-@@ -151,15 +151,12 @@
+@@ -152,14 +151,11 @@
ibin:
install $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -80,22 +94,9 @@
install:
install -d $(datadir)/icons
install gcin.png $(datadir)/icons
- install -d $(GCIN_ICON_DIR_i)
- install -m 644 icons/* $(GCIN_ICON_DIR_i)
+ $(MAKE) -C icons install
- install -d $(gcinlibdir)
- install $(GCIN_SO) $(gcinlibdir)
install -d $(bindir)
$(MAKE) -C data install
$(MAKE) -C im-client install
---- gcin-1.2.8/gtk-im/Makefile.orig 2006-10-14 13:16:16.000000000 +0800
-+++ gcin-1.2.8/gtk-im/Makefile 2006-10-20 08:58:46.000000000 +0800
-@@ -20,8 +20,7 @@
- .c.o:
- $(CC) -c -fpic $(CFLAGS) -o $@ $<
-
--im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so
-- export LD_RUN_PATH=$(gcinlibdir) ;\
-+im-gcin.so: $(OBJS) ../im-client/libgcin-im-client.so.1.0.1
- $(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
- rm -f core.*
-
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 15 Nov 2006 07:21:32 -0000 1.9
+++ sources 23 Nov 2006 13:55:13 -0000 1.10
@@ -1 +1 @@
-c6267b4ac52bef4b2e7e20da26acd1e9 gcin-1.2.9.tar.bz2
+ff15fafd546f1fa33c945c2896a39a87 gcin-1.3.0.1.tar.bz2
- Previous message (by thread): rpms/gcin/FC-4 gcin_update.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 NewCJ3.cin, 1.2, 1.3 gcin.spec, 1.14, 1.15 im-client.patch, 1.3, 1.4 sources, 1.9, 1.10
- Next message (by thread): rpms/jd/devel .cvsignore, 1.21, 1.22 jd.spec, 1.28, 1.29 sources, 1.21, 1.22
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list