diff options
| -rw-r--r-- | japanese/gnomecore/Makefile | 2 | ||||
| -rw-r--r-- | japanese/gnomecore/files/patch-aa | 64 |
2 files changed, 27 insertions, 39 deletions
diff --git a/japanese/gnomecore/Makefile b/japanese/gnomecore/Makefile index 50230a3483b8..0c8292393fcf 100644 --- a/japanese/gnomecore/Makefile +++ b/japanese/gnomecore/Makefile @@ -6,7 +6,7 @@ # # This port does not work with another version of master port. -#PORTVERSION= 1.2.4 +#PORTVERSION= 1.4.0.4 CATEGORIES= japanese x11 gnome MASTERDIR= ${.CURDIR}/../../x11/gnomecore diff --git a/japanese/gnomecore/files/patch-aa b/japanese/gnomecore/files/patch-aa index 57511b39a742..666652897bbf 100644 --- a/japanese/gnomecore/files/patch-aa +++ b/japanese/gnomecore/files/patch-aa @@ -1,6 +1,6 @@ ---- ./gnome-terminal/gnome-terminal.c.jpterm Sun Jul 16 20:02:36 2000 -+++ ./gnome-terminal/gnome-terminal.c Sun Oct 29 18:54:51 2000 -@@ -47,7 +47,7 @@ +--- gnome-terminal/gnome-terminal.c.orig Fri Apr 20 04:46:47 2001 ++++ gnome-terminal/gnome-terminal.c Thu Aug 30 18:46:34 2001 +@@ -51,7 +51,7 @@ char **env; @@ -9,23 +9,23 @@ #define EXTRA 6 /* is there pixmap compiled into zvt */ -@@ -93,6 +93,7 @@ +@@ -102,6 +102,7 @@ int scroll_out :1; /* Scroll on output? */ - int swap_keys :1; /* Swap DEL/Backspace? */ + int swap_keys :1; /* Swap Delete/Backspace? */ int login_by_default :1; /* do --login as default */ + int use_im :1; /* Open XInput Method */ #ifdef ZVT_BACKGROUND_SCROLL int scroll_background:1; /* background will scroll */ #endif -@@ -145,6 +146,7 @@ - GtkWidget *swapkeys_checkbox; +@@ -165,6 +166,7 @@ + #endif GtkWidget *login_by_default_checkbox; GtkWidget *use_bold_checkbox; + GtkWidget *use_im_checkbox; GtkWidget *wordclass_entry; GtkWidget *pixmap_checkbox; GtkWidget *pixmap_file_entry; -@@ -296,7 +298,7 @@ +@@ -316,7 +318,7 @@ char *s; GdkFont *font; @@ -34,7 +34,7 @@ if (font) { #ifdef ZVT_TERM_EMBOLDEN_SUPPORT if (zvt_term_get_capabilities(term) & ZVT_TERM_EMBOLDEN_SUPPORT && -@@ -515,6 +517,7 @@ +@@ -528,6 +530,7 @@ cfg->login_by_default = gnome_config_get_bool ("login_by_default=0"); cfg->use_bold = gnome_config_get_bool ("use_bold=true"); @@ -42,43 +42,33 @@ #ifdef ZVT_BACKGROUND_SCROLL cfg->scroll_background = gnome_config_get_bool ("scroll_background=0"); -@@ -579,6 +582,7 @@ +@@ -593,6 +596,7 @@ newcfg->bell = GTK_TOGGLE_BUTTON (prefs->bell_checkbox)->active; newcfg->blink = GTK_TOGGLE_BUTTON (prefs->blink_checkbox)->active; newcfg->swap_keys = GTK_TOGGLE_BUTTON (prefs->swapkeys_checkbox)->active; + newcfg->use_im = GTK_TOGGLE_BUTTON (prefs->use_im_checkbox)->active; - newcfg->menubar_hidden = GTK_TOGGLE_BUTTON (prefs->menubar_checkbox)->active; - newcfg->scroll_out = GTK_TOGGLE_BUTTON (prefs->scroll_out_checkbox)->active; - newcfg->scroll_key = GTK_TOGGLE_BUTTON (prefs->scroll_kbd_checkbox)->active; -@@ -669,6 +673,7 @@ + #ifdef HAVE_ZVT_DEL_IS_DEL + newcfg->del_is_del = GTK_TOGGLE_BUTTON (prefs->del_is_del_checkbox)->active; + #endif +@@ -686,6 +690,7 @@ zvt_term_set_scroll_on_output (term, cfg->scroll_out); zvt_term_set_scrollback (term, cfg->scrollback); zvt_term_set_del_key_swap (term, cfg->swap_keys); + zvt_term_set_open_im (term, cfg->use_im); - - if (zvt_pixmap_support && cfg->background_pixmap) { - int flags; -@@ -996,7 +1001,8 @@ - BELL_ROW = 4, - SWAPKEYS_ROW = 5, - LOGIN_ROW = 5, -- WORDCLASS_ROW = 6, -+ USE_IM_ROW = 6, -+ WORDCLASS_ROW = 7, - BACKGROUND_ROW = 1, - PIXMAP_FILE_ROW = 2, - SHADED_ROW = 4, -@@ -1033,6 +1039,7 @@ - gnome_config_set_bool ("swap_del_and_backspace", cfg->swap_keys); + #ifdef HAVE_ZVT_DEL_IS_DEL + zvt_term_set_del_is_del (term, cfg->del_is_del); + #endif +@@ -1030,6 +1035,7 @@ + #endif gnome_config_set_bool ("login_by_default", cfg->login_by_default); gnome_config_set_bool ("use_bold", cfg->use_bold); + gnome_config_set_bool ("use_im", cfg->use_im); gnome_config_set_int ("scrollbacklines", cfg->scrollback); gnome_config_set_int ("color_set", cfg->color_set); if (cfg->color_type>=4) -@@ -1243,6 +1250,15 @@ - gtk_table_attach (GTK_TABLE (table), prefs->login_by_default_checkbox, - 2, 3, LOGIN_ROW, LOGIN_ROW+1, GTK_FILL, 0, 0, 0); +@@ -1241,6 +1247,13 @@ + gtk_signal_connect (GTK_OBJECT (prefs->login_by_default_checkbox), "toggled", + GTK_SIGNAL_FUNC (prop_changed), prefs); + /* Use XInput Method */ + prefs->use_im_checkbox = gtk_check_button_new_with_label (_("Open IM(input method)")); @@ -86,13 +76,11 @@ + cfg->use_im ? 1 : 0); + gtk_signal_connect (GTK_OBJECT (prefs->use_im_checkbox), "toggled", + GTK_SIGNAL_FUNC (prop_changed), prefs); -+ gtk_table_attach (GTK_TABLE (table), prefs->use_im_checkbox, -+ 2, 3, USE_IM_ROW, USE_IM_ROW+1, GTK_FILL, 0, GNOME_PAD, GNOME_PAD); + /* Word selection class */ - l = aligned_label (_("Select-by-word characters")); - gtk_table_attach (GTK_TABLE (table), l, -@@ -1556,7 +1572,7 @@ + prefs->wordclass_entry = glade_xml_get_widget (gui, "wordclass-entry"); + gtk_entry_set_text (GTK_ENTRY (prefs->wordclass_entry), +@@ -1465,7 +1478,7 @@ GdkEvent *event; gint32 time; @@ -101,7 +89,7 @@ if (string_atom == GDK_NONE) return; -@@ -2233,6 +2249,7 @@ +@@ -2273,6 +2286,7 @@ } set_color_scheme (term, cfg); |