Ticket #1589: gnumeric-1.4.3-libgsf.patch

File gnumeric-1.4.3-libgsf.patch, 11.3 KB (added by hugo@…, 19 years ago)

This patch updates gnumeric to the new GSF_CLASS_FULL signature of libgsf

  • plugins/corba/corba-workbook.c 

    Submitted By: Hugo Villeneuve
Date: 2005-09-19
Initial Package Version: 1.4.3
Origin: http://mail-index.netbsd.org/tech-pkg/2005/09/05/0001.html
Description: Updated to new GSF_CLASS_FULL signature

diff -Naur gnumeric-1.4.3-orig/plugins/corba/corba-workbook.c gnumeric-1.4.3-patched/plugins/corba/corba-workbook.c
    old new  
    313313}
    314314
    315315GSF_CLASS_FULL (WorkbookControlCORBA, workbook_control_corba,
    316                 wbcc_class_init, wbcc_init,
    317                 WORKBOOK_CONTROL_TYPE, 0,
     316                NULL, NULL,wbcc_class_init, NULL,
     317                wbcc_init, WORKBOOK_CONTROL_TYPE, 0,
    318318                GSF_INTERFACE (wbcc_gnm_cmd_context_init,
    319319                               GNM_CMD_CONTEXT_TYPE))
    320320

  • src/command-context-stderr.c 

    diff -Naur gnumeric-1.4.3-orig/src/command-context-stderr.c gnumeric-1.4.3-patched/src/command-context-stderr.c
    old new  
    107107}
    108108
    109109GSF_CLASS_FULL (CmdContextStderr, cmd_context_stderr,
    110                 NULL, ccs_init,
    111                 G_TYPE_OBJECT, 0,
     110                NULL, NULL, NULL, NULL,
     111                ccs_init, G_TYPE_OBJECT, 0,
    112112                GSF_INTERFACE (ccs_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))

  • src/cut-n-paste-code/goffice/graph/gog-axis.c 

    diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-axis.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-axis.c
    old new  
    16781678}
    16791679
    16801680GSF_CLASS_FULL (GogAxis, gog_axis,
    1681                 gog_axis_class_init, gog_axis_init,
    1682                 GOG_STYLED_OBJECT_TYPE, 0,
     1681                NULL, NULL, gog_axis_class_init, NULL,
     1682                gog_axis_init, GOG_STYLED_OBJECT_TYPE, 0,
    16831683                GSF_INTERFACE (gog_axis_dataset_init, GOG_DATASET_TYPE))
    16841684
    16851685

  • src/cut-n-paste-code/goffice/graph/gog-error-bar.c 

    diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-error-bar.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-error-bar.c
    old new  
    488488}
    489489
    490490GSF_CLASS_FULL (GogErrorBar, gog_error_bar,
    491                 gog_error_bar_class_init, gog_error_bar_init,
    492                 G_TYPE_OBJECT, 0,
     491                NULL, NULL, gog_error_bar_class_init, NULL,
     492                gog_error_bar_init, G_TYPE_OBJECT, 0,
    493493                GSF_INTERFACE (gog_error_bar_persist_init, GOG_PERSIST_TYPE))
    494494
    495495

  • src/cut-n-paste-code/goffice/graph/gog-label.c 

    diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-label.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-label.c
    old new  
    176176}
    177177
    178178GSF_CLASS_FULL (GogLabel, gog_label,
    179                 gog_label_class_init, NULL,
    180                 GOG_OUTLINED_OBJECT_TYPE, 0,
     179                NULL, NULL, gog_label_class_init, NULL,
     180                NULL, GOG_STYLED_OBJECT_TYPE, 0,
    181181                GSF_INTERFACE (gog_label_dataset_init, GOG_DATASET_TYPE))
    182182
    183183/************************************************************************/

  • src/cut-n-paste-code/goffice/graph/gog-series.c 

    diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-series.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-series.c
    old new  
    589589}
    590590
    591591GSF_CLASS_FULL (GogSeries, gog_series,
    592                 gog_series_class_init, gog_series_init,
    593                 GOG_STYLED_OBJECT_TYPE, 0,
     592                NULL, NULL, gog_series_class_init, NULL,
     593                gog_series_init, GOG_STYLED_OBJECT_TYPE, 0,
    594594                GSF_INTERFACE (gog_series_dataset_init, GOG_DATASET_TYPE))
    595595
    596596/**

  • src/cut-n-paste-code/goffice/graph/gog-style.c 

    diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-style.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-style.c
    old new  
    16871687}
    16881688
    16891689GSF_CLASS_FULL (GogStyle, gog_style,
    1690                 gog_style_class_init, gog_style_init,
    1691                 G_TYPE_OBJECT, 0,
     1690                NULL, NULL, gog_style_class_init, NULL,
     1691                gog_style_init, G_TYPE_OBJECT, 0,
    16921692                GSF_INTERFACE (gog_style_persist_init, GOG_PERSIST_TYPE))
    16931693
    16941694gboolean

  • src/gnm-so-filled.c 

    diff -Naur gnumeric-1.4.3-orig/src/gnm-so-filled.c gnumeric-1.4.3-patched/src/gnm-so-filled.c
    old new  
    113113typedef FooCanvasGroup          FilledFooView;
    114114typedef FooCanvasGroupClass     FilledFooViewClass;
    115115static GSF_CLASS_FULL (FilledFooView, so_filled_foo_view,
    116         NULL, NULL,
     116        NULL, NULL, NULL, NULL, NULL,
    117117        FOO_TYPE_CANVAS_GROUP, 0,
    118118        GSF_INTERFACE (so_filled_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
    119119#endif /* WITH_GTK */
    … …  
    632632typedef FooCanvasPolygon        PolygonFooView;
    633633typedef FooCanvasPolygonClass   PolygonFooViewClass;
    634634static GSF_CLASS_FULL (PolygonFooView, so_polygon_foo_view,
    635         NULL, NULL,
     635        NULL, NULL, NULL, NULL, NULL,
    636636        FOO_TYPE_CANVAS_POLYGON, 0,
    637637        GSF_INTERFACE (so_polygon_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
    638638#endif /* WITH_GTK */

  • src/gnm-so-line.c 

    diff -Naur gnumeric-1.4.3-orig/src/gnm-so-line.c gnumeric-1.4.3-patched/src/gnm-so-line.c
    old new  
    111111typedef FooCanvasLine           LineFooView;
    112112typedef FooCanvasLineClass      LineFooViewClass;
    113113static GSF_CLASS_FULL (LineFooView, so_line_foo_view,
    114         NULL, NULL,
     114        NULL, NULL,NULL, NULL,NULL,
    115115        FOO_TYPE_CANVAS_LINE, 0,
    116116        GSF_INTERFACE (so_line_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
    117117#endif /* WITH_GTK */

  • src/io-context-gtk.c 

    diff -Naur gnumeric-1.4.3-orig/src/io-context-gtk.c gnumeric-1.4.3-patched/src/io-context-gtk.c
    old new  
    367367}
    368368
    369369GSF_CLASS_FULL (IOContextGtk, io_context_gtk,
    370                 icg_class_init, icg_init,
    371                 TYPE_IO_CONTEXT, 0,
     370                NULL, NULL, icg_class_init, NULL,
     371                icg_init, TYPE_IO_CONTEXT, 0,
    372372                GSF_INTERFACE (icg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
    373373
    374374void

  • src/io-context.c 

    diff -Naur gnumeric-1.4.3-orig/src/io-context.c gnumeric-1.4.3-patched/src/io-context.c
    old new  
    117117}
    118118
    119119GSF_CLASS_FULL (IOContext, io_context,
    120                 io_context_class_init, io_context_init,
    121                 G_TYPE_OBJECT, 0,
     120                NULL,NULL,io_context_class_init,NULL,
     121                io_context_init,G_TYPE_OBJECT, 0,
    122122                GSF_INTERFACE (io_context_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
    123123
    124124IOContext *

  • src/sheet-filter.c 

    diff -Naur gnumeric-1.4.3-orig/src/sheet-filter.c gnumeric-1.4.3-patched/src/sheet-filter.c
    old new  
    563563typedef FooCanvasWidget         FilterFooView;
    564564typedef FooCanvasWidgetClass    FilterFooViewClass;
    565565static GSF_CLASS_FULL (FilterFooView, filter_foo_view,
    566         NULL, NULL,
     566        NULL, NULL, NULL, NULL, NULL,
    567567        FOO_TYPE_CANVAS_WIDGET, 0,
    568568        GSF_INTERFACE (filter_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
    569569

  • src/sheet-object-cell-comment.c 

    diff -Naur gnumeric-1.4.3-orig/src/sheet-object-cell-comment.c gnumeric-1.4.3-patched/src/sheet-object-cell-comment.c
    old new  
    123123typedef FooCanvasPolygon        CommentFooView;
    124124typedef FooCanvasPolygonClass   CommentFooViewClass;
    125125static GSF_CLASS_FULL (CommentFooView, comment_foo_view,
    126         NULL, NULL,
     126        NULL, NULL,NULL,NULL,NULL,
    127127        FOO_TYPE_CANVAS_POLYGON, 0,
    128128        GSF_INTERFACE (comment_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
    129129

  • src/sheet-object-graph.c 

    diff -Naur gnumeric-1.4.3-orig/src/sheet-object-graph.c gnumeric-1.4.3-patched/src/sheet-object-graph.c
    old new  
    9494typedef GogControlFooCanvas             SOGraphFooView;
    9595typedef GogControlFooCanvasClass        SOGraphFooViewClass;
    9696static GSF_CLASS_FULL (SOGraphFooView, so_graph_foo_view,
    97         NULL, NULL,
     97        NULL, NULL, NULL, NULL, NULL,
    9898        GOG_CONTROL_FOOCANVAS_TYPE, 0,
    9999        GSF_INTERFACE (so_graph_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
    100100

  • src/sheet-object-image.c 

    diff -Naur gnumeric-1.4.3-orig/src/sheet-object-image.c gnumeric-1.4.3-patched/src/sheet-object-image.c
    old new  
    9090typedef FooCanvasPixbuf         SOImageFooView;
    9191typedef FooCanvasPixbufClass    SOImageFooViewClass;
    9292static GSF_CLASS_FULL (SOImageFooView, so_image_foo_view,
    93         NULL, NULL,
     93        NULL, NULL, NULL, NULL, NULL,
    9494        FOO_TYPE_CANVAS_PIXBUF, 0,
    9595        GSF_INTERFACE (so_image_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
    9696

  • src/sheet-object-widget.c 

    diff -Naur gnumeric-1.4.3-orig/src/sheet-object-widget.c gnumeric-1.4.3-patched/src/sheet-object-widget.c
    old new  
    9999typedef FooCanvasWidget         SOWidgetFooView;
    100100typedef FooCanvasWidgetClass    SOWidgetFooViewClass;
    101101static GSF_CLASS_FULL (SOWidgetFooView, so_widget_foo_view,
    102         NULL, NULL,
     102        NULL, NULL, NULL, NULL, NULL,
    103103        FOO_TYPE_CANVAS_WIDGET, 0,
    104104        GSF_INTERFACE (so_widget_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
    105105

  • src/widgets/gnumeric-expr-entry.c 

    diff -Naur gnumeric-1.4.3-orig/src/widgets/gnumeric-expr-entry.c gnumeric-1.4.3-patched/src/widgets/gnumeric-expr-entry.c
    old new  
    503503}
    504504
    505505GSF_CLASS_FULL (GnmExprEntry, gnm_expr_entry,
    506                 gee_class_init, gee_init,
    507                 GTK_TYPE_HBOX, 0,
     506                NULL, NULL, gee_class_init, NULL,
     507                gee_init, GTK_TYPE_HBOX, 0,
    508508                GSF_INTERFACE (gee_cell_editable_init, GTK_TYPE_CELL_EDITABLE))
    509509
    510510/**

  • src/workbook-control-gui.c 

    diff -Naur gnumeric-1.4.3-orig/src/workbook-control-gui.c gnumeric-1.4.3-patched/src/workbook-control-gui.c
    old new  
    25452545}
    25462546
    25472547GSF_CLASS_FULL (WorkbookControlGUI, workbook_control_gui,
    2548                 workbook_control_gui_class_init, workbook_control_gui_init,
    2549                 WORKBOOK_CONTROL_TYPE, G_TYPE_FLAG_ABSTRACT,
     2548                NULL,NULL,workbook_control_gui_class_init,NULL,
     2549                workbook_control_gui_init,WORKBOOK_CONTROL_TYPE, G_TYPE_FLAG_ABSTRACT,
    25502550                GSF_INTERFACE (wbcg_go_plot_data_allocator_init, GOG_DATA_ALLOCATOR_TYPE);
    25512551                GSF_INTERFACE (wbcg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
    25522552