rpms/gcin/EL-6 .cvsignore, 1.24, 1.25 gcin.spec, 1.51, 1.52 gtk-deprecated.patch, 1.1, 1.2 im-client.patch, 1.16, 1.17 qt.patch, 1.3, 1.4 sources, 1.24, 1.25
Chung-Yen Chang
candyz at fedoraproject.org
Thu Jul 8 08:47:25 UTC 2010
Author: candyz
Update of /cvs/pkgs/rpms/gcin/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30334
Modified Files:
.cvsignore gcin.spec gtk-deprecated.patch im-client.patch
qt.patch sources
Log Message:
update to 1.5.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/EL-6/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore 5 Jan 2010 07:06:11 -0000 1.24
+++ .cvsignore 8 Jul 2010 08:47:24 -0000 1.25
@@ -1 +1 @@
-gcin-1.4.6.tar.bz2
+gcin-1.5.1.tar.bz2
Index: gcin.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/EL-6/gcin.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- gcin.spec 5 May 2010 02:09:56 -0000 1.51
+++ gcin.spec 8 Jul 2010 08:47:24 -0000 1.52
@@ -1,6 +1,6 @@
Name: gcin
-Version: 1.4.6
-Release: 2%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
Summary: Input method for Traditional Chinese
Group: System Environment/Libraries
@@ -113,6 +113,15 @@ fi
%{_libdir}/libgcin-im-client.so*
%changelog
+* Wed Jun 23 2010 Chung-Yen Chang <candyz0416 at gmail.com> - 1.5.1-1
+- update to 1.5.1
+
+* Wed Jun 23 2010 Chung-Yen Chang <candyz0416 at gmail.com> - 1.5.0-2
+- update to 1.5.0
+
+* Wed Jun 23 2010 Chung-Yen Chang <candyz0416 at gmail.com> - 1.5.0-1
+- update to 1.5.0
+
* Wed May 05 2010 Chung-Yen Chang <candyz0416 at gmail.com> - 1.4.6-2
- patch to add -lm to LDFLAGS
- patch to stop using GTK+ deprecated AP
gtk-deprecated.patch:
anthy.cpp | 6 +++++-
eggtrayicon.cpp | 12 ++++++++----
eve.cpp | 22 +++++++++++++++++-----
gtab.cpp | 6 +++++-
tray.cpp | 6 +++++-
win-gtab.cpp | 6 +++++-
win0.cpp | 12 ++++++++++--
win1.cpp | 12 ++++++++++--
8 files changed, 65 insertions(+), 17 deletions(-)
Index: gtk-deprecated.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/EL-6/gtk-deprecated.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- gtk-deprecated.patch 5 May 2010 02:09:56 -0000 1.1
+++ gtk-deprecated.patch 8 Jul 2010 08:47:24 -0000 1.2
@@ -1,71 +1,81 @@
-diff -urN --exclude configure gcin-1.4.6.orig/anthy.cpp gcin-1.4.6/anthy.cpp
---- gcin-1.4.6.orig/anthy.cpp 2009-12-17 22:02:20.000000000 +0900
-+++ gcin-1.4.6/anthy.cpp 2010-04-22 12:50:00.300366245 +0900
-@@ -993,7 +993,11 @@
+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
+@@ -1031,7 +1031,11 @@
int anthy_visible()
{
+- return GTK_WIDGET_VISIBLE(win_anthy);
+#if GTK_CHECK_VERSION(2,18,0)
-+ return gtk_widget_get_visible(win_anthy);
++ return gtk_widget_get_visible(win_anthy);
+#else
- return GTK_WIDGET_VISIBLE(win_anthy);
++ return GTK_WIDGET_VISIBLE(win_anthy);
+#endif
}
extern gboolean force_show;
-diff -urN --exclude configure gcin-1.4.6.orig/eggtrayicon.cpp gcin-1.4.6/eggtrayicon.cpp
---- gcin-1.4.6.orig/eggtrayicon.cpp 2009-08-07 13:25:45.000000000 +0900
-+++ gcin-1.4.6/eggtrayicon.cpp 2010-04-22 12:51:35.247365986 +0900
-@@ -352,7 +352,11 @@
+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
+@@ -349,8 +349,12 @@
gdk_window_add_filter (gdkwin, egg_tray_icon_manager_filter, icon);
+- if (dock_if_realized && GTK_WIDGET_REALIZED (GTK_WIDGET (icon)))
+- egg_tray_icon_send_dock_request (icon);
+#if GTK_CHECK_VERSION(2,20,0)
+ if (dock_if_realized && gtk_widget_get_realized (icon))
+#else
- if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
++ if (dock_if_realized && GTK_WIDGET_REALIZED (icon))
+#endif
- egg_tray_icon_send_dock_request (icon);
++ egg_tray_icon_send_dock_request (icon);
egg_tray_icon_get_orientation_property (icon);
-@@ -398,7 +402,11 @@
+ }
+@@ -395,8 +399,8 @@
static void
make_transparent (GtkWidget *widget, gpointer user_data)
{
+-#if GTK_CHECK_VERSION(2,19,3)
+- if (GTK_WIDGET_NO_WINDOW (widget) || gtk_widget_get_app_paintable (widget))
+#if GTK_CHECK_VERSION(2,18,0)
+ if (!gtk_widget_get_has_window (widget) || gtk_widget_get_app_paintable (widget))
-+#else
+ #else
if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
-+#endif
- return;
-
- gtk_widget_set_app_paintable (widget, TRUE);
-diff -urN --exclude configure gcin-1.4.6.orig/eve.cpp gcin-1.4.6/eve.cpp
---- gcin-1.4.6.orig/eve.cpp 2009-12-17 18:24:58.000000000 +0900
-+++ gcin-1.4.6/eve.cpp 2010-04-22 12:54:10.853365974 +0900
-@@ -661,10 +661,18 @@
+ #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
+@@ -731,11 +731,19 @@
+ if (!current_CS)
return FALSE;
- switch (current_CS->in_method) {
- case 3:
+ switch (current_method_type()) {
+- case method_type_PHO:
+- return gwin_pho && GTK_WIDGET_VISIBLE(gwin_pho);
++ case method_type_PHO:
+#if GTK_CHECK_VERSION(2,18,0)
-+ return gwin_pho && gtk_widget_get_visible(gwin_pho);
++ return gwin_pho && gtk_widget_get_visible(gwin_pho);
+#else
- return gwin_pho && GTK_WIDGET_VISIBLE(gwin_pho);
++ return gwin_pho && GTK_WIDGET_VISIBLE(gwin_pho);
+#endif
#if USE_TSIN
- case 6:
+- case method_type_TSIN:
+- return gwin0 && GTK_WIDGET_VISIBLE(gwin0);
++ case method_type_TSIN:
+# if GTK_CHECK_VERSION(2,18,0)
-+ return gwin0 && gtk_widget_get_visible(gwin0);
++ return gwin0 && gtk_widget_get_visible(gwin0);
+# else
- return gwin0 && GTK_WIDGET_VISIBLE(gwin0);
++ return gwin0 && GTK_WIDGET_VISIBLE(gwin0);
+# endif
#endif
- case 10:
+ case method_type_INT_CODE:
break;
-@@ -675,7 +683,11 @@
+@@ -745,8 +753,12 @@
+ #endif
default:
if (!gwin_gtab)
- return FALSE;
+- return FALSE;
++ return FALSE;
+#if GTK_CHECK_VERSION(2,18,0)
+ return gwin_gtab && gtk_widget_get_visible(gwin_gtab);
+#else
@@ -74,102 +84,109 @@ diff -urN --exclude configure gcin-1.4.6
}
return FALSE;
-diff -urN --exclude configure gcin-1.4.6.orig/gtab.cpp gcin-1.4.6/gtab.cpp
---- gcin-1.4.6.orig/gtab.cpp 2009-12-19 16:40:13.000000000 +0900
-+++ gcin-1.4.6/gtab.cpp 2010-04-22 12:54:48.344366001 +0900
-@@ -1230,7 +1230,11 @@
+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 @@
return feedkey_pho(key, 0);
- if (same_pho_query_state == SAME_PHO_QUERY_none && gwin_pho &&
+ if (poo.same_pho_query_state == SAME_PHO_QUERY_none && gwin_pho &&
+- GTK_WIDGET_VISIBLE(gwin_pho))
+#if GTK_CHECK_VERSION(2,18,0)
-+ gtk_widget_get_visible(gwin_pho))
++ gtk_widget_get_visible(gwin_pho))
+#else
- GTK_WIDGET_VISIBLE(gwin_pho))
++ GTK_WIDGET_VISIBLE(gwin_pho))
+#endif
hide_win_pho();
-diff -urN --exclude configure gcin-1.4.6.orig/tray.cpp gcin-1.4.6/tray.cpp
---- gcin-1.4.6.orig/tray.cpp 2009-12-06 15:54:56.000000000 +0900
-+++ gcin-1.4.6/tray.cpp 2010-04-22 12:56:31.115370364 +0900
-@@ -286,7 +286,11 @@
- gtk_widget_show_all (GTK_WIDGET (tray_icon));
- tray_da_win = da->window;
+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
+@@ -326,7 +326,11 @@
+ gtk_widget_show_all (GTK_WIDGET (egg_tray_icon));
+ tray_da_win = gtk_widget_get_window(da);
// tray window is not ready ??
+- if (!tray_da_win || !GTK_WIDGET_DRAWABLE(da)) {
+#if GTK_CHECK_VERSION(2,18,0)
+ if (!tray_da_win || !gtk_widget_is_drawable(da)) {
+#else
- if (!tray_da_win || !GTK_WIDGET_DRAWABLE(da)) {
++ if (!tray_da_win || !GTK_WIDGET_DRAWABLE(da)) {
+#endif
- gtk_widget_destroy(GTK_WIDGET(tray_icon));
+ gtk_widget_destroy(GTK_WIDGET(egg_tray_icon));
da = NULL;
return FALSE;
-diff -urN --exclude configure gcin-1.4.6.orig/win0.cpp gcin-1.4.6/win0.cpp
---- gcin-1.4.6.orig/win0.cpp 2009-12-07 10:57:36.000000000 +0900
-+++ gcin-1.4.6/win0.cpp 2010-04-22 12:58:58.305366453 +0900
-@@ -215,7 +215,11 @@
- void disp_pho_sub(GtkWidget *label, int index, char *pho);
- void disp_tsin_pho(int index, char *pho)
- {
+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 @@
+
+ // dbg("show_win_gtab()\n");
+ #if UNIX
+- if (!GTK_WIDGET_VISIBLE(gwin_gtab))
++# if GTK_CHECK_VERSION(2,18,0)
++ if (!gtk_widget_get_visible(gwin_gtab))
++# else
++ if (!GTK_WIDGET_VISIBLE(gwin_gtab))
++# endif
+ #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 @@
+ return;
+ }
+
+- if (button_pho && !GTK_WIDGET_VISIBLE(button_pho))
+#if GTK_CHECK_VERSION(2,18,0)
+ if (button_pho && !gtk_widget_get_visible(button_pho))
+#else
- if (button_pho && !GTK_WIDGET_VISIBLE(button_pho))
++ if (button_pho && !GTK_WIDGET_VISIBLE(button_pho))
+#endif
gtk_widget_show(button_pho);
disp_pho_sub(label_pho, index, pho);
-@@ -603,7 +607,11 @@
+@@ -644,7 +648,11 @@
if (gcin_pop_up_win && !tsin_has_input() && !force_show)
return;
#if UNIX
+- if (!GTK_WIDGET_VISIBLE(gwin0))
+# if GTK_CHECK_VERSION(2,18,0)
+ if (!gtk_widget_get_visible(gwin0))
+# else
- if (!GTK_WIDGET_VISIBLE(gwin0))
++ if (!GTK_WIDGET_VISIBLE(gwin0))
+# endif
#endif
{
gtk_widget_show(gwin0);
-diff -urN --exclude configure gcin-1.4.6.orig/win1.cpp gcin-1.4.6/win1.cpp
---- gcin-1.4.6.orig/win1.cpp 2009-08-19 11:23:53.000000000 +0900
-+++ gcin-1.4.6/win1.cpp 2010-04-22 13:00:07.778365894 +0900
-@@ -166,7 +166,11 @@
+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 @@
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);
}
-@@ -186,7 +190,11 @@
+@@ -210,7 +214,11 @@
void raise_tsin_selection_win()
{
+- if (gwin1 && GTK_WIDGET_VISIBLE(gwin1))
+#if GTK_CHECK_VERSION(2,18,0)
-+ if (gwin1 && gtk_widget_get_visible(gwin1))
++ if (gwin1 && gtk_widget_get_visible(gwin1))
+#else
- if (gwin1 && GTK_WIDGET_VISIBLE(gwin1))
++ if (gwin1 && GTK_WIDGET_VISIBLE(gwin1))
+#endif
gtk_window_present(GTK_WINDOW(gwin1));
}
-diff -urN --exclude configure gcin-1.4.6.orig/win-gtab.cpp gcin-1.4.6/win-gtab.cpp
---- gcin-1.4.6.orig/win-gtab.cpp 2009-12-19 16:19:58.000000000 +0900
-+++ gcin-1.4.6/win-gtab.cpp 2010-04-22 13:01:17.766366021 +0900
-@@ -526,7 +526,11 @@
-
- // dbg("show_win_gtab()\n");
- #if UNIX
-+# if GTK_CHECK_VERSION(2,18,0)
-+ if (!gtk_widget_get_visible(gwin_gtab))
-+# else
- if (!GTK_WIDGET_VISIBLE(gwin_gtab))
-+# endif
- #endif
- gtk_widget_show(gwin_gtab);
-
im-client.patch:
Makefile | 33 +++++----------------------------
gtk-im/Makefile | 5 ++---
im-client/Makefile | 6 +++---
3 files changed, 10 insertions(+), 34 deletions(-)
Index: im-client.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/EL-6/im-client.patch,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- im-client.patch 5 Jan 2010 07:06:11 -0000 1.16
+++ im-client.patch 8 Jul 2010 08:47:24 -0000 1.17
@@ -1,16 +1,16 @@
-diff -urN gcin-1.4.6.orig/Makefile gcin-1.4.6/Makefile
---- gcin-1.4.6.orig/Makefile 2009-12-10 15:16:53.000000000 +0800
-+++ gcin-1.4.6/Makefile 2010-01-05 13:40:57.117730555 +0800
+diff -urN gcin-1.5.0.orig/Makefile gcin-1.5.0/Makefile
+--- gcin-1.5.0.orig/Makefile 2010-06-18 17:35:27.000000000 +0800
++++ gcin-1.5.0/Makefile 2010-06-23 09:51:49.000000000 +0800
@@ -8,7 +8,7 @@
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 gtab-buf.o
-GCIN_SO= gcin1.so gcin2.so
-+GCIN_SO= intcode.o win-int.o win-message.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o tsin-char.o anthy.o
++GCIN_SO= intcode.o win-int.o win-message.o win-sym.o win-inmd-switch.o pinyin.o win-pho-near.o win-kbm.o anthy.o
OBJS=gcin.o eve.o util.o gcin-conf.o gcin-settings.o locale.o gcin-icon.o \
gcin-switch.o gcin-exec-script.o $(GCIN_SO) pho-play.o cache.o gtk_bug_fix.o \
-@@ -18,7 +18,7 @@
+@@ -19,7 +19,7 @@
table-update.o locale.o gcin-settings.o gcin-common.o gcin-icon.o
OBJS_JUYIN_LEARN=juyin-learn.o locale.o util.o pho-util.o pho-sym.o \
gcin-settings.o gcin-conf.o table-update.o pinyin.o gcin-icon.o
@@ -19,17 +19,24 @@ diff -urN gcin-1.4.6.orig/Makefile gcin-
OBJS_phod2a=phod2a.o pho-util.o gcin-conf.o pho-sym.o table-update.o pho-dbg.o locale.o \
gcin-settings.o util.o
OBJS_tsa2d32=tsa2d32.o gcin-send.o util.o pho-sym.o gcin-conf.o locale.o pho-lookup.o
-@@ -124,8 +124,7 @@
+@@ -125,14 +125,13 @@
if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im; fi
gcin: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
- LD_RUN_PATH=$(gcin_ld_run_path) \
- $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
+ $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
- rm -f core.*
+ rm -f core.* vgcore.*
ln -sf $@ $@.test
-@@ -142,7 +141,6 @@
+ gcin-nocur: $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
+ LD_RUN_PATH=$(gcinlibdir) \
+- $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/lib
++ $(CCLD) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
+ rm -f core.*
+
+ tslearn: $(OBJS_TSLEARN)
+@@ -143,7 +142,6 @@
$(CCLD) -o $@ $(OBJS_JUYIN_LEARN) $(LDFLAGS)
rm -f core.*
sim2trad: $(OBJS_sim2trad)
@@ -37,7 +44,7 @@ diff -urN gcin-1.4.6.orig/Makefile gcin-
$(CC) -o $@ $(OBJS_sim2trad) $(LDFLAGS)
rm -f core.*
trad2sim: sim2trad
-@@ -203,20 +201,6 @@
+@@ -202,20 +200,6 @@
im-client/libgcin-im-client.so:
$(MAKE) -C im-client
@@ -58,7 +65,7 @@ diff -urN gcin-1.4.6.orig/Makefile gcin-
#gtk_bug_fix.so: gtk_bug_fix.pico
# $(CC) $(SO_FLAGS) -o $@ gtk_bug_fix.pico
-@@ -240,14 +224,11 @@
+@@ -239,14 +223,11 @@
install $(PROGS) $(bindir); \
cp gcin-nocur $(bindir)/gcin; \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim
@@ -87,7 +94,7 @@ diff -urN gcin-1.4.6.orig/Makefile gcin-
install -s $(PROGS) $(bindir); \
rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
fi
-@@ -282,7 +259,7 @@
+@@ -285,7 +262,7 @@
$(MAKE) -C qt4-im clean
$(MAKE) -C man clean
$(MAKE) -C menu clean
@@ -96,9 +103,9 @@ diff -urN gcin-1.4.6.orig/Makefile gcin-
rm -f *.o *.E *.db *.pico *.so config.mak tags $(PROGS) gcin-nocur $(PROGS_CV) \
$(DATA) .depend gcin.spec trad2sim gcin.spec.tmp gcin.log
find . '(' -name '.ted*' -o -name '*~' -o -name 'core.*' -o -name 'vgcore.*' ')' -exec rm {} \;
-diff -urN gcin-1.4.6.orig/gtk-im/Makefile gcin-1.4.6/gtk-im/Makefile
---- gcin-1.4.6.orig/gtk-im/Makefile 2009-04-13 10:47:24.000000000 +0800
-+++ gcin-1.4.6/gtk-im/Makefile 2010-01-05 13:46:38.384468466 +0800
+diff -urN gcin-1.5.0.orig/gtk-im/Makefile gcin-1.5.0/gtk-im/Makefile
+--- gcin-1.5.0.orig/gtk-im/Makefile 2010-06-06 00:50:00.000000000 +0800
++++ gcin-1.5.0/gtk-im/Makefile 2010-06-23 09:58:17.000000000 +0800
@@ -26,12 +26,11 @@
all: im-gcin.so im-gcin-cur.so
@@ -114,9 +121,9 @@ diff -urN gcin-1.4.6.orig/gtk-im/Makefil
$(CC) $(SO_FLAGS) $(OBJS) -L../im-client -lgcin-im-client -o $@ $(LDFLAGS)
rm -f core.*
-diff -urN gcin-1.4.6.orig/im-client/Makefile gcin-1.4.6/im-client/Makefile
---- gcin-1.4.6.orig/im-client/Makefile 2009-12-12 19:28:49.000000000 +0800
-+++ gcin-1.4.6/im-client/Makefile 2010-01-05 13:47:36.262424168 +0800
+diff -urN gcin-1.5.0.orig/im-client/Makefile gcin-1.5.0/im-client/Makefile
+--- gcin-1.5.0.orig/im-client/Makefile 2009-12-12 19:28:49.000000000 +0800
++++ gcin-1.5.0/im-client/Makefile 2010-06-23 10:00:10.000000000 +0800
@@ -28,9 +28,9 @@
LOCALLIB=/usr/local/$(LIB)
qt.patch:
configure | 6 +++---
qt-im/Makefile | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
Index: qt.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/EL-6/qt.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- qt.patch 5 Jan 2010 07:06:11 -0000 1.3
+++ qt.patch 8 Jul 2010 08:47:24 -0000 1.4
@@ -1,7 +1,7 @@
-diff -urN gcin-1.4.6.orig/configure gcin-1.4.6/configure
---- gcin-1.4.6.orig/configure 2009-12-17 17:29:46.000000000 +0800
-+++ gcin-1.4.6/configure 2010-01-05 13:50:40.071953951 +0800
-@@ -45,8 +45,8 @@
+diff -urN gcin-1.5.0.orig/configure gcin-1.5.0/configure
+--- gcin-1.5.0.orig/configure 2010-06-13 15:41:23.000000000 +0800
++++ gcin-1.5.0/configure 2010-06-23 10:04:38.000000000 +0800
+@@ -46,8 +46,8 @@
use_tsin='Y'
use_gcb='Y'
use_anthy='Y'
@@ -9,10 +9,10 @@ diff -urN gcin-1.4.6.orig/configure gcin
-use_qt4='Y'
+use_qt3='Y'
+use_qt4='N'
+ use_gtk3='Y'
if [ "$GCIN_USE_XIM" ]; then
- use_xim=$GCIN_USE_XIM
-@@ -145,7 +145,7 @@
+@@ -148,7 +148,7 @@
fi
QT_IM='N'
@@ -21,9 +21,9 @@ diff -urN gcin-1.4.6.orig/configure gcin
echo "testing if you have qt3 support"
if [ -d $QT_IM_DIR ]; then
QT_IM='Y'
-diff -urN gcin-1.4.6.orig/qt-im/Makefile gcin-1.4.6/qt-im/Makefile
---- gcin-1.4.6.orig/qt-im/Makefile 2009-12-10 07:09:17.000000000 +0800
-+++ gcin-1.4.6/qt-im/Makefile 2010-01-05 13:56:56.962786725 +0800
+diff -urN gcin-1.5.0.orig/qt-im/Makefile gcin-1.5.0/qt-im/Makefile
+--- gcin-1.5.0.orig/qt-im/Makefile 2009-12-10 07:09:17.000000000 +0800
++++ gcin-1.5.0/qt-im/Makefile 2010-06-23 10:06:15.000000000 +0800
@@ -1,8 +1,8 @@
include ../config.mak
-QT=qt3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcin/EL-6/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources 5 Jan 2010 07:06:11 -0000 1.24
+++ sources 8 Jul 2010 08:47:24 -0000 1.25
@@ -1 +1 @@
-64f5ded6404d9091560c2316e9207158 gcin-1.4.6.tar.bz2
+b15e70a7a3dc3036ff20db715c4becc4 gcin-1.5.1.tar.bz2
More information about the scm-commits
mailing list