diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 7704a072750..ec32d7369cc 100644 --- a/math/gnumeric/Makefile +++ b/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/} diff --git a/math/gnumeric/patches/patch-plugins_corba_corba-workbook_c b/math/gnumeric/patches/patch-plugins_corba_corba-workbook_c new file mode 100644 index 00000000000..1a8de9130bc --- /dev/null +++ b/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)) + diff --git a/math/gnumeric/patches/patch-src_command-context-stderr_c b/math/gnumeric/patches/patch-src_command-context-stderr_c new file mode 100644 index 00000000000..07e73eaa912 --- /dev/null +++ b/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)) diff --git a/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_cut-n-paste_pcre_pcre_c b/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_cut-n-paste_pcre_pcre_c index 604af6474a0..6b0bbaea1ed 100644 --- a/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_cut-n-paste_pcre_pcre_c +++ b/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; diff --git a/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-axis_c b/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-axis_c new file mode 100644 index 00000000000..d2fd58c596c --- /dev/null +++ b/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)) + + diff --git a/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-error-bar_c b/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-error-bar_c new file mode 100644 index 00000000000..60e080d0bc6 --- /dev/null +++ b/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)) + + diff --git a/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-label_c b/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-label_c new file mode 100644 index 00000000000..d716035f04e --- /dev/null +++ b/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)) + + /************************************************************************/ diff --git a/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-series_c b/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-series_c new file mode 100644 index 00000000000..16df28ff414 --- /dev/null +++ b/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)) + + /** diff --git a/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-style_c b/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_graph_gog-style_c new file mode 100644 index 00000000000..9d5369a5923 --- /dev/null +++ b/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 diff --git a/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_gui-utils_go-combo-box_c b/math/gnumeric/patches/patch-src_cut-n-paste-code_goffice_gui-utils_go-combo-box_c new file mode 100644 index 00000000000..c9104a22977 --- /dev/null +++ b/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 + #include "go-combo-box.h" + #include "go-marshalers.h" diff --git a/math/gnumeric/patches/patch-src_gnm-so-filled_c b/math/gnumeric/patches/patch-src_gnm-so-filled_c new file mode 100644 index 00000000000..1d59636b5bc --- /dev/null +++ b/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 */ diff --git a/math/gnumeric/patches/patch-src_gnm-so-line_c b/math/gnumeric/patches/patch-src_gnm-so-line_c new file mode 100644 index 00000000000..c6282b7bd94 --- /dev/null +++ b/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 */ diff --git a/math/gnumeric/patches/patch-src_io-context-gtk_c b/math/gnumeric/patches/patch-src_io-context-gtk_c new file mode 100644 index 00000000000..d82b770885d --- /dev/null +++ b/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 diff --git a/math/gnumeric/patches/patch-src_io-context_c b/math/gnumeric/patches/patch-src_io-context_c new file mode 100644 index 00000000000..4a88879837d --- /dev/null +++ b/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 * diff --git a/math/gnumeric/patches/patch-src_main-application_c b/math/gnumeric/patches/patch-src_main-application_c new file mode 100644 index 00000000000..d4219094caa --- /dev/null +++ b/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 + #include + #include "gnumeric.h" diff --git a/math/gnumeric/patches/patch-src_sheet-filter_c b/math/gnumeric/patches/patch-src_sheet-filter_c new file mode 100644 index 00000000000..bae26f35195 --- /dev/null +++ b/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)) + diff --git a/math/gnumeric/patches/patch-src_sheet-object-cell-comment_c b/math/gnumeric/patches/patch-src_sheet-object-cell-comment_c new file mode 100644 index 00000000000..3c3b66bb851 --- /dev/null +++ b/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)) + diff --git a/math/gnumeric/patches/patch-src_sheet-object-graph_c b/math/gnumeric/patches/patch-src_sheet-object-graph_c new file mode 100644 index 00000000000..628c7090323 --- /dev/null +++ b/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)) + diff --git a/math/gnumeric/patches/patch-src_sheet-object-image_c b/math/gnumeric/patches/patch-src_sheet-object-image_c new file mode 100644 index 00000000000..6bce5f02f20 --- /dev/null +++ b/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)) + diff --git a/math/gnumeric/patches/patch-src_sheet-object-widget_c b/math/gnumeric/patches/patch-src_sheet-object-widget_c new file mode 100644 index 00000000000..c69dee3216c --- /dev/null +++ b/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)) + diff --git a/math/gnumeric/patches/patch-src_widgets_gnumeric-expr-entry_c b/math/gnumeric/patches/patch-src_widgets_gnumeric-expr-entry_c new file mode 100644 index 00000000000..082041b4249 --- /dev/null +++ b/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)) + + /** diff --git a/math/gnumeric/patches/patch-src_workbook-control-gui_c b/math/gnumeric/patches/patch-src_workbook-control-gui_c new file mode 100644 index 00000000000..748ab892a83 --- /dev/null +++ b/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)) + diff --git a/math/gnumeric/pkg/PLIST b/math/gnumeric/pkg/PLIST index 3a3130af400..2d434265e5b 100644 --- a/math/gnumeric/pkg/PLIST +++ b/math/gnumeric/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.10 2005/05/27 17:50:26 marcm Exp $ +@comment $OpenBSD: PLIST,v 1.11 2007/05/20 13:39:56 martynas Exp $ bin/gnumeric bin/gnumeric-${VERSION} bin/ssconvert @@ -9,81 +9,107 @@ lib/gnumeric/ lib/gnumeric/${VERSION}/ lib/gnumeric/${VERSION}/plugins/ lib/gnumeric/${VERSION}/plugins/applix/ +lib/gnumeric/${VERSION}/plugins/applix/applix.a lib/gnumeric/${VERSION}/plugins/applix/applix.la lib/gnumeric/${VERSION}/plugins/applix/plugin.xml lib/gnumeric/${VERSION}/plugins/corba/ +lib/gnumeric/${VERSION}/plugins/corba/corba.a lib/gnumeric/${VERSION}/plugins/corba/corba.la lib/gnumeric/${VERSION}/plugins/corba/plugin.xml lib/gnumeric/${VERSION}/plugins/derivatives/ +lib/gnumeric/${VERSION}/plugins/derivatives/derivatives.a lib/gnumeric/${VERSION}/plugins/derivatives/derivatives.la lib/gnumeric/${VERSION}/plugins/derivatives/plugin.xml lib/gnumeric/${VERSION}/plugins/dif/ +lib/gnumeric/${VERSION}/plugins/dif/dif.a lib/gnumeric/${VERSION}/plugins/dif/dif.la lib/gnumeric/${VERSION}/plugins/dif/plugin.xml lib/gnumeric/${VERSION}/plugins/excel/ +lib/gnumeric/${VERSION}/plugins/excel/excel.a lib/gnumeric/${VERSION}/plugins/excel/excel.la lib/gnumeric/${VERSION}/plugins/excel/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-complex/ +lib/gnumeric/${VERSION}/plugins/fn-complex/plugin.a lib/gnumeric/${VERSION}/plugins/fn-complex/plugin.la lib/gnumeric/${VERSION}/plugins/fn-complex/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-database/ +lib/gnumeric/${VERSION}/plugins/fn-database/plugin.a lib/gnumeric/${VERSION}/plugins/fn-database/plugin.la lib/gnumeric/${VERSION}/plugins/fn-database/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-date/ +lib/gnumeric/${VERSION}/plugins/fn-date/plugin.a lib/gnumeric/${VERSION}/plugins/fn-date/plugin.la lib/gnumeric/${VERSION}/plugins/fn-date/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-eng/ +lib/gnumeric/${VERSION}/plugins/fn-eng/plugin.a lib/gnumeric/${VERSION}/plugins/fn-eng/plugin.la lib/gnumeric/${VERSION}/plugins/fn-eng/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-erlang/ +lib/gnumeric/${VERSION}/plugins/fn-erlang/erlang.a lib/gnumeric/${VERSION}/plugins/fn-erlang/erlang.la lib/gnumeric/${VERSION}/plugins/fn-erlang/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-financial/ +lib/gnumeric/${VERSION}/plugins/fn-financial/plugin.a lib/gnumeric/${VERSION}/plugins/fn-financial/plugin.la lib/gnumeric/${VERSION}/plugins/fn-financial/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-info/ +lib/gnumeric/${VERSION}/plugins/fn-info/plugin.a lib/gnumeric/${VERSION}/plugins/fn-info/plugin.la lib/gnumeric/${VERSION}/plugins/fn-info/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-logical/ +lib/gnumeric/${VERSION}/plugins/fn-logical/plugin.a lib/gnumeric/${VERSION}/plugins/fn-logical/plugin.la lib/gnumeric/${VERSION}/plugins/fn-logical/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-lookup/ +lib/gnumeric/${VERSION}/plugins/fn-lookup/plugin.a lib/gnumeric/${VERSION}/plugins/fn-lookup/plugin.la lib/gnumeric/${VERSION}/plugins/fn-lookup/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-math/ +lib/gnumeric/${VERSION}/plugins/fn-math/plugin.a lib/gnumeric/${VERSION}/plugins/fn-math/plugin.la lib/gnumeric/${VERSION}/plugins/fn-math/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-random/ +lib/gnumeric/${VERSION}/plugins/fn-random/plugin.a lib/gnumeric/${VERSION}/plugins/fn-random/plugin.la lib/gnumeric/${VERSION}/plugins/fn-random/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-stat/ +lib/gnumeric/${VERSION}/plugins/fn-stat/plugin.a lib/gnumeric/${VERSION}/plugins/fn-stat/plugin.la lib/gnumeric/${VERSION}/plugins/fn-stat/plugin.xml lib/gnumeric/${VERSION}/plugins/fn-string/ +lib/gnumeric/${VERSION}/plugins/fn-string/plugin.a lib/gnumeric/${VERSION}/plugins/fn-string/plugin.la lib/gnumeric/${VERSION}/plugins/fn-string/plugin.xml lib/gnumeric/${VERSION}/plugins/html/ +lib/gnumeric/${VERSION}/plugins/html/html.a lib/gnumeric/${VERSION}/plugins/html/html.la lib/gnumeric/${VERSION}/plugins/html/plugin.xml lib/gnumeric/${VERSION}/plugins/lotus/ +lib/gnumeric/${VERSION}/plugins/lotus/lotus.a lib/gnumeric/${VERSION}/plugins/lotus/lotus.la lib/gnumeric/${VERSION}/plugins/lotus/plugin.xml lib/gnumeric/${VERSION}/plugins/mps/ +lib/gnumeric/${VERSION}/plugins/mps/mps.a lib/gnumeric/${VERSION}/plugins/mps/mps.la lib/gnumeric/${VERSION}/plugins/mps/plugin.xml lib/gnumeric/${VERSION}/plugins/numtheory/ +lib/gnumeric/${VERSION}/plugins/numtheory/numtheory.a lib/gnumeric/${VERSION}/plugins/numtheory/numtheory.la lib/gnumeric/${VERSION}/plugins/numtheory/plugin.xml lib/gnumeric/${VERSION}/plugins/oleo/ +lib/gnumeric/${VERSION}/plugins/oleo/oleo.a lib/gnumeric/${VERSION}/plugins/oleo/oleo.la lib/gnumeric/${VERSION}/plugins/oleo/plugin.xml lib/gnumeric/${VERSION}/plugins/openoffice/ +lib/gnumeric/${VERSION}/plugins/openoffice/openoffice.a lib/gnumeric/${VERSION}/plugins/openoffice/openoffice.la lib/gnumeric/${VERSION}/plugins/openoffice/plugin.xml lib/gnumeric/${VERSION}/plugins/plan_perfect/ +lib/gnumeric/${VERSION}/plugins/plan_perfect/plan_perfect.a lib/gnumeric/${VERSION}/plugins/plan_perfect/plan_perfect.la lib/gnumeric/${VERSION}/plugins/plan_perfect/plugin.xml lib/gnumeric/${VERSION}/plugins/plot_barcol/ +lib/gnumeric/${VERSION}/plugins/plot_barcol/barcol.a lib/gnumeric/${VERSION}/plugins/plot_barcol/barcol.la lib/gnumeric/${VERSION}/plugins/plot_barcol/gog-barcol-prefs.glade lib/gnumeric/${VERSION}/plugins/plot_barcol/plot-types.xml @@ -92,44 +118,55 @@ lib/gnumeric/${VERSION}/plugins/plot_pie/ lib/gnumeric/${VERSION}/plugins/plot_pie/gog-pie-prefs.glade lib/gnumeric/${VERSION}/plugins/plot_pie/gog-pie-series.glade lib/gnumeric/${VERSION}/plugins/plot_pie/gog-ring-prefs.glade +lib/gnumeric/${VERSION}/plugins/plot_pie/pie.a lib/gnumeric/${VERSION}/plugins/plot_pie/pie.la lib/gnumeric/${VERSION}/plugins/plot_pie/plot-types.xml lib/gnumeric/${VERSION}/plugins/plot_pie/plugin.xml lib/gnumeric/${VERSION}/plugins/plot_radar/ lib/gnumeric/${VERSION}/plugins/plot_radar/plot-types.xml lib/gnumeric/${VERSION}/plugins/plot_radar/plugin.xml +lib/gnumeric/${VERSION}/plugins/plot_radar/radar.a lib/gnumeric/${VERSION}/plugins/plot_radar/radar.la lib/gnumeric/${VERSION}/plugins/plot_surface/ lib/gnumeric/${VERSION}/plugins/plot_surface/gog-contour-prefs.glade lib/gnumeric/${VERSION}/plugins/plot_surface/plot-types.xml lib/gnumeric/${VERSION}/plugins/plot_surface/plugin.xml +lib/gnumeric/${VERSION}/plugins/plot_surface/surface.a lib/gnumeric/${VERSION}/plugins/plot_surface/surface.la lib/gnumeric/${VERSION}/plugins/plot_xy/ lib/gnumeric/${VERSION}/plugins/plot_xy/gog-bubble-prefs.glade lib/gnumeric/${VERSION}/plugins/plot_xy/plot-types.xml lib/gnumeric/${VERSION}/plugins/plot_xy/plugin.xml +lib/gnumeric/${VERSION}/plugins/plot_xy/xy.a lib/gnumeric/${VERSION}/plugins/plot_xy/xy.la lib/gnumeric/${VERSION}/plugins/qpro/ lib/gnumeric/${VERSION}/plugins/qpro/plugin.xml +lib/gnumeric/${VERSION}/plugins/qpro/qpro.a lib/gnumeric/${VERSION}/plugins/qpro/qpro.la lib/gnumeric/${VERSION}/plugins/sample_datasource/ lib/gnumeric/${VERSION}/plugins/sample_datasource/plugin.xml +lib/gnumeric/${VERSION}/plugins/sample_datasource/sample_datasource.a lib/gnumeric/${VERSION}/plugins/sample_datasource/sample_datasource.la lib/gnumeric/${VERSION}/plugins/sc/ lib/gnumeric/${VERSION}/plugins/sc/plugin.xml +lib/gnumeric/${VERSION}/plugins/sc/sc.a lib/gnumeric/${VERSION}/plugins/sc/sc.la lib/gnumeric/${VERSION}/plugins/sylk/ lib/gnumeric/${VERSION}/plugins/sylk/plugin.xml +lib/gnumeric/${VERSION}/plugins/sylk/sylk.a lib/gnumeric/${VERSION}/plugins/sylk/sylk.la lib/gnumeric/${VERSION}/plugins/uihello/ lib/gnumeric/${VERSION}/plugins/uihello/hello.xml +lib/gnumeric/${VERSION}/plugins/uihello/plugin.a lib/gnumeric/${VERSION}/plugins/uihello/plugin.la lib/gnumeric/${VERSION}/plugins/uihello/plugin.xml lib/gnumeric/${VERSION}/plugins/xbase/ lib/gnumeric/${VERSION}/plugins/xbase/plugin.xml +lib/gnumeric/${VERSION}/plugins/xbase/xbase.a lib/gnumeric/${VERSION}/plugins/xbase/xbase.la lib/gnumeric/${VERSION}/plugins/xml_sax/ lib/gnumeric/${VERSION}/plugins/xml_sax/plugin.xml +lib/gnumeric/${VERSION}/plugins/xml_sax/xml_sax.a lib/gnumeric/${VERSION}/plugins/xml_sax/xml_sax.la @man man/man1/gnumeric.1 @man man/man1/ssconvert.1 @@ -672,8 +709,6 @@ share/locale/es/LC_MESSAGES/gnumeric.mo share/locale/et/LC_MESSAGES/gnumeric.mo share/locale/fi/LC_MESSAGES/gnumeric.mo share/locale/fr/LC_MESSAGES/gnumeric.mo -share/locale/ga/ -share/locale/ga/LC_MESSAGES/ share/locale/ga/LC_MESSAGES/gnumeric.mo share/locale/gl/LC_MESSAGES/gnumeric.mo share/locale/he/LC_MESSAGES/gnumeric.mo