unbreak; ok jasper@

math/gnumeric/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.19 2007/05/19 09:13:54 jasper Exp $
+# $OpenBSD: Makefile,v 1.20 2007/05/20 13:39:56 martynas Exp $
 
 COMMENT=		"spreadsheet application for GNOME"
 
 VERSION=		1.4.3
 DISTNAME=		gnumeric-${VERSION}
-PKGNAME=		${DISTNAME}p4
+PKGNAME=		${DISTNAME}p5
 
 CATEGORIES=    		math x11/gnome
 
@@ -24,7 +24,10 @@ WANTLIB=		ICE ORBit-2 ORBitCosNaming-2 SM X11 Xext \
 			gnomeprint-2-2 gnomevfs-2 gobject-2.0 \
 			gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 \
 			pangoft2-1.0 pangocairo-1.0 cairo glitz png \
-			popt pthread ssl xml2 z
+			popt pthread ssl xml2 z \
+			Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr dbus-1 \
+			dbus-glib-1 expat util
+
 
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.4/}
 

math/gnumeric/patches/patch-plugins_corba_corba-workbook_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-plugins_corba_corba-workbook_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- plugins/corba/corba-workbook.c.orig	Fri Sep 24 23:35:15 2004
++++ plugins/corba/corba-workbook.c	Fri May 18 23:06:21 2007
+@@ -313,8 +313,8 @@ wbcc_init (WorkbookControlCORBA *wbcc)
+ }
+
+ GSF_CLASS_FULL (WorkbookControlCORBA, workbook_control_corba,
+-		wbcc_class_init, wbcc_init, 
+-		WORKBOOK_CONTROL_TYPE, 0,
++		NULL, NULL,wbcc_class_init, NULL,
++		wbcc_init, WORKBOOK_CONTROL_TYPE, 0,
+ 		GSF_INTERFACE (wbcc_gnm_cmd_context_init,
+ 			       GNM_CMD_CONTEXT_TYPE))
+

math/gnumeric/patches/patch-src_command-context-stderr_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_command-context-stderr_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/command-context-stderr.c.orig	Sun Jun 13 21:48:34 2004
++++ src/command-context-stderr.c	Fri May 18 23:06:21 2007
+@@ -107,6 +107,6 @@ ccs_gnm_cmd_context_init (GnmCmdContextClass *cc_class
+ }
+
+ GSF_CLASS_FULL (CmdContextStderr, cmd_context_stderr,
+-		NULL, ccs_init,
+-		G_TYPE_OBJECT, 0,
++		NULL, NULL, NULL, NULL,
++		ccs_init, G_TYPE_OBJECT, 0,
+ 		GSF_INTERFACE (ccs_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))

math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_cut-n-paste_pcre_pcre_c

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_cut-n-paste-code_goffice_cut-n-paste_pcre_pcre_c,v 1.1 2005/08/27 21:10:39 mbalmer Exp $
---- src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c.orig	Fri Oct 29 20:13:19 2004
-+++ src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c	Sat Aug 27 12:10:16 2005
-@@ -1062,14 +1062,30 @@ read_repeat_counts(const uschar *p, int 
+$OpenBSD: patch-src_cut-n-paste-code_goffice_cut-n-paste_pcre_pcre_c,v 1.2 2007/05/20 13:39:56 martynas Exp $
+--- src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c.orig	Fri Oct 29 21:13:19 2004
++++ src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c	Fri May 18 22:38:00 2007
+@@ -1062,14 +1062,30 @@ read_repeat_counts(const uschar *p, int *minp, int *ma
  int min = 0;
  int max = -1;
 

math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-axis_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_cut-n-paste-code_goffice_graph_gog-axis_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/cut-n-paste-code/goffice/graph/gog-axis.c.orig	Wed Feb  9 23:54:29 2005
++++ src/cut-n-paste-code/goffice/graph/gog-axis.c	Fri May 18 23:06:21 2007
+@@ -1678,8 +1678,8 @@ gog_axis_dataset_init (GogDatasetClass *iface)
+ }
+
+ GSF_CLASS_FULL (GogAxis, gog_axis,
+-		gog_axis_class_init, gog_axis_init,
+-		GOG_STYLED_OBJECT_TYPE, 0,
++		NULL, NULL, gog_axis_class_init, NULL,
++		gog_axis_init, GOG_STYLED_OBJECT_TYPE, 0,
+ 		GSF_INTERFACE (gog_axis_dataset_init, GOG_DATASET_TYPE))
+
+

math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-error-bar_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_cut-n-paste-code_goffice_graph_gog-error-bar_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/cut-n-paste-code/goffice/graph/gog-error-bar.c.orig	Thu Dec  2 15:57:26 2004
++++ src/cut-n-paste-code/goffice/graph/gog-error-bar.c	Fri May 18 23:06:21 2007
+@@ -488,8 +488,8 @@ gog_error_bar_persist_init (GogPersistClass *iface)
+ }
+
+ GSF_CLASS_FULL (GogErrorBar, gog_error_bar,
+-		gog_error_bar_class_init, gog_error_bar_init,
+-		G_TYPE_OBJECT, 0,
++		NULL, NULL, gog_error_bar_class_init, NULL,
++		gog_error_bar_init, G_TYPE_OBJECT, 0,
+ 		GSF_INTERFACE (gog_error_bar_persist_init, GOG_PERSIST_TYPE))
+
+

