diff --git a/.gitignore b/.gitignore index 4f567fa..bc11aae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ gcin-1.5.5.pre3.tar.bz2 /sources /gcin-1.5.5.tar.bz2 +/gcin-1.5.6.tar.bz2 diff --git a/gcin.spec b/gcin.spec index 83c25da..5fc7369 100644 --- a/gcin.spec +++ b/gcin.spec @@ -1,6 +1,6 @@ Name: gcin -Version: 1.5.5 -Release: 3%{?dist} +Version: 1.5.6 +Release: 1%{?dist} Summary: Input method for Traditional Chinese Group: System Environment/Libraries @@ -40,7 +40,7 @@ Gcin is an input method for Traditional Chinese with a GTK user interface. %patch3 -p1 -b .configure %patch4 -p1 -b .newcj3 %patch5 -p1 -b .gtab -%patch7 -p1 -b .gtk +%patch7 -p0 -b .gtk %patch8 -p1 -b .gtk-im #%patch6 -p1 -b .gtk-immodules #cp -f gcinicon/gtab.list data/ @@ -116,6 +116,9 @@ fi %{_libdir}/libgcin-im-client.so* %changelog +* Thu Dec 09 2010 Parag Nemade - 1.5.5-4 +- Resolves:rh#660992-FTBFS gcin-1.5.5-3.fc15 + * Tue Sep 07 2010 Parag Nemade - 1.5.5-3 - update to latest stable release 1.5.5 - Fix gtk-im module Makefile issue diff --git a/gtk-deprecated.patch b/gtk-deprecated.patch index e04bf60..99ea648 100644 --- a/gtk-deprecated.patch +++ b/gtk-deprecated.patch @@ -1,192 +1,16 @@ -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() - { -- return GTK_WIDGET_VISIBLE(win_anthy); -+#if GTK_CHECK_VERSION(2,18,0) -+ return gtk_widget_get_visible(win_anthy); -+#else -+ return GTK_WIDGET_VISIBLE(win_anthy); -+#endif - } - - extern gboolean force_show; -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); - -- 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)) -+#endif -+ egg_tray_icon_send_dock_request (icon); - - egg_tray_icon_get_orientation_property (icon); - } -@@ -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 - if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) +--- gcin.h.old 2010-07-11 17:32:28.000000000 +0530 ++++ gcin.h 2010-12-09 11:53:57.578890677 +0530 +@@ -53,6 +53,13 @@ + #define GTK_WIDGET_REALIZED gtk_widget_get_realized #endif -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; - 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); -+#else -+ return gwin_pho && GTK_WIDGET_VISIBLE(gwin_pho); -+#endif - #if USE_TSIN -- 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); -+# else -+ return gwin0 && GTK_WIDGET_VISIBLE(gwin0); -+# endif - #endif - case method_type_INT_CODE: - break; -@@ -745,8 +753,12 @@ - #endif - default: - if (!gwin_gtab) -- return FALSE; -+ return FALSE; -+#if GTK_CHECK_VERSION(2,18,0) -+ return gwin_gtab && gtk_widget_get_visible(gwin_gtab); -+#else - return gwin_gtab && GTK_WIDGET_VISIBLE(gwin_gtab); -+#endif - } - return FALSE; -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 && -- GTK_WIDGET_VISIBLE(gwin_pho)) -+#if GTK_CHECK_VERSION(2,18,0) -+ gtk_widget_get_visible(gwin_pho)) -+#else -+ GTK_WIDGET_VISIBLE(gwin_pho)) ++#if GTK_CHECK_VERSION(2,22,0) ++#if UNIX ++#undef GDK_DISPLAY ++#define GDK_DISPLAY() GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()) +#endif - hide_win_pho(); - - -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); - // 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)) { +#endif - gtk_widget_destroy(GTK_WIDGET(egg_tray_icon)); - da = NULL; - return FALSE; -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 -- 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.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; - } - -- 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)) -+#endif - gtk_widget_show(button_pho); - - disp_pho_sub(label_pho, index, pho); -@@ -653,7 +657,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)) -+# endif - #endif - { - gtk_widget_show(gwin0); -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"); - -- if (!GTK_WIDGET_VISIBLE(gwin1)) { -+#if GTK_CHECK_VERSION(2,18,0) -+ if (!gtk_widget_get_visible(gwin1)) { -+#else -+ if (!GTK_WIDGET_VISIBLE(gwin1)) { -+#endif - gtk_widget_show(gwin1); - } - -@@ -213,7 +217,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)) -+#else -+ if (gwin1 && GTK_WIDGET_VISIBLE(gwin1)) -+#endif - gtk_window_present(GTK_WINDOW(gwin1)); - } - ++ + typedef enum { + GCIN_STATE_DISABLED = 0, + GCIN_STATE_ENG_FULL = 1, diff --git a/sources b/sources index 2a9cf70..3cc07da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -413e6f3496994d1c732344178bd78bb1 gcin-1.5.5.tar.bz2 +cd5a377d1be526a9bb458629d4dc8fe8 gcin-1.5.6.tar.bz2