diff options
Diffstat (limited to 'japanese')
| -rw-r--r-- | japanese/Makefile | 1 | ||||
| -rw-r--r-- | japanese/gnome/Makefile | 1 | ||||
| -rw-r--r-- | japanese/gnumeric/Makefile | 18 | ||||
| -rw-r--r-- | japanese/gnumeric/files/patch-ab | 10 | ||||
| -rw-r--r-- | japanese/gnumeric/files/patch-ac | 65 |
5 files changed, 0 insertions, 95 deletions
diff --git a/japanese/Makefile b/japanese/Makefile index fc810bf5942c..683f6cfa9e38 100644 --- a/japanese/Makefile +++ b/japanese/Makefile @@ -94,7 +94,6 @@ SUBDIR += gn-gnspool SUBDIR += gnome SUBDIR += gnomelibs - SUBDIR += gnumeric SUBDIR += gorua SUBDIR += gqmpeg SUBDIR += grep diff --git a/japanese/gnome/Makefile b/japanese/gnome/Makefile index cbff7a7ebbe3..18c48630f494 100644 --- a/japanese/gnome/Makefile +++ b/japanese/gnome/Makefile @@ -18,7 +18,6 @@ COMMENT= The Japanese "meta-port" for the GNOME integrated X11 desktop LIB_DEPENDS= gnome.5:${PORTSDIR}/japanese/gnomelibs \ gal.23:${PORTSDIR}/japanese/gal -RUN_DEPENDS= gnumeric:${PORTSDIR}/japanese/gnumeric NO_BUILD= yes diff --git a/japanese/gnumeric/Makefile b/japanese/gnumeric/Makefile deleted file mode 100644 index 744f9aaddc05..000000000000 --- a/japanese/gnumeric/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# New ports collection makefile for: gnumeric -# Date created: 30 October 2000 -# Whom: Yukihiro Nakai <nakai@FreeBSD.org> -# -# $FreeBSD$ -# - -# This port does not work with another version of master port. -#PORTVERSION= 1.0.4 -CATEGORIES= japanese math gnome - -MASTERDIR= ${.CURDIR}/../../math/gnumeric - -EXTRA_PATCHES= ${.CURDIR}/files/patch-* - -MAINTAINER= ports@FreeBSD.org - -.include "${MASTERDIR}/Makefile" diff --git a/japanese/gnumeric/files/patch-ab b/japanese/gnumeric/files/patch-ab deleted file mode 100644 index 7107a515e264..000000000000 --- a/japanese/gnumeric/files/patch-ab +++ /dev/null @@ -1,10 +0,0 @@ ---- src/style.c.orig Sun Oct 7 08:34:37 2001 -+++ src/style.c Mon Oct 22 20:50:21 2001 -@@ -81,6 +81,7 @@ - - /* Worst case scenario */ - font->gdk_font = gnome_display_font_get_gdk_font (font->dfont); -+ font->gdk_font = gdk_fontset_load(_("fixed")); - if (font->gdk_font == NULL) - /* xgettext: - * The name of the default font for this locale. diff --git a/japanese/gnumeric/files/patch-ac b/japanese/gnumeric/files/patch-ac deleted file mode 100644 index aeba4b9ae186..000000000000 --- a/japanese/gnumeric/files/patch-ac +++ /dev/null @@ -1,65 +0,0 @@ ---- src/item-edit.c.orig Thu Dec 27 07:10:52 2001 -+++ src/item-edit.c Fri Mar 1 21:58:00 2002 -@@ -42,6 +42,41 @@ - ARG_SHEET_CONTROL_GUI, /* The SheetControlGUI * argument */ - }; - -+/* Update XIM position */ -+static void -+item_edit_update_im_position(ItemEdit* item_edit, int x, int y) -+{ -+ /* Need widget pointer that has GdkIC */ -+ GnumericCanvas* gcanvas = -+ GNUMERIC_CANVAS(GNOME_CANVAS_ITEM(item_edit)->canvas); -+ int cx, cy; -+ -+ if (GTK_WIDGET_HAS_FOCUS(gcanvas) && gdk_im_ready() && -+ gcanvas->ic && (gdk_ic_get_style (gcanvas->ic) -+ & GDK_IM_PREEDIT_POSITION)){ -+ -+ int width, height; -+ -+ /* position should be inside the widget */ -+ if ( x <= 0 || y <=0 ) -+ return; -+ -+ gnome_canvas_get_scroll_offsets(GNOME_CANVAS(gcanvas), &cx, &cy); -+ -+ gcanvas->ic_attr->spot_location.x = -+ (int)GNOME_CANVAS_ITEM(item_edit)->x1 + x - cx; -+ gcanvas->ic_attr->spot_location.y = -+ (int)GNOME_CANVAS_ITEM(item_edit)->y1 + y - 2 - cy; -+ -+ gdk_window_get_size (GTK_WIDGET(gcanvas)->window, &width, &height); -+ gcanvas->ic_attr->preedit_area.width = width; -+ gcanvas->ic_attr->preedit_area.height = height; -+ -+ gdk_ic_set_attr (gcanvas->ic, gcanvas->ic_attr, -+ GDK_IC_SPOT_LOCATION | GDK_IC_PREEDIT_AREA); -+ } -+} -+ - static void - scan_at (const char *text, int *scan) - { -@@ -169,6 +204,8 @@ - gdk_draw_line (drawable, style->black_gc, - x, y-font->ascent, - x, y+font->descent); -+ -+ item_edit_update_im_position(item_edit, x, y+font->descent); - } - - static void -@@ -239,6 +276,11 @@ - if (item_edit->font == NULL) - return; - top_pos += item_edit->font->ascent; -+ -+ /* Handle multibyte */ -+ if( cursor_pos != -1 ) -+ cursor_pos = strlen(gtk_editable_get_chars(GTK_EDITABLE(item_edit->entry), -+ 0, cursor_pos)); - - /* Draw the background (recall that gdk_draw_rectangle excludes far coords) */ - gdk_draw_rectangle ( |