rpms/gcin/devel .cvsignore, 1.26, 1.27 gcin.spec, 1.56, 1.57 gtk-deprecated.patch, 1.2, 1.3 sources, 1.26, 1.27
Chung-Yen Chang
candyz at fedoraproject.org
Tue Jun 29 03:37:50 UTC 2010
Author: candyz
Update of /cvs/pkgs/rpms/gcin/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8494
Modified Files:
.cvsignore gcin.spec gtk-deprecated.patch sources
Log Message:
update to 1.5.5.pre3
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/.cvsignore,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- .cvsignore 23 Jun 2010 03:37:17 -0000 1.26
+++ .cvsignore 29 Jun 2010 03:37:50 -0000 1.27
@@ -1 +1 @@
-gcin-1.5.1.tar.bz2
+gcin-1.5.5.pre3.tar.bz2
Index: gcin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gcin.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- gcin.spec 23 Jun 2010 03:38:58 -0000 1.56
+++ gcin.spec 29 Jun 2010 03:37:50 -0000 1.57
@@ -1,5 +1,5 @@
Name: gcin
-Version: 1.5.1
+Version: 1.5.5.pre3
Release: 1%{?dist}
Summary: Input method for Traditional Chinese
@@ -113,6 +113,9 @@ fi
%{_libdir}/libgcin-im-client.so*
%changelog
+* Tue Jun 29 2010 Chung-Yen Chang <candyz0416 at gmail.com> - 1.5.5.pre3-1
+- update to 1.5.5.pre3
+
* Wed Jun 23 2010 Chung-Yen Chang <candyz0416 at gmail.com> - 1.5.1-1
- update to 1.5.1
gtk-deprecated.patch:
anthy.cpp | 6 +++++-
eggtrayicon.cpp | 12 ++++++++----
eve.cpp | 22 +++++++++++++++++-----
gtab.cpp | 6 +++++-
gtab.cpp.orig | 9 ++++++---
tray.cpp | 6 +++++-
win-gtab.cpp | 6 +++++-
win0.cpp | 12 ++++++++++--
win1.cpp | 12 ++++++++++--
9 files changed, 71 insertions(+), 20 deletions(-)
Index: gtk-deprecated.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/gtk-deprecated.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- gtk-deprecated.patch 23 Jun 2010 02:48:28 -0000 1.2
+++ gtk-deprecated.patch 29 Jun 2010 03:37:50 -0000 1.3
@@ -1,6 +1,6 @@
-diff -urN gcin-1.5.0.orig/anthy.cpp gcin-1.5.0/anthy.cpp
---- gcin-1.5.0.orig/anthy.cpp 2010-05-11 14:45:46.000000000 +0800
-+++ gcin-1.5.0/anthy.cpp 2010-06-23 10:15:15.000000000 +0800
+diff -urN gcin-1.5.5.pre3.orig/anthy.cpp gcin-1.5.5/anthy.cpp
+--- gcin-1.5.5.pre3.orig/anthy.cpp 2010-05-11 14:45:46.000000000 +0800
++++ gcin-1.5.5/anthy.cpp 2010-06-29 11:25:34.000000000 +0800
@@ -1031,7 +1031,11 @@
int anthy_visible()
@@ -14,9 +14,9 @@ diff -urN gcin-1.5.0.orig/anthy.cpp gcin
}
extern gboolean force_show;
-diff -urN gcin-1.5.0.orig/eggtrayicon.cpp gcin-1.5.0/eggtrayicon.cpp
---- gcin-1.5.0.orig/eggtrayicon.cpp 2010-04-11 14:20:56.000000000 +0800
-+++ gcin-1.5.0/eggtrayicon.cpp 2010-06-23 10:31:04.000000000 +0800
+diff -urN gcin-1.5.5.pre3.orig/eggtrayicon.cpp gcin-1.5.5/eggtrayicon.cpp
+--- gcin-1.5.5.pre3.orig/eggtrayicon.cpp 2010-04-11 14:20:56.000000000 +0800
++++ gcin-1.5.5/eggtrayicon.cpp 2010-06-29 11:25:34.000000000 +0800
@@ -349,8 +349,12 @@
gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
@@ -43,9 +43,9 @@ diff -urN gcin-1.5.0.orig/eggtrayicon.cp
#else
if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
#endif
-diff -urN gcin-1.5.0.orig/eve.cpp gcin-1.5.0/eve.cpp
---- gcin-1.5.0.orig/eve.cpp 2010-06-19 20:03:42.000000000 +0800
-+++ gcin-1.5.0/eve.cpp 2010-06-23 10:34:46.000000000 +0800
+diff -urN gcin-1.5.5.pre3.orig/eve.cpp gcin-1.5.5/eve.cpp
+--- gcin-1.5.5.pre3.orig/eve.cpp 2010-06-19 20:03:42.000000000 +0800
++++ gcin-1.5.5/eve.cpp 2010-06-29 11:25:34.000000000 +0800
@@ -731,11 +731,19 @@
if (!current_CS)
return FALSE;
@@ -84,10 +84,10 @@ diff -urN gcin-1.5.0.orig/eve.cpp gcin-1
}
return FALSE;
-diff -urN gcin-1.5.0.orig/gtab.cpp gcin-1.5.0/gtab.cpp
---- gcin-1.5.0.orig/gtab.cpp 2010-06-23 10:12:45.000000000 +0800
-+++ gcin-1.5.0/gtab.cpp 2010-06-23 10:36:21.000000000 +0800
-@@ -1318,7 +1318,11 @@
+diff -urN gcin-1.5.5.pre3.orig/gtab.cpp gcin-1.5.5/gtab.cpp
+--- gcin-1.5.5.pre3.orig/gtab.cpp 2010-06-29 11:21:59.000000000 +0800
++++ gcin-1.5.5/gtab.cpp 2010-06-29 11:25:34.000000000 +0800
+@@ -1336,7 +1336,11 @@
return feedkey_pho(key, 0);
if (poo.same_pho_query_state == SAME_PHO_QUERY_none && gwin_pho &&
@@ -100,9 +100,44 @@ diff -urN gcin-1.5.0.orig/gtab.cpp gcin-
hide_win_pho();
-diff -urN gcin-1.5.0.orig/tray.cpp gcin-1.5.0/tray.cpp
---- gcin-1.5.0.orig/tray.cpp 2010-06-18 06:07:58.000000000 +0800
-+++ gcin-1.5.0/tray.cpp 2010-06-23 10:37:38.000000000 +0800
+diff -urN gcin-1.5.5.pre3.orig/gtab.cpp.orig gcin-1.5.5/gtab.cpp.orig
+--- gcin-1.5.5.pre3.orig/gtab.cpp.orig 2010-06-27 18:19:57.000000000 +0800
++++ gcin-1.5.5/gtab.cpp.orig 2010-06-29 11:21:59.000000000 +0800
+@@ -163,7 +163,7 @@
+
+ out[0]=0;
+
+- int min_klen = 100;
++ int min_klen = 200;
+
+ int i;
+ for(i=0; i < tinmd->DefChars; i++) {
+@@ -229,9 +229,12 @@
+ for(i=0; i < tbufN; i++) {
+ #define MAX_DISP_MATCH 40
+ if (strlen(out) < MAX_DISP_MATCH) {
++ strcat(out, "[");
+ strcat(out, tbuf[i]);
+ if (i < tbufN-1)
+- strcat(out, " |");
++ strcat(out, "] ");
++ else
++ strcat(out, "]");
+ }
+
+ free(tbuf[i]);
+@@ -1069,7 +1072,7 @@
+ char uu[MAX_CIN_PHR];
+
+ if (gtab_vertical_select) {
+- utf8cpy_bytes(uu, selback, 60);
++ utf8cpy_bytes(uu, selback, 120);
+ strcat(tt, uu);
+ } else {
+ char *p = selback;
+diff -urN gcin-1.5.5.pre3.orig/tray.cpp gcin-1.5.5/tray.cpp
+--- gcin-1.5.5.pre3.orig/tray.cpp 2010-06-18 06:07:58.000000000 +0800
++++ gcin-1.5.5/tray.cpp 2010-06-29 11:25:34.000000000 +0800
@@ -326,7 +326,11 @@
gtk_widget_show_all (GTK_WIDGET (egg_tray_icon));
tray_da_win = gtk_widget_get_window(da);
@@ -116,10 +151,10 @@ diff -urN gcin-1.5.0.orig/tray.cpp gcin-
gtk_widget_destroy(GTK_WIDGET(egg_tray_icon));
da = NULL;
return FALSE;
-diff -urN gcin-1.5.0.orig/win-gtab.cpp gcin-1.5.0/win-gtab.cpp
---- gcin-1.5.0.orig/win-gtab.cpp 2010-06-05 23:07:05.000000000 +0800
-+++ gcin-1.5.0/win-gtab.cpp 2010-06-23 10:45:05.000000000 +0800
-@@ -567,7 +567,11 @@
+diff -urN gcin-1.5.5.pre3.orig/win-gtab.cpp gcin-1.5.5/win-gtab.cpp
+--- gcin-1.5.5.pre3.orig/win-gtab.cpp 2010-06-27 18:43:58.000000000 +0800
++++ gcin-1.5.5/win-gtab.cpp 2010-06-29 11:25:34.000000000 +0800
+@@ -574,7 +574,11 @@
// dbg("show_win_gtab()\n");
#if UNIX
@@ -132,10 +167,10 @@ diff -urN gcin-1.5.0.orig/win-gtab.cpp g
#endif
gtk_widget_show(gwin_gtab);
-diff -urN gcin-1.5.0.orig/win0.cpp gcin-1.5.0/win0.cpp
---- gcin-1.5.0.orig/win0.cpp 2010-06-21 09:07:23.000000000 +0800
-+++ gcin-1.5.0/win0.cpp 2010-06-23 10:40:43.000000000 +0800
-@@ -239,7 +239,11 @@
+diff -urN gcin-1.5.5.pre3.orig/win0.cpp gcin-1.5.5/win0.cpp
+--- gcin-1.5.5.pre3.orig/win0.cpp 2010-06-22 17:40:42.000000000 +0800
++++ gcin-1.5.5/win0.cpp 2010-06-29 11:25:34.000000000 +0800
+@@ -242,7 +242,11 @@
return;
}
@@ -148,7 +183,7 @@ diff -urN gcin-1.5.0.orig/win0.cpp gcin-
gtk_widget_show(button_pho);
disp_pho_sub(label_pho, index, pho);
-@@ -644,7 +648,11 @@
+@@ -653,7 +657,11 @@
if (gcin_pop_up_win && !tsin_has_input() && !force_show)
return;
#if UNIX
@@ -161,23 +196,23 @@ diff -urN gcin-1.5.0.orig/win0.cpp gcin-
#endif
{
gtk_widget_show(gwin0);
-diff -urN gcin-1.5.0.orig/win1.cpp gcin-1.5.0/win1.cpp
---- gcin-1.5.0.orig/win1.cpp 2010-04-26 17:25:28.000000000 +0800
-+++ gcin-1.5.0/win1.cpp 2010-06-23 10:44:12.000000000 +0800
-@@ -190,7 +190,11 @@
+diff -urN gcin-1.5.5.pre3.orig/win1.cpp gcin-1.5.5/win1.cpp
+--- gcin-1.5.5.pre3.orig/win1.cpp 2010-06-26 13:19:27.000000000 +0800
++++ gcin-1.5.5/win1.cpp 2010-06-29 11:29:17.000000000 +0800
+@@ -193,7 +193,11 @@
+ if (!gwin1)
+ p_err("disp_selections !gwin1");
- void disp_selections(int x, int y)
- {
- if (!GTK_WIDGET_VISIBLE(gwin1)) {
+#if GTK_CHECK_VERSION(2,18,0)
-+ if (!gtk_widget_get_visible(gwin1)) {
++ if (!gtk_widget_get_visible(gwin1)) {
+#else
-+ if (!GTK_WIDGET_VISIBLE(gwin1)) {
++ if (!GTK_WIDGET_VISIBLE(gwin1)) {
+#endif
gtk_widget_show(gwin1);
}
-@@ -210,7 +214,11 @@
+@@ -213,7 +217,11 @@
void raise_tsin_selection_win()
{
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources 23 Jun 2010 03:37:17 -0000 1.26
+++ sources 29 Jun 2010 03:37:50 -0000 1.27
@@ -1 +1 @@
-b15e70a7a3dc3036ff20db715c4becc4 gcin-1.5.1.tar.bz2
+09e7a74adc20ccba88336321441bcb66 gcin-1.5.5.pre3.tar.bz2
More information about the scm-commits
mailing list