math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-label_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_cut-n-paste-code_goffice_graph_gog-label_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/cut-n-paste-code/goffice/graph/gog-label.c.orig	Mon Oct 25 23:36:05 2004
++++ src/cut-n-paste-code/goffice/graph/gog-label.c	Fri May 18 23:06:21 2007
+@@ -176,8 +176,8 @@ gog_label_dataset_init (GogDatasetClass *iface)
+ }
+
+ GSF_CLASS_FULL (GogLabel, gog_label,
+-		gog_label_class_init, NULL,
+-		GOG_OUTLINED_OBJECT_TYPE, 0,
++		NULL, NULL, gog_label_class_init, NULL,
++		NULL, GOG_STYLED_OBJECT_TYPE, 0,
+ 		GSF_INTERFACE (gog_label_dataset_init, GOG_DATASET_TYPE))
+
+ /************************************************************************/

math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-series_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_cut-n-paste-code_goffice_graph_gog-series_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/cut-n-paste-code/goffice/graph/gog-series.c.orig	Wed Jan  5 20:05:53 2005
++++ src/cut-n-paste-code/goffice/graph/gog-series.c	Fri May 18 23:06:21 2007
+@@ -589,8 +589,8 @@ gog_series_dataset_init (GogDatasetClass *iface)
+ }
+
+ GSF_CLASS_FULL (GogSeries, gog_series,
+-		gog_series_class_init, gog_series_init,
+-		GOG_STYLED_OBJECT_TYPE, 0,
++		NULL, NULL, gog_series_class_init, NULL,
++		gog_series_init, GOG_STYLED_OBJECT_TYPE, 0,
+ 		GSF_INTERFACE (gog_series_dataset_init, GOG_DATASET_TYPE))
+
+ /**

math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-style_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_cut-n-paste-code_goffice_graph_gog-style_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/cut-n-paste-code/goffice/graph/gog-style.c.orig	Fri Nov 19 17:49:12 2004
++++ src/cut-n-paste-code/goffice/graph/gog-style.c	Fri May 18 23:06:21 2007
+@@ -1687,8 +1687,8 @@ gog_style_persist_init (GogPersistClass *iface)
+ }
+
+ GSF_CLASS_FULL (GogStyle, gog_style,
+-		gog_style_class_init, gog_style_init,
+-		G_TYPE_OBJECT, 0,
++		NULL, NULL, gog_style_class_init, NULL,
++		gog_style_init, G_TYPE_OBJECT, 0,
+ 		GSF_INTERFACE (gog_style_persist_init, GOG_PERSIST_TYPE))
+
+ gboolean

math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_gui-utils_go-combo-box_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_cut-n-paste-code_goffice_gui-utils_go-combo-box_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/cut-n-paste-code/goffice/gui-utils/go-combo-box.c.orig	Sun Mar 21 07:35:08 2004
++++ src/cut-n-paste-code/goffice/gui-utils/go-combo-box.c	Sat May 19 00:14:15 2007
+@@ -24,6 +24,8 @@
+  * 02111-1307, USA.
+  */
+
++#undef GTK_DISABLE_DEPRECATED
++
+ #include <goffice/goffice-config.h>
+ #include "go-combo-box.h"
+ #include "go-marshalers.h"

math/gnumeric/patches/patch-src_gnm-so-filled_c

