Add Japanese patch.

5 files changed, 58 insertions, 0 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 19ad34ff1961..6bd06f934216 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -65,6 +65,7 @@
     SUBDIR += gnomecore
     SUBDIR += gnomeicu
     SUBDIR += gnomelibs
+    SUBDIR += gnumeric
     SUBDIR += gp
     SUBDIR += grep
     SUBDIR += groff
diff --git a/japanese/gnumeric/Makefile b/japanese/gnumeric/Makefile
new file mode 100644
index 000000000000..cd361124477f
--- /dev/null
+++ b/japanese/gnumeric/Makefile
@@ -0,0 +1,18 @@
+# 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=	0.57
+CATEGORIES=	japanese math gnome
+
+MASTERDIR=	${.CURDIR}/../../math/gnumeric
+
+EXTRA_PATCHES=	${.CURDIR}/files/patch-*
+
+MAINTAINER=	nakai@FreeBSD.org
+
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/gnumeric/files/patch-aa b/japanese/gnumeric/files/patch-aa
new file mode 100644
index 000000000000..5f19fe708969
--- /dev/null
+++ b/japanese/gnumeric/files/patch-aa
@@ -0,0 +1,11 @@
+--- src/dialogs/dialog-stf-preview.c.orig	Mon Oct 30 17:44:01 2000
++++ src/dialogs/dialog-stf-preview.c	Mon Oct 30 17:44:31 2000
+@@ -711,7 +711,7 @@
+ 	renderdata->gridgroup    = NULL;
+ 	renderdata->hashtable    = g_hash_table_new (g_int_hash, g_int_equal);
+ 
+-	renderdata->font       = gdk_font_load ("fixed");
++	renderdata->font       = gdk_fontset_load ("-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*");
+ 	renderdata->charwidth  = gdk_string_width (renderdata->font, "W");
+ 	renderdata->charheight = gdk_string_height (renderdata->font, "W");
+ 
diff --git a/japanese/gnumeric/files/patch-ab b/japanese/gnumeric/files/patch-ab
new file mode 100644
index 000000000000..99c67d707f6c
--- /dev/null
+++ b/japanese/gnumeric/files/patch-ab
@@ -0,0 +1,14 @@
+--- src/style.c.orig	Tue Sep 19 09:41:02 2000
++++ src/style.c	Mon Oct 30 23:11:36 2000
+@@ -70,9 +70,9 @@
+ 		}
+ 
+ 		/* Worst case scenario */
+-		font->gdk_font = gnome_display_font_get_gdk_font (font->dfont);
++		font->gdk_font = gdk_fontset_load ("-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*");
+ 		if (font->gdk_font == NULL)
+-			font->gdk_font = gdk_font_load ("fixed");
++			font->gdk_font = gdk_fontset_load ("-misc-fixed-medium-r-normal--14-*-*-*-*-*-*-*");
+ 		else
+ 			gdk_font_ref (font->gdk_font);
+ 
diff --git a/japanese/gnumeric/files/patch-ac b/japanese/gnumeric/files/patch-ac
new file mode 100644
index 000000000000..2e72eab92aff
--- /dev/null
+++ b/japanese/gnumeric/files/patch-ac
@@ -0,0 +1,14 @@
+--- src/item-edit.c.orig	Mon Oct 30 23:06:00 2000
++++ src/item-edit.c	Mon Oct 30 23:08:03 2000
+@@ -223,6 +223,11 @@
+ 		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 (
+ 		drawable, canvas->style->white_gc, TRUE,