Made the package build with sunpro.

4 files changed, 64 insertions, 1 deletions

diff --git a/math/gnumeric/distinfo b/math/gnumeric/distinfo
index 9e13ac53245..62426126c9e 100644
--- a/math/gnumeric/distinfo
+++ b/math/gnumeric/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2007/01/21 19:17:33 wiz Exp $
+$NetBSD: distinfo,v 1.30 2007/11/23 13:48:19 rillig Exp $
 
 SHA1 (gnumeric-1.6.3.tar.bz2) = 2261b3276ed5ead65047208a6ddb7f3436b7e544
 RMD160 (gnumeric-1.6.3.tar.bz2) = 49be3b72070555ab6b58f1c59a0c22819b9b9096
@@ -6,3 +6,6 @@ Size (gnumeric-1.6.3.tar.bz2) = 12540950 bytes
 SHA1 (patch-aa) = 1601ae861cdf1851d1939aa44666929d9ad4f1e7
 SHA1 (patch-ab) = 2762921405544d83c8a1290afffafe846e47b3d1
 SHA1 (patch-ac) = 6da3a2eea055c4cb68cf902b2a96e58ca1081326
+SHA1 (patch-ad) = 4089cdb0ed88dfe5cdd400343970b98076dccc3d
+SHA1 (patch-ae) = 6d622a588cb23af7388a5bbca3b5f5e50021a5bf
+SHA1 (patch-af) = 6db5fd63708227ae5e34bf0efb0aacaa011b52c7
diff --git a/math/gnumeric/patches/patch-ad b/math/gnumeric/patches/patch-ad
new file mode 100644
index 00000000000..cf3ae7d4281
--- /dev/null
+++ b/math/gnumeric/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.7 2007/11/23 13:48:19 rillig Exp $
+
+--- src/dialogs/dialog-doc-metadata.c.orig	2005-09-29 01:29:46.000000000 +0200
++++ src/dialogs/dialog-doc-metadata.c	2007-11-23 14:27:35.336794000 +0100
+@@ -336,7 +336,7 @@ cb_dialog_doc_metadata_owner_read_clicke
+ 	GtkCheckButton * button  = GTK_CHECK_BUTTON (w); 
+ 
+ 	g_return_if_fail(button != NULL);
+-	fprintf(stderr, "%s() - state = %d\n", __FUNCTION__, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)));
++	fprintf(stderr, "%s() - state = %d\n", G_STRFUNC, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)));
+ }
+ 
+ static void
diff --git a/math/gnumeric/patches/patch-ae b/math/gnumeric/patches/patch-ae
new file mode 100644
index 00000000000..9bed82d211a
--- /dev/null
+++ b/math/gnumeric/patches/patch-ae
@@ -0,0 +1,34 @@
+$NetBSD: patch-ae,v 1.7 2007/11/23 13:48:20 rillig Exp $
+
+--- src/style.c.orig	2006-03-15 14:55:15.000000000 +0100
++++ src/style.c	2007-11-23 14:25:49.371371000 +0100
+@@ -216,7 +216,8 @@ style_font_new_simple (PangoContext *con
+ 		font->ref_count++;
+ 
+ #ifdef DEBUG_REF_COUNT
+-	g_message (__FUNCTION__ " font=%p name=%s%s%s ref_count=%d\n",
++	g_message ("%s font=%p name=%s%s%s ref_count=%d\n",
++		 G_STRFUNC,
+ 		 font, font->font_name,
+ 		 font->is_bold ? " bold" : "",
+ 		 font->is_italic ? " italic" : "",
+@@ -274,7 +275,8 @@ style_font_ref (GnmFont *sf)
+ 
+ 	sf->ref_count++;
+ #ifdef DEBUG_REF_COUNT
+-	g_message (__FUNCTION__ " font=%p name=%s%s%s ref_count=%d\n",
++	g_message ("%s font=%p name=%s%s%s ref_count=%d\n",
++		 G_STRFUNC,
+ 		 sf, sf->font_name,
+ 		 sf->is_bold ? " bold" : "",
+ 		 sf->is_italic ? " italic" : "",
+@@ -290,7 +292,8 @@ style_font_unref (GnmFont *sf)
+ 
+ 	sf->ref_count--;
+ #ifdef DEBUG_REF_COUNT
+-	g_message (__FUNCTION__ " font=%p name=%s%s%s ref_count=%d\n",
++	g_message ("%s font=%p name=%s%s%s ref_count=%d\n",
++		 G_STRFUNC,
+ 		 sf, sf->font_name,
+ 		 sf->is_bold ? " bold" : "",
+ 		 sf->is_italic ? " italic" : "",
diff --git a/math/gnumeric/patches/patch-af b/math/gnumeric/patches/patch-af
new file mode 100644
index 00000000000..3c5451e72da
--- /dev/null
+++ b/math/gnumeric/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.7 2007/11/23 13:48:20 rillig Exp $
+
+--- src/gnm-so-polygon.c.orig	2006-03-14 19:03:29.000000000 +0100
++++ src/gnm-so-polygon.c	2007-11-23 14:31:18.939985000 +0100
+@@ -214,7 +214,7 @@ static void
+ gnm_so_polygon_write_xml_sax (SheetObject const *so, GsfXMLOut *output)
+ {
+ 	/* TODO */
+-	return gnm_so_polygon_parent_class->write_xml_sax (so, output);
++	gnm_so_polygon_parent_class->write_xml_sax (so, output);
+ }
+ 
+ static void