rpms/gcin/FC-6 .cvsignore, 1.13, 1.14 NewCJ3.cin, 1.5, 1.6 gcin.spec, 1.18, 1.19 gcin_gtab.patch, 1.2, 1.3 im-client.patch, 1.6, 1.7 sources, 1.13, 1.14

Chung-Yen Chang (candyz) fedora-extras-commits at redhat.com
Tue Apr 17 01:55:25 UTC 2007


Author: candyz

Update of /cvs/extras/rpms/gcin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4198

Modified Files:
	.cvsignore NewCJ3.cin gcin.spec gcin_gtab.patch 
	im-client.patch sources 
Log Message:
update to 1.3.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	30 Jan 2007 02:20:21 -0000	1.13
+++ .cvsignore	17 Apr 2007 01:54:50 -0000	1.14
@@ -1 +1 @@
-gcin-1.3.3.tar.bz2
+gcin-1.3.4.tar.bz2


Index: NewCJ3.cin
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/NewCJ3.cin,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NewCJ3.cin	30 Jan 2007 02:20:21 -0000	1.5
+++ NewCJ3.cin	17 Apr 2007 01:54:50 -0000	1.6
@@ -3,7 +3,6 @@
 %cname 亂倉打鳥
 %selkey 123456789
 %keyname begin
-`  `
 '  、
 ,  ,
 .  。
@@ -355,7 +354,6 @@
 t;o 對他
 t;p 對情
 t;u 對你
