diff options
-rw-r--r-- | chinese/gcin/Makefile | 4 | ||||
-rw-r--r-- | chinese/gcin/distinfo | 6 | ||||
-rw-r--r-- | chinese/gcin/files/patch-auto-detect_anthy.diff | 169 | ||||
-rw-r--r-- | chinese/gcin/files/patch-eve.c | 14 | ||||
-rw-r--r-- | chinese/gcin/pkg-plist | 3 |
5 files changed, 21 insertions, 175 deletions
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile index 22489de23059..1df9acdce265 100644 --- a/chinese/gcin/Makefile +++ b/chinese/gcin/Makefile @@ -6,8 +6,8 @@ # PORTNAME= gcin -PORTVERSION= 1.4.4 -PORTREVISION= 1 +PORTVERSION= 1.4.5 +PORTREVISION= 0 CATEGORIES= chinese textproc gnome MASTER_SITES= http://cle.linux.org.tw/gcin/download/:main \ http://ftp.twaren.net/local-distfiles/gcin/:main \ diff --git a/chinese/gcin/distinfo b/chinese/gcin/distinfo index a895d4121add..78f16b727813 100644 --- a/chinese/gcin/distinfo +++ b/chinese/gcin/distinfo @@ -1,6 +1,6 @@ -MD5 (gcin-1.4.4.tar.bz2) = 917874510ebdb8b28bf6a63251600493 -SHA256 (gcin-1.4.4.tar.bz2) = 303e4ddcf221079658c823dc407f595b61d343e9ccd438136439a02c3bbcb01c -SIZE (gcin-1.4.4.tar.bz2) = 2706008 +MD5 (gcin-1.4.5.tar.bz2) = b7e5e40804b2a645ae64f4dedb2b3985 +SHA256 (gcin-1.4.5.tar.bz2) = 7f46c468d77c4e1f2bc64f94396007ffa546135b5f9e918854ce7879ef52d05a +SIZE (gcin-1.4.5.tar.bz2) = 2880978 MD5 (noseeing-12.tar.gz) = ac89cf9bc9ece68b9f287a222197b147 SHA256 (noseeing-12.tar.gz) = 9082f50db64b9e2971873aca1607c45a8eb41e803b99f66bd239fd587e1ce19b SIZE (noseeing-12.tar.gz) = 416726 diff --git a/chinese/gcin/files/patch-auto-detect_anthy.diff b/chinese/gcin/files/patch-auto-detect_anthy.diff deleted file mode 100644 index a3b697b092d6..000000000000 --- a/chinese/gcin/files/patch-auto-detect_anthy.diff +++ /dev/null @@ -1,169 +0,0 @@ ---- Makefile.gcin.orig 2009-01-12 22:48:43.000000000 +0800 -+++ Makefile.gcin 2009-03-24 03:41:44.000000000 +0800 -@@ -72,6 +72,10 @@ - OBJS += $(gcin_tsin_o) - endif - -+ifeq ($(USE_ANTHY),Y) -+CFLAGS += -DUSE_ANTHY=1 -+endif -+ - im-srv = im-srv/im-srv.a - - .c.E: -@@ -168,8 +172,12 @@ - # $(CC) -o $@ $(OBJS_ANTHY) $(LDFLAGS) - - gcin1_so= intcode.pico win-int.pico win-message.pico win-sym.pico \ --win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico tsin-char.pico \ --anthy.pico -+win-inmd-switch.pico pinyin.pico win-pho-near.pico win-kbm.pico tsin-char.pico -+ -+ifeq ($(USE_ANTHY),Y) -+gcin1_so += anthy.pico -+endif -+ - gcin1.so: $(gcin1_so) - $(CC) $(SO_FLAGS) -o $@ $(gcin1_so) $(LDFLAGS) - ---- configure.orig 2008-11-28 20:26:55.000000000 +0800 -+++ configure 2009-03-24 03:41:44.000000000 +0800 -@@ -106,6 +106,18 @@ - echo " found." - fi - -+echo -n ".... Testing anthy : " -+ -+USE_ANTHY=`pkg-config --libs anthy` -+ -+if [ $? != 0 ]; then -+ USE_ANTHY=N -+ echo "It's ok if you don't want anthy support." -+else -+ USE_ANTHY=Y -+ echo "found." -+fi -+ - LIB='lib' - if [ -d /lib64 ]; then - LIB='lib64' -@@ -218,6 +230,7 @@ - echo "USE_TRAY=$use_tray" >> config.mak - echo "USE_I18N=$use_i18n" >> config.mak - echo "USE_TSIN=$use_tsin" >> config.mak -+echo "USE_ANTHY=$USE_ANTHY" >> config.mak - - - cd menu ---- eve.c.orig 2009-01-28 04:57:42.000000000 +0800 -+++ eve.c 2009-03-24 03:41:44.000000000 +0800 -@@ -246,9 +246,11 @@ - case 10: - hide_win_int(); - break; -+#if USE_ANTHY - case 12: - hide_win_anthy(); - break; -+#endif - default: - hide_win_gtab(); - } -@@ -287,9 +289,11 @@ - case 10: - show_win_int(); - break; -+#if USE_ANTHY - case 12: - show_win_anthy(); - break; -+#endif - default: - show_win_gtab(); - } -@@ -339,9 +343,11 @@ - case 10: - move_win_int(x, y); - break; -+#if USE_ANTHY - case 12: - move_win_anthy(x, y); - break; -+#endif - default: - if (!cs->in_method) - return; -@@ -588,8 +594,10 @@ - #endif - case 10: - break; -+#if USE_ANTHY - case 12: - return anthy_visible(); -+#endif - default: - if (!gwin_gtab) - return FALSE; -@@ -697,6 +705,7 @@ - current_CS->in_method = in_no; - init_inter_code(); - break; -+#if USE_ANTHY - case 12: - if (init_win_anthy()) { - current_CS->in_method = in_no; -@@ -705,6 +714,7 @@ - return FALSE; - } - break; -+#endif - default: - init_gtab(in_no); - if (!inmd[in_no].DefChars) -@@ -914,8 +924,10 @@ - #endif - case 10: - return feedkey_intcode(keysym); -+#if USE_ANTHY - case 12: - return feedkey_anthy(keysym, kev_state); -+#endif - default: - return feedkey_gtab(keysym, kev_state); - } -@@ -955,8 +967,10 @@ - switch(current_CS->in_method) { - case 6: - return feedkey_pp_release(keysym, kev_state); -+#if USE_ANTHY - case 12: - return feedkey_anthy_release(keysym, kev_state); -+#endif - } - #endif - ---- win-kbm.c.orig 2009-01-27 21:19:29.000000000 +0800 -+++ win-kbm.c 2009-03-24 03:46:10.000000000 +0800 -@@ -272,7 +272,9 @@ - } - break; - case 10: -+#if USE_ANTHY - case 12: -+#endif - break; - default: - if (!cur_inmd || !cur_inmd->DefChars) ---- win-sym.c.orig 2009-01-28 05:00:53.000000000 +0800 -+++ win-sym.c 2009-03-24 03:46:10.000000000 +0800 -@@ -181,8 +181,10 @@ - tsin_reset_in_pho(); - break; - #endif -+#if USE_ANTHY - case 12: - break; -+#endif - default: - reset_gtab_all(); - break; diff --git a/chinese/gcin/files/patch-eve.c b/chinese/gcin/files/patch-eve.c new file mode 100644 index 000000000000..01d505962e27 --- /dev/null +++ b/chinese/gcin/files/patch-eve.c @@ -0,0 +1,14 @@ +--- eve.c.orig 2009-05-17 17:08:46.000000000 +0800 ++++ eve.c 2009-05-17 17:09:22.000000000 +0800 +@@ -595,9 +595,11 @@ + #endif + case 10: + break; ++#if USE_ANTHY + case 12: + get_win_anthy_geom(); + break; ++#endif + default: + get_win_gtab_geom(); + break; diff --git a/chinese/gcin/pkg-plist b/chinese/gcin/pkg-plist index dfb970d45175..2344ff68b17f 100644 --- a/chinese/gcin/pkg-plist +++ b/chinese/gcin/pkg-plist @@ -20,8 +20,9 @@ lib/gtk-2.0/immodules/im-gcin.so %%QT_IM_MODULE%%lib/qt4/plugins/inputmethods/im-gcin.so lib/gcin1.so lib/gcin2.so +lib/gtk_bug_fix.so lib/libgcin-im-client.so -lib/libgcin-im-client.so.1.1.0 +lib/libgcin-im-client.so.1.2.0 lib/libgcin-im-client.so.1 %%DATADIR%%/script/gcin-user-setup %%DATADIR%%/script/gtab.append_prepare |