@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_gnm-so-filled_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/gnm-so-filled.c.orig	Sun Oct 17 05:36:05 2004
++++ src/gnm-so-filled.c	Fri May 18 23:06:21 2007
+@@ -113,7 +113,7 @@ so_filled_foo_view_init (SheetObjectViewIface *sov_ifa
+ typedef FooCanvasGroup		FilledFooView;
+ typedef FooCanvasGroupClass	FilledFooViewClass;
+ static GSF_CLASS_FULL (FilledFooView, so_filled_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_GROUP, 0,
+ 	GSF_INTERFACE (so_filled_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */
+@@ -632,7 +632,7 @@ so_polygon_foo_view_init (SheetObjectViewIface *sov_if
+ typedef FooCanvasPolygon	PolygonFooView;
+ typedef FooCanvasPolygonClass	PolygonFooViewClass;
+ static GSF_CLASS_FULL (PolygonFooView, so_polygon_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_POLYGON, 0,
+ 	GSF_INTERFACE (so_polygon_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */

math/gnumeric/patches/patch-src_gnm-so-line_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_gnm-so-line_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/gnm-so-line.c.orig	Tue Nov 30 20:37:07 2004
++++ src/gnm-so-line.c	Fri May 18 23:06:21 2007
+@@ -111,7 +111,7 @@ so_line_foo_view_init (SheetObjectViewIface *sov_iface
+ typedef FooCanvasLine		LineFooView;
+ typedef FooCanvasLineClass	LineFooViewClass;
+ static GSF_CLASS_FULL (LineFooView, so_line_foo_view,
+-	NULL, NULL,
++	NULL, NULL,NULL, NULL,NULL,
+ 	FOO_TYPE_CANVAS_LINE, 0,
+ 	GSF_INTERFACE (so_line_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */

math/gnumeric/patches/patch-src_io-context-gtk_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_io-context-gtk_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/io-context-gtk.c.orig	Sat Oct 30 06:51:35 2004
++++ src/io-context-gtk.c	Fri May 18 23:06:21 2007
+@@ -367,8 +367,8 @@ icg_init (IOContextGtk *icg)
+ }
+
+ GSF_CLASS_FULL (IOContextGtk, io_context_gtk,
+-		icg_class_init, icg_init,
+-		TYPE_IO_CONTEXT, 0,
++		NULL, NULL, icg_class_init, NULL,
++		icg_init, TYPE_IO_CONTEXT, 0,
+ 		GSF_INTERFACE (icg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+
+ void

math/gnumeric/patches/patch-src_io-context_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_io-context_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/io-context.c.orig	Tue Jul 20 03:37:13 2004
++++ src/io-context.c	Fri May 18 23:06:21 2007
+@@ -117,8 +117,8 @@ io_context_class_init (GObjectClass *klass)
+ }
+
+ GSF_CLASS_FULL (IOContext, io_context,
+-		io_context_class_init, io_context_init,
+-		G_TYPE_OBJECT, 0,
++		NULL,NULL,io_context_class_init,NULL,
++		io_context_init,G_TYPE_OBJECT, 0,
+ 		GSF_INTERFACE (io_context_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+
+ IOContext *

math/gnumeric/patches/patch-src_main-application_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_main-application_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/main-application.c.orig	Wed Mar  9 18:59:33 2005
++++ src/main-application.c	Sat May 19 00:42:21 2007
+@@ -10,6 +10,8 @@
+  * Copyright (C) 2002-2004, Jon K�re Hellan
+  */
+
++#undef GNOME_DISABLE_DEPRECATED
++
+ #include <gnumeric-config.h>
+ #include <glib/gi18n.h>
+ #include "gnumeric.h"

math/gnumeric/patches/patch-src_sheet-filter_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_sheet-filter_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/sheet-filter.c.orig	Sun Oct 17 05:36:05 2004
++++ src/sheet-filter.c	Fri May 18 23:06:21 2007
+@@ -563,7 +563,7 @@ filter_foo_view_init (SheetObjectViewIface *sov_iface)
+ typedef FooCanvasWidget		FilterFooView;
+ typedef FooCanvasWidgetClass	FilterFooViewClass;
+ static GSF_CLASS_FULL (FilterFooView, filter_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_WIDGET, 0,
+ 	GSF_INTERFACE (filter_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+

math/gnumeric/patches/patch-src_sheet-object-cell-comment_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_sheet-object-cell-comment_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/sheet-object-cell-comment.c.orig	Fri Jan 14 07:48:29 2005
++++ src/sheet-object-cell-comment.c	Fri May 18 23:06:21 2007
+@@ -123,7 +123,7 @@ comment_foo_view_init (SheetObjectViewIface *sov_iface
+ typedef FooCanvasPolygon	CommentFooView;
+ typedef FooCanvasPolygonClass	CommentFooViewClass;
+ static GSF_CLASS_FULL (CommentFooView, comment_foo_view,
+-	NULL, NULL,
++	NULL, NULL,NULL,NULL,NULL,
+ 	FOO_TYPE_CANVAS_POLYGON, 0,
+ 	GSF_INTERFACE (comment_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+

math/gnumeric/patches/patch-src_sheet-object-graph_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_sheet-object-graph_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/sheet-object-graph.c.orig	Fri Oct 29 07:13:13 2004
++++ src/sheet-object-graph.c	Fri May 18 23:06:21 2007
+@@ -94,7 +94,7 @@ so_graph_foo_view_init (SheetObjectViewIface *sov_ifac
+ typedef GogControlFooCanvas		SOGraphFooView;
+ typedef GogControlFooCanvasClass	SOGraphFooViewClass;
+ static GSF_CLASS_FULL (SOGraphFooView, so_graph_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	GOG_CONTROL_FOOCANVAS_TYPE, 0,
+ 	GSF_INTERFACE (so_graph_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+

math/gnumeric/patches/patch-src_sheet-object-image_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_sheet-object-image_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/sheet-object-image.c.orig	Sat Dec 18 06:48:37 2004
++++ src/sheet-object-image.c	Fri May 18 23:06:21 2007
+@@ -90,7 +90,7 @@ so_image_foo_view_init (SheetObjectViewIface *sov_ifac
+ typedef FooCanvasPixbuf		SOImageFooView;
+ typedef FooCanvasPixbufClass	SOImageFooViewClass;
+ static GSF_CLASS_FULL (SOImageFooView, so_image_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_PIXBUF, 0,
+ 	GSF_INTERFACE (so_image_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+

math/gnumeric/patches/patch-src_sheet-object-widget_c

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_sheet-object-widget_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/sheet-object-widget.c.orig	Wed Feb  9 23:54:29 2005
++++ src/sheet-object-widget.c	Fri May 18 23:06:21 2007
+@@ -99,7 +99,7 @@ so_widget_foo_view_init (SheetObjectViewIface *sov_ifa
+ typedef FooCanvasWidget		SOWidgetFooView;
+ typedef FooCanvasWidgetClass	SOWidgetFooViewClass;
+ static GSF_CLASS_FULL (SOWidgetFooView, so_widget_foo_view,
+-	NULL, NULL,
++       NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_WIDGET, 0,
+ 	GSF_INTERFACE (so_widget_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+

math/gnumeric/patches/patch-src_widgets_gnumeric-expr-entry_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_widgets_gnumeric-expr-entry_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/widgets/gnumeric-expr-entry.c.orig	Tue Sep  7 22:28:41 2004
++++ src/widgets/gnumeric-expr-entry.c	Fri May 18 23:06:22 2007
+@@ -503,8 +503,8 @@ gee_cell_editable_init (GtkCellEditableIface *iface)
+ }
+
+ GSF_CLASS_FULL (GnmExprEntry, gnm_expr_entry,
+-		gee_class_init, gee_init,
+-		GTK_TYPE_HBOX, 0,
++		NULL, NULL, gee_class_init, NULL,
++		gee_init, GTK_TYPE_HBOX, 0,
+ 		GSF_INTERFACE (gee_cell_editable_init, GTK_TYPE_CELL_EDITABLE))
+
+ /**

math/gnumeric/patches/patch-src_workbook-control-gui_c

@@ -0,0 +1,14 @@
+$OpenBSD: patch-src_workbook-control-gui_c,v 1.1 2007/05/20 13:39:56 martynas Exp $
+--- src/workbook-control-gui.c.orig	Sun Mar 13 02:05:45 2005
++++ src/workbook-control-gui.c	Fri May 18 23:06:22 2007
+@@ -2545,8 +2545,8 @@ workbook_control_gui_init (WorkbookControlGUI *wbcg)
+ }
+
+ GSF_CLASS_FULL (WorkbookControlGUI, workbook_control_gui,
+-		workbook_control_gui_class_init, workbook_control_gui_init,
+-		WORKBOOK_CONTROL_TYPE, G_TYPE_FLAG_ABSTRACT,
++		NULL,NULL,workbook_control_gui_class_init,NULL,
++		workbook_control_gui_init,WORKBOOK_CONTROL_TYPE, G_TYPE_FLAG_ABSTRACT,
+ 		GSF_INTERFACE (wbcg_go_plot_data_allocator_init, GOG_DATA_ALLOCATOR_TYPE);
+ 		GSF_INTERFACE (wbcg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+