-` €
 , ,
 ,, !
 . 。


Index: gcin.spec
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gcin.spec	30 Jan 2007 02:20:21 -0000	1.18
+++ gcin.spec	17 Apr 2007 01:54:50 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           gcin
-Version:        1.3.3
+Version:        1.3.4
 Release:        1%{?dist}
 Summary:        Input method for Traditional Chinese
 
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%patch10 -p1 -b .update
+#%patch10 -p1 -b .update
 %patch1 -p1 -b .im-client
 %patch2 -p1 -b .qt
 %patch3 -p1 -b .configure
@@ -112,6 +112,9 @@
 %{_libdir}/libgcin-im-client.so*
 
 %changelog
+* Tue Apr 17 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.4-1
+- update to 1.3.4
+
 * Tue Jan 30 2007 Chung-Yen Chang <candyz0416 at gmail.com> - 1.3.3-1
 - update to 1.3.3
 

gcin_gtab.patch:

Index: gcin_gtab.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/gcin_gtab.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcin_gtab.patch	30 Jan 2007 02:20:21 -0000	1.2
+++ gcin_gtab.patch	17 Apr 2007 01:54:50 -0000	1.3
@@ -1,6 +1,15 @@
-diff -urN gcin-1.3.2.orig/gtab.c gcin-1.3.2/gtab.c
---- gcin-1.3.2.orig/gtab.c	2006-12-29 23:51:37.000000000 +0800
-+++ gcin-1.3.2/gtab.c	2007-01-01 08:59:01.000000000 +0800
+diff -urN gcin-1.3.4.orig/gtab.h gcin-1.3.4/gtab.h
+--- gcin-1.3.4.orig/gtab.h	2007-04-04 09:44:09.000000000 +0800
++++ gcin-1.3.4/gtab.h	2007-04-12 09:00:19.000000000 +0800
+@@ -1,4 +1,4 @@
+-#define MAX_CIN_PHR (100*CH_SZ + 1)
++#define MAX_CIN_PHR (200*CH_SZ + 1)
+ 
+ 
+ 
+diff -urN gcin-1.3.4.orig/gtab.c gcin-1.3.4/gtab.c
+--- gcin-1.3.4.orig/gtab.c	2007-04-04 11:41:59.000000000 +0800
++++ gcin-1.3.4/gtab.c	2007-04-12 12:07:08.000000000 +0800
 @@ -190,9 +190,12 @@
    for(i=0; i < tbufN; i++) {
  #define MAX_DISP_MATCH 40
@@ -15,31 +24,33 @@
      }
  
      free(tbuf[i]);
-@@ -838,7 +842,14 @@
+@@ -883,10 +886,16 @@
    int i;
    for(i=ofs; i< cur_inmd->M_DUP_SEL + ofs; i++) {
      if (seltab[i][0]) {
 +      if (!gtab_vertical_select)
-+        strcat(tt, "<span foreground=\"red\">");
++	strcat(tt, "<span foreground=\"red\">");
 +
+       char selback[MAX_CIN_PHR+16];
+       add_backslash(seltab[i], selback);
+ 
        b1_cat(tt, cur_inmd->selkey[i - ofs]);
-+
 +      if (!gtab_vertical_select)
-+        strcat(tt, "</span>");
++	strcat(tt, "</span>");
 +
        if (gtab_vertical_select)
          strcat(tt, ". ");
  
-@@ -850,7 +861,7 @@
-         char uu[512];
+@@ -898,7 +907,7 @@
+         char uu[MAX_CIN_PHR];
  
          if (gtab_vertical_select) {
--          utf8cpy_bytes(uu, seltab[i], 60);
-+          utf8cpy_bytes(uu, seltab[i], 120);
+-          utf8cpy_bytes(uu, selback, 60);
++          utf8cpy_bytes(uu, selback, 120);
            strcat(tt, uu);
          } else {
-           char *p = seltab[i];
-@@ -1167,6 +1178,8 @@
+           char *p = selback;
+@@ -1214,6 +1223,8 @@
          return 0;
        }
      case XK_Prior:
@@ -48,7 +59,7 @@
      case XK_KP_Subtract:
        if (wild_mode) {
          if (wild_page >= cur_inmd->M_DUP_SEL) wild_page-=cur_inmd->M_DUP_SEL;
-@@ -1182,6 +1195,8 @@
+@@ -1229,6 +1240,8 @@
        }
        return 0;
      case XK_Next:
@@ -57,12 +68,3 @@
      case XK_KP_Add:
        if (more_pg) {
  next_page:
-diff -urN gcin-1.3.2.orig/gtab.h gcin-1.3.2/gtab.h
---- gcin-1.3.2.orig/gtab.h	2006-12-18 11:15:18.000000000 +0800
-+++ gcin-1.3.2/gtab.h	2007-01-01 08:59:01.000000000 +0800
-@@ -1,4 +1,4 @@
--#define MAX_CIN_PHR (100*CH_SZ + 1)
-+#define MAX_CIN_PHR (200*CH_SZ + 1)
- 
- 
- 

im-client.patch:

Index: im-client.patch
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/im-client.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- im-client.patch	30 Jan 2007 02:20:21 -0000	1.6
+++ im-client.patch	17 Apr 2007 01:54:50 -0000	1.7
@@ -27,9 +27,9 @@
  	ln -sf $(SOFILEVER) $(SOFILE).1
  	install -d $(includedir)
  	install -m 444 gcin-im-client.h $(includedir)
-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
+diff -urN gcin-1.3.4.orig/Makefile gcin-1.3.4/Makefile
+--- gcin-1.3.4.orig/Makefile    2007-04-10 09:56:33.000000000 +0800
++++ gcin-1.3.4/Makefile 2007-04-12 11:52:46.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 gtab-list.o
@@ -38,8 +38,8 @@
 +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 gcin-icon.o \
--     gcin-switch.o $(GCIN_SO) \
-+     gcin-switch.o  $(gcin1_o) \
+-     gcin-switch.o gcin-exec-script.o $(GCIN_SO) \
++     gcin-switch.o gcin-exec-script.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 \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcin/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	30 Jan 2007 02:20:21 -0000	1.13
+++ sources	17 Apr 2007 01:54:50 -0000	1.14
@@ -1 +1 @@
-8cf166c401b23eb42454170befbcacad  gcin-1.3.3.tar.bz2
+20ae604f49fd57c38b9395941ef66cc2  gcin-1.3.4.tar.bz2




More information about the scm-commits mailing list