-add patches to adapt to an API change in libgsf-1.12 (should fix build

 error noticed by Bernd Ernesti); require libgsf-1.12
-add patch for pcre security issues, from Adrian Portelli
bump PKGREVISION

21 files changed, 430 insertions, 3 deletions

diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile
index 7b8e429e722..9862d732d0c 100644
--- a/math/gnumeric14/Makefile
+++ b/math/gnumeric14/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2005/08/10 20:56:19 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/09/06 17:58:56 drochner Exp $
 #
 
 DISTNAME=		gnumeric-1.4.3
+PKGREVISION=		1
 CATEGORIES=		math gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnumeric/1.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -27,7 +28,7 @@ GCONF2_SCHEMAS=		gnumeric-dialogs.schemas gnumeric-general.schemas \
 .include "../../lang/python/application.mk"
 .include "../../databases/libgda/buildlink3.mk"
 .include "../../databases/libgnomedb/buildlink3.mk"
-BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.11.1
+BUILDLINK_DEPENDS.libgsf+=	libgsf>=1.12.2
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/atk/buildlink3.mk"
diff --git a/math/gnumeric14/distinfo b/math/gnumeric14/distinfo
index 5fabbddb597..402f604ffa6 100644
--- a/math/gnumeric14/distinfo
+++ b/math/gnumeric14/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/04/19 17:10:40 drochner Exp $
+$NetBSD: distinfo,v 1.5 2005/09/06 17:58:56 drochner Exp $
 
 SHA1 (gnumeric-1.4.3.tar.bz2) = 6c5787c1ef2929e022af2a7dca18bad92bc9041e
 RMD160 (gnumeric-1.4.3.tar.bz2) = 7ebbad9b5244c575ce575575d05ceae648de6afb
@@ -6,3 +6,22 @@ Size (gnumeric-1.4.3.tar.bz2) = 13756646 bytes
 SHA1 (patch-ab) = e5152e2e0f0dfd0f4912c1e9e34f4224fe092c6b
 SHA1 (patch-ad) = 8341c293d3b90143c802c7ec547bb42b875454d7
 SHA1 (patch-ae) = 06e61c42cadbc3d32ae4895dcd52e351ed9f9db4
+SHA1 (patch-af) = b1e6fc4387e882052889d387aff41f77e5544ab9
+SHA1 (patch-ba) = daca8b4b85ff0eddda6ad7f172655cd9c27b6e61
+SHA1 (patch-bb) = 71cf0abb793e364699eccf88d3ad35599720dbcb
+SHA1 (patch-bc) = 52a221e0c51b9df2d0103c391961af7fe38555ca
+SHA1 (patch-bd) = 48eb89888837860cb4f9582c55561231f7427609
+SHA1 (patch-be) = 87a6d7ea8b5ef4c32824160b1e82e24b14c05e92
+SHA1 (patch-bf) = 27ac904b1b9f30ce671775797c4f4b4ee0ebf9ac
+SHA1 (patch-bg) = 5b534e397a0822923d3668f7622656460b8bbc29
+SHA1 (patch-bh) = d4d59071099c1cb843e1ad2c14104e81bea9169c
+SHA1 (patch-bi) = 16838eaa7bce1a53c896717331af069ed3e16bea
+SHA1 (patch-bj) = 811dc58523d0033925752c6718db9f4159e091c7
+SHA1 (patch-bk) = 6923a4752e1adfe13a3377cbd92ccbe281640c30
+SHA1 (patch-bl) = a67e1b2cadfdf9978430ad01b9aa7c3445d97310
+SHA1 (patch-bm) = e8c52975338294d24ae34db4f0b887e3c05df1a1
+SHA1 (patch-bn) = f42ae57baff1f84f5d881c5b8c90a8b55b29fb73
+SHA1 (patch-bo) = 37ddbd6d4a805edae4d5170bb570f4a67467b4fe
+SHA1 (patch-bp) = df7599fa50229d3106fb42b42548ba4bcc191dae
+SHA1 (patch-bq) = 74cad7a3bf0f11cf806aa6e261bf24068125533d
+SHA1 (patch-br) = b9b8fa5ea42282b64bfd6c122a2e61708c336083
diff --git a/math/gnumeric14/patches/patch-af b/math/gnumeric14/patches/patch-af
new file mode 100644
index 00000000000..a5a53705015
--- /dev/null
+++ b/math/gnumeric14/patches/patch-af
@@ -0,0 +1,127 @@
+$NetBSD: patch-af,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c.orig	2005-09-05 13:51:28.000000000 +0100
++++ src/cut-n-paste-code/goffice/cut-n-paste/pcre/pcre.c
+@@ -1062,7 +1062,18 @@ read_repeat_counts(const uschar *p, int 
+ int min = 0;
+ int max = -1;
+ 
++/* Read the minimum value and do a paranoid check: a negative value indicates
++an integer overflow. */
++
+ while ((digitab[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
++if (min < 0 || min > 65535)
++  {
++  *errorptr = ERR5;
++  return p;
++  }
++
++/* Read the maximum value if there is one, and again do a paranoid on its size.
++Also, max must not be less than min. */
+ 
+ if (*p == '}') max = min; else
+   {
+@@ -1070,6 +1081,11 @@ if (*p == '}') max = min; else
+     {
+     max = 0;
+     while((digitab[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
++    if (max < 0 || max > 65535)
++      {
++      *errorptr = ERR5;
++      return p;
++      }
+     if (max < min)
+       {
+       *errorptr = ERR4;
+@@ -1078,16 +1094,11 @@ if (*p == '}') max = min; else
+     }
+   }
+ 
+-/* Do paranoid checks, then fill in the required variables, and pass back the
+-pointer to the terminating '}'. */
++/* Fill in the required variables, and pass back the pointer to the terminating
++'}'. */
+ 
+-if (min > 65535 || max > 65535)
+-  *errorptr = ERR5;
+-else
+-  {
+-  *minp = min;
+-  *maxp = max;
+-  }
++*minp = min;
++*maxp = max;
+ return p;
+ }
+ 
+@@ -4128,6 +4139,7 @@ BOOL utf8;
+ BOOL class_utf8;
+ #endif
+ BOOL inescq = FALSE;
++BOOL capturing;
+ unsigned int brastackptr = 0;
+ size_t size;
+ uschar *code;
+@@ -4543,6 +4555,7 @@ while ((c = *(++ptr)) != 0)
+     case '(':
+     branch_newextra = 0;
+     bracket_length = 1 + LINK_SIZE;
++    capturing = FALSE;
+ 
+     /* Handle special forms of bracket, which all start (? */
+ 
+@@ -4630,6 +4643,9 @@ while ((c = *(++ptr)) != 0)
+ 
+         case 'P':
+         ptr += 3;
++
++        /* Handle the definition of a named subpattern */
++
+         if (*ptr == '<')
+           {
+           const uschar *p;    /* Don't amalgamate; some compilers */
+@@ -4642,9 +4658,12 @@ while ((c = *(++ptr)) != 0)
+             }
+           name_count++;
+           if (ptr - p > max_name_size) max_name_size = (ptr - p);
++          capturing = TRUE;   /* Named parentheses are always capturing */
+           break;
+           }
+ 
++        /* Handle back references and recursive calls to named subpatterns */
++
+         if (*ptr == '=' || *ptr == '>')
+           {
+           while ((compile_block.ctypes[*(++ptr)] & ctype_word) != 0);
+@@ -4819,18 +4838,23 @@ while ((c = *(++ptr)) != 0)
+           continue;
+           }
+ 
+-        /* If options were terminated by ':' control comes here. Fall through
+-        to handle the group below. */
++        /* If options were terminated by ':' control comes here. This is a
++        non-capturing group with an options change. There is nothing more that
++        needs to be done because "capturing" is already set FALSE by default;
++        we can just fall through. */
+         }
+       }
+ 
+-    /* Extracting brackets must be counted so we can process escapes in a
+-    Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to
+-    need an additional 3 bytes of store per extracting bracket. However, if
+-    PCRE_NO_AUTO)CAPTURE is set, unadorned brackets become non-capturing, so we
+-    must leave the count alone (it will aways be zero). */
++    /* Ordinary parentheses, not followed by '?', are capturing unless
++    PCRE_NO_AUTO_CAPTURE is set. */
++
++    else capturing = (options & PCRE_NO_AUTO_CAPTURE) == 0;
++
++    /* Capturing brackets must be counted so we can process escapes in a
++    Perlish way. If the number exceeds EXTRACT_BASIC_MAX we are going to need
++    an additional 3 bytes of memory per capturing bracket. */
+ 
+-    else if ((options & PCRE_NO_AUTO_CAPTURE) == 0)
++    if (capturing)
+       {
+       bracount++;
+       if (bracount > EXTRACT_BASIC_MAX) bracket_length += 3;
diff --git a/math/gnumeric14/patches/patch-ba b/math/gnumeric14/patches/patch-ba
new file mode 100644
index 00000000000..dc0d02b2990
--- /dev/null
+++ b/math/gnumeric14/patches/patch-ba
@@ -0,0 +1,14 @@
+$NetBSD: patch-ba,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/command-context-stderr.c.orig	2005-09-06 09:49:10.000000000 +0200
++++ src/command-context-stderr.c
+@@ -106,7 +106,7 @@ ccs_gnm_cmd_context_init (GnmCmdContextC
+ 	cc_class->error.error_info	= ccs_error_info;
+ }
+ 
+-GSF_CLASS_FULL (CmdContextStderr, cmd_context_stderr,
+-		NULL, ccs_init,
++GSF_CLASS_FULL (CmdContextStderr, cmd_context_stderr, 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/gnumeric14/patches/patch-bb b/math/gnumeric14/patches/patch-bb
new file mode 100644
index 00000000000..1529a9bafc4
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bb
@@ -0,0 +1,26 @@
+$NetBSD: patch-bb,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/gnm-so-filled.c.orig	2005-09-06 09:56:08.000000000 +0200
++++ src/gnm-so-filled.c
+@@ -112,8 +112,8 @@ so_filled_foo_view_init (SheetObjectView
+ }
+ typedef FooCanvasGroup		FilledFooView;
+ typedef FooCanvasGroupClass	FilledFooViewClass;
+-static GSF_CLASS_FULL (FilledFooView, so_filled_foo_view,
+-	NULL, NULL,
++static GSF_CLASS_FULL (FilledFooView, so_filled_foo_view, NULL, NULL,
++	NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_GROUP, 0,
+ 	GSF_INTERFACE (so_filled_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */
+@@ -631,8 +631,8 @@ so_polygon_foo_view_init (SheetObjectVie
+ }
+ typedef FooCanvasPolygon	PolygonFooView;
+ typedef FooCanvasPolygonClass	PolygonFooViewClass;
+-static GSF_CLASS_FULL (PolygonFooView, so_polygon_foo_view,
+-	NULL, NULL,
++static GSF_CLASS_FULL (PolygonFooView, so_polygon_foo_view, 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/gnumeric14/patches/patch-bc b/math/gnumeric14/patches/patch-bc
new file mode 100644
index 00000000000..fa9f4559e92
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bc
@@ -0,0 +1,15 @@
+$NetBSD: patch-bc,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/gnm-so-line.c.orig	2005-09-06 09:57:50.000000000 +0200
++++ src/gnm-so-line.c
+@@ -110,8 +110,8 @@ so_line_foo_view_init (SheetObjectViewIf
+ }
+ typedef FooCanvasLine		LineFooView;
+ typedef FooCanvasLineClass	LineFooViewClass;
+-static GSF_CLASS_FULL (LineFooView, so_line_foo_view,
+-	NULL, NULL,
++static GSF_CLASS_FULL (LineFooView, so_line_foo_view, 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/gnumeric14/patches/patch-bd b/math/gnumeric14/patches/patch-bd
new file mode 100644
index 00000000000..8627c0fcff4
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bd
@@ -0,0 +1,15 @@
+$NetBSD: patch-bd,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/io-context-gtk.c.orig	2005-09-06 11:17:07.000000000 +0200
++++ src/io-context-gtk.c
+@@ -366,8 +366,8 @@ icg_init (IOContextGtk *icg)
+ 	g_timer_start (icg->timer);
+ }
+ 
+-GSF_CLASS_FULL (IOContextGtk, io_context_gtk,
+-		icg_class_init, icg_init,
++GSF_CLASS_FULL (IOContextGtk, io_context_gtk, NULL, NULL,
++		icg_class_init, NULL, icg_init,
+ 		TYPE_IO_CONTEXT, 0,
+ 		GSF_INTERFACE (icg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+ 
diff --git a/math/gnumeric14/patches/patch-be b/math/gnumeric14/patches/patch-be
new file mode 100644
index 00000000000..305e5c5325e
--- /dev/null
+++ b/math/gnumeric14/patches/patch-be
@@ -0,0 +1,15 @@
+$NetBSD: patch-be,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/io-context.c.orig	2005-09-06 09:50:26.000000000 +0200
++++ src/io-context.c
+@@ -116,8 +116,8 @@ io_context_class_init (GObjectClass *kla
+ 	klass->finalize = ioc_finalize;
+ }
+ 
+-GSF_CLASS_FULL (IOContext, io_context,
+-		io_context_class_init, io_context_init,
++GSF_CLASS_FULL (IOContext, io_context, 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))
+ 
diff --git a/math/gnumeric14/patches/patch-bf b/math/gnumeric14/patches/patch-bf
new file mode 100644
index 00000000000..d84ac01fcc9
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bf
@@ -0,0 +1,15 @@
+$NetBSD: patch-bf,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/sheet-filter.c.orig	2005-09-06 09:53:07.000000000 +0200
++++ src/sheet-filter.c
+@@ -562,8 +562,8 @@ filter_foo_view_init (SheetObjectViewIfa
+ }
+ typedef FooCanvasWidget		FilterFooView;
+ typedef FooCanvasWidgetClass	FilterFooViewClass;
+-static GSF_CLASS_FULL (FilterFooView, filter_foo_view,
+-	NULL, NULL,
++static GSF_CLASS_FULL (FilterFooView, filter_foo_view, NULL, NULL,
++	NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_WIDGET, 0,
+ 	GSF_INTERFACE (filter_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ 
diff --git a/math/gnumeric14/patches/patch-bg b/math/gnumeric14/patches/patch-bg
new file mode 100644
index 00000000000..05d81a8bf08
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bg
@@ -0,0 +1,15 @@
+$NetBSD: patch-bg,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/sheet-object-cell-comment.c.orig	2005-09-06 09:54:47.000000000 +0200
++++ src/sheet-object-cell-comment.c
+@@ -122,8 +122,8 @@ comment_foo_view_init (SheetObjectViewIf
+ }
+ typedef FooCanvasPolygon	CommentFooView;
+ typedef FooCanvasPolygonClass	CommentFooViewClass;
+-static GSF_CLASS_FULL (CommentFooView, comment_foo_view,
+-	NULL, NULL,
++static GSF_CLASS_FULL (CommentFooView, comment_foo_view, NULL, NULL,
++	NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_POLYGON, 0,
+ 	GSF_INTERFACE (comment_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ 
diff --git a/math/gnumeric14/patches/patch-bh b/math/gnumeric14/patches/patch-bh
new file mode 100644
index 00000000000..a7c7bfdb4de
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bh
@@ -0,0 +1,15 @@
+$NetBSD: patch-bh,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/sheet-object-graph.c.orig	2005-09-06 09:59:22.000000000 +0200
++++ src/sheet-object-graph.c
+@@ -93,8 +93,8 @@ so_graph_foo_view_init (SheetObjectViewI
+ }
+ typedef GogControlFooCanvas		SOGraphFooView;
+ typedef GogControlFooCanvasClass	SOGraphFooViewClass;
+-static GSF_CLASS_FULL (SOGraphFooView, so_graph_foo_view,
+-	NULL, NULL,
++static GSF_CLASS_FULL (SOGraphFooView, so_graph_foo_view, 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/gnumeric14/patches/patch-bi b/math/gnumeric14/patches/patch-bi
new file mode 100644
index 00000000000..0ed156b4c85
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bi
@@ -0,0 +1,15 @@
+$NetBSD: patch-bi,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/sheet-object-image.c.orig	2005-09-06 10:00:36.000000000 +0200
++++ src/sheet-object-image.c
+@@ -89,8 +89,8 @@ so_image_foo_view_init (SheetObjectViewI
+ }
+ typedef FooCanvasPixbuf		SOImageFooView;
+ typedef FooCanvasPixbufClass	SOImageFooViewClass;
+-static GSF_CLASS_FULL (SOImageFooView, so_image_foo_view,
+-	NULL, NULL,
++static GSF_CLASS_FULL (SOImageFooView, so_image_foo_view, 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/gnumeric14/patches/patch-bj b/math/gnumeric14/patches/patch-bj
new file mode 100644
index 00000000000..d000d60b258
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bj
@@ -0,0 +1,15 @@
+$NetBSD: patch-bj,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/sheet-object-widget.c.orig	2005-09-06 10:01:40.000000000 +0200
++++ src/sheet-object-widget.c
+@@ -98,8 +98,8 @@ so_widget_foo_view_init (SheetObjectView
+ }
+ typedef FooCanvasWidget		SOWidgetFooView;
+ typedef FooCanvasWidgetClass	SOWidgetFooViewClass;
+-static GSF_CLASS_FULL (SOWidgetFooView, so_widget_foo_view,
+-	NULL, NULL,
++static GSF_CLASS_FULL (SOWidgetFooView, so_widget_foo_view, 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/gnumeric14/patches/patch-bk b/math/gnumeric14/patches/patch-bk
new file mode 100644
index 00000000000..89ce7549065
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bk
@@ -0,0 +1,15 @@
+$NetBSD: patch-bk,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/workbook-control-gui.c.orig	2005-09-06 11:15:18.000000000 +0200
++++ src/workbook-control-gui.c
+@@ -2544,8 +2544,8 @@ workbook_control_gui_init (WorkbookContr
+ 	wbcg->current_saver = NULL;
+ }
+ 
+-GSF_CLASS_FULL (WorkbookControlGUI, workbook_control_gui,
+-		workbook_control_gui_class_init, workbook_control_gui_init,
++GSF_CLASS_FULL (WorkbookControlGUI, workbook_control_gui, 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/gnumeric14/patches/patch-bl b/math/gnumeric14/patches/patch-bl
new file mode 100644
index 00000000000..3d8e46c426f
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bl
@@ -0,0 +1,15 @@
+$NetBSD: patch-bl,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/widgets/gnumeric-expr-entry.c.orig	2005-09-06 09:47:22.000000000 +0200
++++ src/widgets/gnumeric-expr-entry.c
+@@ -502,8 +502,8 @@ gee_cell_editable_init (GtkCellEditableI
+ 	iface->start_editing = gee_start_editing;
+ }
+ 
+-GSF_CLASS_FULL (GnmExprEntry, gnm_expr_entry,
+-		gee_class_init, gee_init,
++GSF_CLASS_FULL (GnmExprEntry, gnm_expr_entry, 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/gnumeric14/patches/patch-bm b/math/gnumeric14/patches/patch-bm
new file mode 100644
index 00000000000..b20c1f33940
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bm
@@ -0,0 +1,15 @@
+$NetBSD: patch-bm,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/cut-n-paste-code/goffice/graph/gog-axis.c.orig	2005-09-06 09:34:41.000000000 +0200
++++ src/cut-n-paste-code/goffice/graph/gog-axis.c
+@@ -1677,8 +1677,8 @@ gog_axis_dataset_init (GogDatasetClass *
+ 	iface->dim_changed = gog_axis_dim_changed;
+ }
+ 
+-GSF_CLASS_FULL (GogAxis, gog_axis,
+-		gog_axis_class_init, gog_axis_init,
++GSF_CLASS_FULL (GogAxis, gog_axis, 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/gnumeric14/patches/patch-bn b/math/gnumeric14/patches/patch-bn
new file mode 100644
index 00000000000..55eaafc170b
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bn
@@ -0,0 +1,15 @@
+$NetBSD: patch-bn,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/cut-n-paste-code/goffice/graph/gog-error-bar.c.orig	2005-09-06 09:42:47.000000000 +0200
++++ src/cut-n-paste-code/goffice/graph/gog-error-bar.c
+@@ -487,8 +487,8 @@ gog_error_bar_persist_init (GogPersistCl
+ 	iface->sax_save = gog_error_bar_persist_sax_save;
+ }
+ 
+-GSF_CLASS_FULL (GogErrorBar, gog_error_bar,
+-		gog_error_bar_class_init, gog_error_bar_init,
++GSF_CLASS_FULL (GogErrorBar, gog_error_bar, 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/gnumeric14/patches/patch-bo b/math/gnumeric14/patches/patch-bo
new file mode 100644
index 00000000000..7c81b91b997
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bo
@@ -0,0 +1,15 @@
+$NetBSD: patch-bo,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/cut-n-paste-code/goffice/graph/gog-label.c.orig	2005-09-06 09:37:48.000000000 +0200
++++ src/cut-n-paste-code/goffice/graph/gog-label.c
+@@ -175,8 +175,8 @@ gog_label_dataset_init (GogDatasetClass 
+ 	iface->dim_changed = gog_label_dim_changed;
+ }
+ 
+-GSF_CLASS_FULL (GogLabel, gog_label,
+-		gog_label_class_init, NULL,
++GSF_CLASS_FULL (GogLabel, gog_label, NULL, NULL,
++		gog_label_class_init, NULL, NULL,
+ 		GOG_OUTLINED_OBJECT_TYPE, 0,
+ 		GSF_INTERFACE (gog_label_dataset_init, GOG_DATASET_TYPE))
+ 
diff --git a/math/gnumeric14/patches/patch-bp b/math/gnumeric14/patches/patch-bp
new file mode 100644
index 00000000000..7711404686f
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bp
@@ -0,0 +1,15 @@
+$NetBSD: patch-bp,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/cut-n-paste-code/goffice/graph/gog-series.c.orig	2005-09-06 09:41:25.000000000 +0200
++++ src/cut-n-paste-code/goffice/graph/gog-series.c
+@@ -588,8 +588,8 @@ gog_series_dataset_init (GogDatasetClass
+ 	iface->dim_changed = gog_series_dataset_dim_changed;
+ }
+ 
+-GSF_CLASS_FULL (GogSeries, gog_series,
+-		gog_series_class_init, gog_series_init,
++GSF_CLASS_FULL (GogSeries, gog_series, 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/gnumeric14/patches/patch-bq b/math/gnumeric14/patches/patch-bq
new file mode 100644
index 00000000000..12d1a9b2c00
--- /dev/null
+++ b/math/gnumeric14/patches/patch-bq
@@ -0,0 +1,15 @@
+$NetBSD: patch-bq,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- src/cut-n-paste-code/goffice/graph/gog-style.c.orig	2005-09-06 09:39:24.000000000 +0200
++++ src/cut-n-paste-code/goffice/graph/gog-style.c
+@@ -1686,8 +1686,8 @@ gog_style_persist_init (GogPersistClass 
+ 	iface->sax_save = gog_style_persist_sax_save;
+ }
+ 
+-GSF_CLASS_FULL (GogStyle, gog_style,
+-		gog_style_class_init, gog_style_init,
++GSF_CLASS_FULL (GogStyle, gog_style, NULL, NULL,
++		gog_style_class_init, NULL, gog_style_init,
+ 		G_TYPE_OBJECT, 0,
+ 		GSF_INTERFACE (gog_style_persist_init, GOG_PERSIST_TYPE))
+ 
diff --git a/math/gnumeric14/patches/patch-br b/math/gnumeric14/patches/patch-br
new file mode 100644
index 00000000000..a1d88632cdb
--- /dev/null
+++ b/math/gnumeric14/patches/patch-br
@@ -0,0 +1,15 @@
+$NetBSD: patch-br,v 1.1 2005/09/06 17:58:56 drochner Exp $
+
+--- plugins/corba/corba-workbook.c.orig	2005-09-06 11:23:24.000000000 +0200
++++ plugins/corba/corba-workbook.c
+@@ -312,8 +312,8 @@ wbcc_init (WorkbookControlCORBA *wbcc)
+ 	CORBA_exception_free (&ev);
+ }
+ 
+-GSF_CLASS_FULL (WorkbookControlCORBA, workbook_control_corba,
+-		wbcc_class_init, wbcc_init, 
++GSF_CLASS_FULL (WorkbookControlCORBA, workbook_control_corba, NULL, NULL,
++		wbcc_class_init, NULL, wbcc_init, 
+ 		WORKBOOK_CONTROL_TYPE, 0,
+ 		GSF_INTERFACE (wbcc_gnm_cmd_context_init,
+ 			       GNM_CMD_CONTEXT_TYPE))