From owner-freebsd-ports-bugs@FreeBSD.ORG Mon May 16 13:00:26 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 4223816A4CE for ; Mon, 16 May 2005 13:00:26 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id F353143D8D for ; Mon, 16 May 2005 13:00:25 +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 j4GD0N5h038005 for ; Mon, 16 May 2005 13:00:23 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j4GD0Ngd038004; Mon, 16 May 2005 13:00:23 GMT (envelope-from gnats) Resent-Date: Mon, 16 May 2005 13:00:23 GMT Resent-Message-Id: <200505161300.j4GD0Ngd038004@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 208F616A4CE; Mon, 16 May 2005 12:54:26 +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 483A643D2D; Mon, 16 May 2005 12:54:25 +0000 (GMT) (envelope-from root@chinsan.twbbs.org) Received: by chinsan.twbbs.org (Postfix, from userid 0) id 041887303B; Mon, 16 May 2005 20:54:38 +0800 (CST) Message-Id: <20050516125438.041887303B@chinsan.twbbs.org> Date: Mon, 16 May 2005 20:54:38 +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/81108: chinese/gcin: remove some unused patch 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: Mon, 16 May 2005 13:00:26 -0000 >Number: 81108 >Category: ports >Synopsis: chinese/gcin: remove some unused patch >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: Mon May 16 13:00:23 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: - Sorry for ports/80923 PR which I summited. That PR including some "patch(refine UI)" is still under progress, But I will feed them back to the original author after 100% complete. However, the following patch files: patch-gcin-setup.c extra-patch-gcin-setup-pho.c extra-patch-tsin.c They are not extremerly necessary for gcin and can be removed safely. - port maintainer(statue@freebsd.netlab.cse.yzu.edu.tw) is CC'd >How-To-Repeat: >Fix: --- gcin.patch begins here --- 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 Mon May 16 14:09:52 2005 +++ gcin/files/extra-patch-gcin-setup-pho.c Thu Jan 1 08:00:00 1970 @@ -1,46 +0,0 @@ ---- 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 Mon May 16 14:09:51 2005 +++ gcin/files/extra-patch-tsin.c Thu Jan 1 08:00:00 1970 @@ -1,11 +0,0 @@ ---- 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-gcin-setup.c gcin/files/patch-gcin-setup.c --- gcin.orig/files/patch-gcin-setup.c Mon May 16 14:09:52 2005 +++ gcin/files/patch-gcin-setup.c Thu Jan 1 08:00:00 1970 @@ -1,39 +0,0 @@ ---- gcin-setup.c.orig Thu May 12 14:38:04 2005 -+++ gcin-setup.c Thu May 12 14:39:09 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); --- gcin.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: