From owner-freebsd-ports-bugs@FreeBSD.ORG Thu May 12 03:40:13 2005 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id A405A16A4CE for ; Thu, 12 May 2005 03:40:13 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D0A243D7D for ; Thu, 12 May 2005 03:40:13 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j4C3eCcj092459 for ; Thu, 12 May 2005 03:40:12 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4C3eC0i092458; Thu, 12 May 2005 03:40:12 GMT (envelope-from gnats) Resent-Date: Thu, 12 May 2005 03:40:12 GMT Resent-Message-Id: <200505120340.j4C3eC0i092458@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, chinsan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8939916A4CE; Thu, 12 May 2005 03:39:15 +0000 (GMT) Received: from chinsan.twbbs.org (sw169-31-180.adsl.seed.net.tw [221.169.31.180]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9620A43D1D; Thu, 12 May 2005 03:39:14 +0000 (GMT) (envelope-from root@chinsan.twbbs.org) Received: by chinsan.twbbs.org (Postfix, from userid 0) id ED2EC7301C; Thu, 12 May 2005 11:39:22 +0800 (CST) Message-Id: <20050512033922.ED2EC7301C@chinsan.twbbs.org> Date: Thu, 12 May 2005 11:39:22 +0800 (CST) From: chinsan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: statue@freebsd.netlab.cse.yzu.edu.tw cc: vanilla@FreeBSD.org Subject: ports/80923: [UPDATE] chinese/gcin: update to 0.9.4 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: chinsan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 12 May 2005 03:40:13 -0000 >Number: 80923 >Category: ports >Synopsis: [UPDATE] chinese/gcin: update to 0.9.4 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu May 12 03:40:12 GMT 2005 >Closed-Date: >Last-Modified: >Originator: chinsan >Release: FreeBSD 5.3-RELEASE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD chinsan.twbbs.org 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Nov 5 04:19:18 UTC 2004 root@harlow.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386 >Description: - update to 0.9.4 - port maintainer(statue@freebsd.netlab.cse.yzu.edu.tw) is CC'd >How-To-Repeat: >Fix: --- gcin.diff begins here --- diff -ruN gcin.orig/Makefile gcin/Makefile --- gcin.orig/Makefile Thu May 12 03:02:47 2005 +++ gcin/Makefile Thu May 12 05:00:02 2005 @@ -6,7 +6,7 @@ # PORTNAME= gcin -PORTVERSION= 0.9.3 +PORTVERSION= 0.9.4 CATEGORIES= chinese MASTER_SITES= http://www.csie.nctu.edu.tw/~cp76/gcin/download/ @@ -26,9 +26,14 @@ .endif post-install: +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} +.for file in Changelog README + ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} +.endfor +.endif + @gtk-query-immodules-2.0 > ${PREFIX}/etc/gtk-2.0/gtk.immodules @${CAT} ${PKGMESSAGE} - @${ECHO} @${ECHO} To display this message again, type \`pkg_info -D ${PKGNAME}\' - @${ECHO} .include diff -ruN gcin.orig/distinfo gcin/distinfo --- gcin.orig/distinfo Thu May 12 03:02:47 2005 +++ gcin/distinfo Thu May 12 03:04:42 2005 @@ -1,2 +1,2 @@ -MD5 (gcin-0.9.3.tar.bz2) = 6fc8be96ee415af8496fb4e4e5cfbaa0 -SIZE (gcin-0.9.3.tar.bz2) = 1168314 +MD5 (gcin-0.9.4.tar.bz2) = bf2b666e5acb44fa1c175920fd1c4454 +SIZE (gcin-0.9.4.tar.bz2) = 1167372 diff -ruN gcin.orig/files/extra-patch-gcin-setup-pho.c gcin/files/extra-patch-gcin-setup-pho.c --- gcin.orig/files/extra-patch-gcin-setup-pho.c Thu Jan 1 08:00:00 1970 +++ gcin/files/extra-patch-gcin-setup-pho.c Thu May 12 10:30:01 2005 @@ -0,0 +1,46 @@ +--- gcin-setup-pho.c.orig Thu May 12 09:56:35 2005 ++++ gcin-setup-pho.c Thu May 12 10:28:40 2005 +@@ -42,8 +42,8 @@ + {"選擇同音字", TSIN_SPACE_OPT_SELECT_CHAR}, + {"送出編輯區的內容", TSIN_SPACE_OPT_FLUSH_BUFFER}, + }; +-int tsin_space_optionsN = sizeof(tsin_space_options) / sizeof(tsin_space_options[0]); + ++int tsin_space_optionsN = sizeof(tsin_space_options) / sizeof(tsin_space_options[0]); + + static int kbm_selN = sizeof(kbm_sel) / sizeof(kbm_sel[0]); + +@@ -245,6 +245,16 @@ + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); + } + ++ GtkWidget *frame_phonetic_char_dynamic_sequence = gtk_frame_new("注音依使用頻率調整順序"); ++ gtk_box_pack_start (GTK_BOX (vbox_top), frame_phonetic_char_dynamic_sequence , TRUE, TRUE, 0); ++ gtk_container_set_border_width (GTK_CONTAINER (frame_phonetic_char_dynamic_sequence), 3); ++ check_button_phonetic_char_dynamic_sequence = gtk_check_button_new (); ++ gtk_container_add (GTK_CONTAINER (frame_phonetic_char_dynamic_sequence), ++ check_button_phonetic_char_dynamic_sequence); ++ gtk_toggle_button_set_active( ++ GTK_TOGGLE_BUTTON(check_button_phonetic_char_dynamic_sequence), ++ phonetic_char_dynamic_sequence); ++ + GtkWidget *frame_tsin_sw = gtk_frame_new("詞音輸入[中/英]切換"); + gtk_box_pack_start (GTK_BOX (vbox_top), frame_tsin_sw, TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (frame_tsin_sw), 3); +@@ -306,16 +316,6 @@ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(check_button_phrase_pre_select), + tsin_phrase_pre_select); + +- +- GtkWidget *frame_phonetic_char_dynamic_sequence = gtk_frame_new("注音依使用頻率調整順序"); +- gtk_box_pack_start (GTK_BOX (vbox_top), frame_phonetic_char_dynamic_sequence , TRUE, TRUE, 0); +- gtk_container_set_border_width (GTK_CONTAINER (frame_phonetic_char_dynamic_sequence), 3); +- check_button_phonetic_char_dynamic_sequence = gtk_check_button_new (); +- gtk_container_add (GTK_CONTAINER (frame_phonetic_char_dynamic_sequence), +- check_button_phonetic_char_dynamic_sequence); +- gtk_toggle_button_set_active( +- GTK_TOGGLE_BUTTON(check_button_phonetic_char_dynamic_sequence), +- phonetic_char_dynamic_sequence); + + GtkWidget *frame_tsin_disp_status_row = gtk_frame_new("詞音顯示狀態列(較小視窗)"); + gtk_box_pack_start (GTK_BOX (vbox_top), frame_tsin_disp_status_row , TRUE, TRUE, 0); diff -ruN gcin.orig/files/extra-patch-tsin.c gcin/files/extra-patch-tsin.c --- gcin.orig/files/extra-patch-tsin.c Thu Jan 1 08:00:00 1970 +++ gcin/files/extra-patch-tsin.c Thu May 12 04:09:29 2005 @@ -0,0 +1,11 @@ +--- tsin.c.orig Thu May 12 04:08:09 2005 ++++ tsin.c Thu May 12 04:08:45 2005 +@@ -1107,7 +1107,7 @@ + static gboolean pre_punctuation(KeySym xkey) + { + static char shift_punc[]="<>?:\"{}!"; +- static char chars[]="，。？：；『』！"; ++ static char chars[]="，。？：；「」！"; + + char *p; + diff -ruN gcin.orig/files/patch-about.c gcin/files/patch-about.c --- gcin.orig/files/patch-about.c Thu May 12 03:02:47 2005 +++ gcin/files/patch-about.c Thu May 12 04:02:43 2005 @@ -1,5 +1,5 @@ ---- about.c.orig Thu May 5 11:32:39 2005 -+++ about.c Thu May 5 11:41:34 2005 +--- about.c.orig Sat Feb 26 21:42:00 2005 ++++ about.c Thu May 12 04:02:17 2005 @@ -69,10 +69,16 @@ gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 3); @@ -10,7 +10,7 @@ - GtkWidget *label_sf = gtk_label_new ("http://www.csie.nctu.edu.tw/~cp76/gcin"); + GtkWidget *label_sf = gtk_label_new ("gcin WWW:\nhttp://www.csie.nctu.edu.tw/~cp76/gcin"); + gtk_misc_set_alignment (GTK_MISC (label_sf), 0, 0); -+ GtkWidget *label_FreeBSD = gtk_label_new ("FeeeBack:\nhttp://cle.linux.org.tw/gcin/"); ++ GtkWidget *label_FreeBSD = gtk_label_new ("Feedback:\nhttp://cle.linux.org.tw/gcin/"); + gtk_misc_set_alignment (GTK_MISC (label_FreeBSD), 0, 0); gtk_box_pack_start(GTK_BOX(vbox), label_sf, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(vbox), vseparator, FALSE, FALSE, 3); diff -ruN gcin.orig/files/patch-gcin-im-client.c gcin/files/patch-gcin-im-client.c --- gcin.orig/files/patch-gcin-im-client.c Thu May 12 03:02:47 2005 +++ gcin/files/patch-gcin-im-client.c Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- im-client/gcin-im-client.c.orig Fri Mar 25 16:52:27 2005 -+++ im-client/gcin-im-client.c Sat Apr 23 21:43:56 2005 -@@ -71,7 +71,7 @@ - #if FREEBSD - setgrp(); - #else -- setpgrp(); -+ setpgrp(0, getpid()); - #endif - execl(execbin, "gcin", NULL); - } else { diff -ruN gcin.orig/files/patch-gcin-setup.c gcin/files/patch-gcin-setup.c --- gcin.orig/files/patch-gcin-setup.c Thu Jan 1 08:00:00 1970 +++ gcin/files/patch-gcin-setup.c Thu May 12 05:05:38 2005 @@ -0,0 +1,39 @@ +--- gcin-setup.c.orig Thu May 12 04:36:17 2005 ++++ gcin-setup.c Thu May 12 05:04:47 2005 +@@ -609,22 +609,21 @@ + GtkWidget *vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (main_window), vbox); + +- GtkWidget *button_kbm = gtk_button_new_with_label("gcin 注音/詞音設定"); +- gtk_box_pack_start (GTK_BOX (vbox), button_kbm, TRUE, TRUE, 0); +- g_signal_connect (G_OBJECT (button_kbm), "clicked", +- G_CALLBACK (cb_kbm), NULL); +- + GtkWidget *button_appearance_conf = gtk_button_new_with_label("外觀設定"); + gtk_box_pack_start (GTK_BOX (vbox), button_appearance_conf, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button_appearance_conf), "clicked", + G_CALLBACK (cb_appearance_conf), NULL); + ++ GtkWidget *button_kbm = gtk_button_new_with_label("gcin 注音/詞音設定"); ++ gtk_box_pack_start (GTK_BOX (vbox), button_kbm, TRUE, TRUE, 0); ++ g_signal_connect (G_OBJECT (button_kbm), "clicked", ++ G_CALLBACK (cb_kbm), NULL); ++ + GtkWidget *button_gtab_conf = gtk_button_new_with_label("倉頡/行列/嘸蝦米/大易設定"); + gtk_box_pack_start (GTK_BOX (vbox), button_gtab_conf, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button_gtab_conf), "clicked", + G_CALLBACK (cb_gtab_conf), NULL); + +- + GtkWidget *button_default_input_method = gtk_button_new_with_label("內定輸入法 & 開啟/關閉"); + gtk_box_pack_start (GTK_BOX (vbox), button_default_input_method, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button_default_input_method), "clicked", +@@ -655,7 +654,7 @@ + g_signal_connect (G_OBJECT (button_ts_import_sys), "clicked", + G_CALLBACK (cb_ts_import_sys), NULL); + +- GtkWidget *button_alt_shift = gtk_button_new_with_label("alt-shift 片語編輯"); ++ GtkWidget *button_alt_shift = gtk_button_new_with_label("Alt-Shift 片語編輯"); + gtk_box_pack_start (GTK_BOX (vbox), button_alt_shift, TRUE, TRUE, 0); + g_signal_connect (G_OBJECT (button_alt_shift), "clicked", + G_CALLBACK (cb_alt_shift), NULL); diff -ruN gcin.orig/files/patch-im-srv.c gcin/files/patch-im-srv.c --- gcin.orig/files/patch-im-srv.c Thu May 12 03:02:47 2005 +++ gcin/files/patch-im-srv.c Thu Jan 1 08:00:00 1970 @@ -1,15 +0,0 @@ ---- im-srv/im-srv.c.orig Thu Apr 7 09:11:24 2005 -+++ im-srv/im-srv.c Thu Apr 7 09:11:01 2005 -@@ -121,7 +121,12 @@ - char sock_path[128]; - get_gcin_im_srv_sock_path(sock_path, sizeof(sock_path)); - strcpy(serv_addr.sun_path, sock_path); -+ -+#ifdef SUN_LEN -+ servlen = SUN_LEN (&serv_addr); -+#else - servlen = strlen(serv_addr.sun_path) + sizeof(serv_addr.sun_family); -+#endif - - dbg("-- %s\n",serv_addr.sun_path); - struct stat st; diff -ruN gcin.orig/pkg-plist gcin/pkg-plist --- gcin.orig/pkg-plist Thu May 12 03:02:47 2005 +++ gcin/pkg-plist Thu May 12 09:46:12 2005 @@ -35,8 +35,8 @@ %%DATADIR%%/table/tsin.idx %%DATADIR%%/table/zo.kbm %%DATADIR%%/table/zo-asdf.kbm -%%DOCSDIR%%/README %%DOCSDIR%%/Changelog +%%DOCSDIR%%/README share/applications/gcin.desktop share/applications/gcin-setup.desktop share/icons/gcin.png @@ -50,3 +50,5 @@ @unexec rmdir %D/%%DATADIR%%/script 2>/dev/null || true @unexec rmdir %D/%%DATADIR%% 2>/dev/null || true @unexec rmdir %D/lib/gtk-2.0/immodules 2>/dev/null || true +@exec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules +@unexec gtk-query-immodules-2.0 > %D/etc/gtk-2.0/gtk.immodules --- gcin.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: