Made the package build with sunpro.

4 files changed, 60 insertions, 4 deletions

diff --git a/misc/goffice0.5/distinfo b/misc/goffice0.5/distinfo
index 81ca5db4723..f48e0dd4f42 100644
--- a/misc/goffice0.5/distinfo
+++ b/misc/goffice0.5/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.2 2007/10/27 02:22:46 wiz Exp $
+$NetBSD: distinfo,v 1.3 2007/11/02 23:05:35 rillig Exp $
 
-SHA1 (goffice-0.5.1.tar.gz) = c5309720d73b5ea5f9239619cbcffa62027b5db3
-RMD160 (goffice-0.5.1.tar.gz) = 46a2dc4c3043d38c18be1ab8c084a1c6d5754d07
-Size (goffice-0.5.1.tar.gz) = 3043886 bytes
+SHA1 (goffice-0.5.0.tar.gz) = d9ab6124b8b3d652568188d92aa286e835680c0a
+RMD160 (goffice-0.5.0.tar.gz) = a2b7639416b7aa47799cc3fdff4745ce334007e6
+Size (goffice-0.5.0.tar.gz) = 2942320 bytes
+SHA1 (patch-aa) = 3ddbbc595ea0a6a92b7dc75d3580e638c3f87a04
+SHA1 (patch-ab) = e9c69f309ae3ef62e274262378bf6823dd2c11fa
+SHA1 (patch-ac) = 6949a22ccbb7d897844f3050f4a37f41c214d131
diff --git a/misc/goffice0.5/patches/patch-aa b/misc/goffice0.5/patches/patch-aa
new file mode 100644
index 00000000000..bef8e287c6d
--- /dev/null
+++ b/misc/goffice0.5/patches/patch-aa
@@ -0,0 +1,25 @@
+$NetBSD: patch-aa,v 1.1 2007/11/02 23:05:35 rillig Exp $
+
+--- goffice/graph/gog-axis.c.orig	2007-08-19 01:32:59.000000000 +0200
++++ goffice/graph/gog-axis.c	2007-11-02 15:17:25.931475000 +0100
+@@ -930,9 +930,9 @@ void
+ gog_axis_map_get_extents (GogAxisMap *map, double *start, double *stop)
+ {
+ 	if (map->axis->inverted)
+-		return map->desc->map_bounds (map, stop, start);
++		map->desc->map_bounds (map, stop, start);
+ 	else
+-		return map->desc->map_bounds (map, start, stop);
++		map->desc->map_bounds (map, start, stop);
+ }
+ 
+ /**
+@@ -951,7 +951,7 @@ gog_axis_map_get_extents (GogAxisMap *ma
+ void
+ gog_axis_map_get_bounds (GogAxisMap *map, double *minimum, double *maximum)
+ {
+-	return map->desc->map_bounds (map, minimum, maximum);
++	map->desc->map_bounds (map, minimum, maximum);
+ }
+ 
+ /**
diff --git a/misc/goffice0.5/patches/patch-ab b/misc/goffice0.5/patches/patch-ab
new file mode 100644
index 00000000000..a6e08ab0a5f
--- /dev/null
+++ b/misc/goffice0.5/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2007/11/02 23:05:35 rillig Exp $
+
+for sunpro.
+
+--- goffice/graph/gog-guru.c.orig	2007-08-10 16:53:52.000000000 +0200
++++ goffice/graph/gog-guru.c	2007-11-02 15:18:36.751807000 +0100
+@@ -1512,7 +1512,7 @@ gog_guru (GogGraph *graph, GogDataAlloca
+ 	g_object_set_data_full (G_OBJECT (state->dialog),
+ 		"state", state, (GDestroyNotify) graph_guru_state_destroy);
+ 
+-#warning for 0.5.0 remove this and have the callers set transient and handle show, then drop the toplevel arg
++#warning "for 0.5.0 remove this and have the callers set transient and handle show, then drop the toplevel arg"
+ 	go_gtk_nonmodal_dialog (toplevel, GTK_WINDOW (state->dialog));
+ 	gtk_widget_show (GTK_WIDGET (state->dialog));
+ 
diff --git a/misc/goffice0.5/patches/patch-ac b/misc/goffice0.5/patches/patch-ac
new file mode 100644
index 00000000000..8d5d1c988e0
--- /dev/null
+++ b/misc/goffice0.5/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/11/02 23:05:36 rillig Exp $
+
+--- goffice/utils/go-undo.c.orig	2007-08-10 14:58:19.000000000 +0200
++++ goffice/utils/go-undo.c	2007-11-02 15:14:42.291949000 +0100
+@@ -33,7 +33,7 @@ go_undo_undo_with_data (GOUndo *u, gpoin
+ void
+ go_undo_undo (GOUndo *u)
+ {
+-	return go_undo_undo_with_data (u, NULL);
++	go_undo_undo_with_data (u, NULL);
+ }
+ 
+ /**