Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/app-office/gnumeric
diff options
context:
space:
mode:
Diffstat (limited to 'app-office/gnumeric')
-rw-r--r--app-office/gnumeric/ChangeLog10
-rw-r--r--app-office/gnumeric/files/digest-gnumeric-1.4.3-r22
-rw-r--r--app-office/gnumeric/files/digest-gnumeric-1.4.3-r32
-rw-r--r--app-office/gnumeric/files/digest-gnumeric-1.6.32
-rw-r--r--app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch256
-rw-r--r--app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch25
-rw-r--r--app-office/gnumeric/gnumeric-1.4.3-r3.ebuild16
7 files changed, 306 insertions, 7 deletions
diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index e21353b4159d..015e728888ca 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for app-office/gnumeric
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.127 2006/07/12 16:21:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.128 2006/07/14 16:46:23 allanonjl Exp $
+
+ 14 Jul 2006; John N. Laliberte <allanonjl@gentoo.org>
+ +files/gnumeric-1.4.3-libgsf-1.patch,
+ +files/gnumeric-1.4.3-remove-deprecated.patch, gnumeric-1.4.3-r3.ebuild:
+ add patch to fix GSF_CLASS_FULL. thanks to Eric Anderson <ejona86@gmail.com>
+ for finding it. add another patch to get rid of the deprecation defines.
+ bump dep on libgsf to make sure we use the version with the patched number
+ of args. fixes #131151
12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
gnumeric-1.4.3-r3.ebuild:
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.4.3-r2 b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r2
index b63fff8bda02..d9dd7012fb6f 100644
--- a/app-office/gnumeric/files/digest-gnumeric-1.4.3-r2
+++ b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r2
@@ -1 +1,3 @@
MD5 b684eec48b1696d7a8d7152d1e17741c gnumeric-1.4.3.tar.bz2 13756646
+RMD160 7ebbad9b5244c575ce575575d05ceae648de6afb gnumeric-1.4.3.tar.bz2 13756646
+SHA256 0da4852462ea4c5e9494b37d4beea2a93f97efca1f09a02c07332fa1ff20fed6 gnumeric-1.4.3.tar.bz2 13756646
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.4.3-r3 b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r3
index b63fff8bda02..d9dd7012fb6f 100644
--- a/app-office/gnumeric/files/digest-gnumeric-1.4.3-r3
+++ b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r3
@@ -1 +1,3 @@
MD5 b684eec48b1696d7a8d7152d1e17741c gnumeric-1.4.3.tar.bz2 13756646
+RMD160 7ebbad9b5244c575ce575575d05ceae648de6afb gnumeric-1.4.3.tar.bz2 13756646
+SHA256 0da4852462ea4c5e9494b37d4beea2a93f97efca1f09a02c07332fa1ff20fed6 gnumeric-1.4.3.tar.bz2 13756646
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.6.3 b/app-office/gnumeric/files/digest-gnumeric-1.6.3
index c48f284e86a1..3dd53c592777 100644
--- a/app-office/gnumeric/files/digest-gnumeric-1.6.3
+++ b/app-office/gnumeric/files/digest-gnumeric-1.6.3
@@ -1 +1,3 @@
MD5 78ffd75ae6abc3bb20dd04407a082a26 gnumeric-1.6.3.tar.bz2 12540950
+RMD160 49be3b72070555ab6b58f1c59a0c22819b9b9096 gnumeric-1.6.3.tar.bz2 12540950
+SHA256 badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0 gnumeric-1.6.3.tar.bz2 12540950
diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch b/app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch
new file mode 100644
index 000000000000..3092d2d29620
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch
@@ -0,0 +1,256 @@
+Submitted By: Hugo Villeneuve
+Date: 2005-09-19
+Initial Package Version: 1.4.3
+Upstream Status: Unknown
+Origin: http://mail-index.netbsd.org/tech-pkg/2005/09/05/0001.html
+Description: Updated to new GSF_CLASS_FULL signature
+
+$LastChangedBy: randy $
+$Date: 2006/07/14 16:46:23 $
+
+
+diff -Naur gnumeric-1.4.3-orig/plugins/corba/corba-workbook.c gnumeric-1.4.3-patched/plugins/corba/corba-workbook.c
+--- gnumeric-1.4.3-orig/plugins/corba/corba-workbook.c 2004-09-24 16:35:15.000000000 -0400
++++ gnumeric-1.4.3-patched/plugins/corba/corba-workbook.c 2005-09-19 00:44:06.889772528 -0400
+@@ -313,8 +313,8 @@
+ }
+
+ 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 -Naur gnumeric-1.4.3-orig/src/command-context-stderr.c gnumeric-1.4.3-patched/src/command-context-stderr.c
+--- gnumeric-1.4.3-orig/src/command-context-stderr.c 2004-06-13 14:48:34.000000000 -0400
++++ gnumeric-1.4.3-patched/src/command-context-stderr.c 2005-09-19 00:44:06.891772224 -0400
+@@ -107,6 +107,6 @@
+ }
+
+ 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 -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
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-axis.c 2005-02-09 16:54:29.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-axis.c 2005-09-19 00:44:06.896771464 -0400
+@@ -1678,8 +1678,8 @@
+ }
+
+ 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 -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
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-error-bar.c 2004-12-02 08:57:26.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-error-bar.c 2005-09-19 00:44:06.899771008 -0400
+@@ -488,8 +488,8 @@
+ }
+
+ 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 -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
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-label.c 2004-10-25 16:36:05.000000000 -0400
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-label.c 2005-09-19 00:44:06.901770704 -0400
+@@ -176,8 +176,8 @@
+ }
+
+ 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 -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
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-series.c 2005-01-05 13:05:53.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-series.c 2005-09-19 00:44:06.904770248 -0400
+@@ -589,8 +589,8 @@
+ }
+
+ 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 -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
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-style.c 2004-11-19 10:49:12.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-style.c 2005-09-19 00:44:06.908769640 -0400
+@@ -1687,8 +1687,8 @@
+ }
+
+ 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 -Naur gnumeric-1.4.3-orig/src/gnm-so-filled.c gnumeric-1.4.3-patched/src/gnm-so-filled.c
+--- gnumeric-1.4.3-orig/src/gnm-so-filled.c 2004-10-16 22:36:05.000000000 -0400
++++ gnumeric-1.4.3-patched/src/gnm-so-filled.c 2005-09-19 00:44:06.911769184 -0400
+@@ -113,7 +113,7 @@
+ 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 @@
+ 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 -Naur gnumeric-1.4.3-orig/src/gnm-so-line.c gnumeric-1.4.3-patched/src/gnm-so-line.c
+--- gnumeric-1.4.3-orig/src/gnm-so-line.c 2004-11-30 13:37:07.000000000 -0500
++++ gnumeric-1.4.3-patched/src/gnm-so-line.c 2005-09-19 00:44:06.913768880 -0400
+@@ -111,7 +111,7 @@
+ 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 -Naur gnumeric-1.4.3-orig/src/io-context-gtk.c gnumeric-1.4.3-patched/src/io-context-gtk.c
+--- gnumeric-1.4.3-orig/src/io-context-gtk.c 2004-10-29 23:51:35.000000000 -0400
++++ gnumeric-1.4.3-patched/src/io-context-gtk.c 2005-09-19 00:44:06.915768576 -0400
+@@ -367,8 +367,8 @@
+ }
+
+ 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 -Naur gnumeric-1.4.3-orig/src/io-context.c gnumeric-1.4.3-patched/src/io-context.c
+--- gnumeric-1.4.3-orig/src/io-context.c 2004-07-19 20:37:13.000000000 -0400
++++ gnumeric-1.4.3-patched/src/io-context.c 2005-09-19 00:44:06.917768272 -0400
+@@ -117,8 +117,8 @@
+ }
+
+ 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 -Naur gnumeric-1.4.3-orig/src/sheet-filter.c gnumeric-1.4.3-patched/src/sheet-filter.c
+--- gnumeric-1.4.3-orig/src/sheet-filter.c 2004-10-16 22:36:05.000000000 -0400
++++ gnumeric-1.4.3-patched/src/sheet-filter.c 2005-09-19 00:44:06.920767816 -0400
+@@ -563,7 +563,7 @@
+ 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 -Naur gnumeric-1.4.3-orig/src/sheet-object-cell-comment.c gnumeric-1.4.3-patched/src/sheet-object-cell-comment.c
+--- gnumeric-1.4.3-orig/src/sheet-object-cell-comment.c 2005-01-14 00:48:29.000000000 -0500
++++ gnumeric-1.4.3-patched/src/sheet-object-cell-comment.c 2005-09-19 00:44:06.922767512 -0400
+@@ -123,7 +123,7 @@
+ 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 -Naur gnumeric-1.4.3-orig/src/sheet-object-graph.c gnumeric-1.4.3-patched/src/sheet-object-graph.c
+--- gnumeric-1.4.3-orig/src/sheet-object-graph.c 2004-10-29 00:13:13.000000000 -0400
++++ gnumeric-1.4.3-patched/src/sheet-object-graph.c 2005-09-19 00:44:06.925767056 -0400
+@@ -94,7 +94,7 @@
+ 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 -Naur gnumeric-1.4.3-orig/src/sheet-object-image.c gnumeric-1.4.3-patched/src/sheet-object-image.c
+--- gnumeric-1.4.3-orig/src/sheet-object-image.c 2004-12-17 23:48:37.000000000 -0500
++++ gnumeric-1.4.3-patched/src/sheet-object-image.c 2005-09-19 00:44:06.929766448 -0400
+@@ -90,7 +90,7 @@
+ 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 -Naur gnumeric-1.4.3-orig/src/sheet-object-widget.c gnumeric-1.4.3-patched/src/sheet-object-widget.c
+--- gnumeric-1.4.3-orig/src/sheet-object-widget.c 2005-02-09 16:54:29.000000000 -0500
++++ gnumeric-1.4.3-patched/src/sheet-object-widget.c 2005-09-19 00:44:06.933765840 -0400
+@@ -99,7 +99,7 @@
+ 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 -Naur gnumeric-1.4.3-orig/src/widgets/gnumeric-expr-entry.c gnumeric-1.4.3-patched/src/widgets/gnumeric-expr-entry.c
+--- gnumeric-1.4.3-orig/src/widgets/gnumeric-expr-entry.c 2004-09-07 15:28:41.000000000 -0400
++++ gnumeric-1.4.3-patched/src/widgets/gnumeric-expr-entry.c 2005-09-19 00:44:06.937765232 -0400
+@@ -503,8 +503,8 @@
+ }
+
+ 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 -Naur gnumeric-1.4.3-orig/src/workbook-control-gui.c gnumeric-1.4.3-patched/src/workbook-control-gui.c
+--- gnumeric-1.4.3-orig/src/workbook-control-gui.c 2005-03-12 19:05:45.000000000 -0500
++++ gnumeric-1.4.3-patched/src/workbook-control-gui.c 2005-09-19 00:44:06.943764320 -0400
+@@ -2545,8 +2545,8 @@
+ }
+
+ 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/app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch b/app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch
new file mode 100644
index 000000000000..a465628656b4
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch
@@ -0,0 +1,25 @@
+--- gnumeric-1.4.3/configure.in 2005-01-26 09:56:45.000000000 -0500
++++ gnumeric-1.4.3.new/configure.in 2006-07-14 11:57:47.000000000 -0400
+@@ -192,22 +192,6 @@
+ GNUMERIC_PLUGIN_LDFLAGS="-avoid-version $GNUMERIC_PLUGIN_LDFLAGS"
+ AC_SUBST(GNUMERIC_PLUGIN_LDFLAGS)
+
+-dnl disable for in stable release, re-enable for development series
+-CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
+-CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
+-if test "x$gnumeric_with_gtk" = "xtrue"; then
+- CFLAGS="$CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED"
+- CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED"
+- CFLAGS="$CFLAGS -DGDK_MULTIHEAD_SAFE"
+- CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
+- CFLAGS="$CFLAGS -DLIBGLADE_DISABLE_DEPRECATED"
+-fi
+-if test "x$gnumeric_with_gnome" = "xtrue"; then
+- CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED"
+- CFLAGS="$CFLAGS -DBONOBO_DISABLE_DEPRECATED"
+- CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED"
+-fi
+-
+ dnl ==============================================
+ dnl GNOME Specific extensions
+ with_corba=false
diff --git a/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild b/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild
index 642c2234eb10..ba464b077a3a 100644
--- a/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild
+++ b/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild
@@ -1,8 +1,8 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild,v 1.2 2006/07/12 16:21:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild,v 1.3 2006/07/14 16:46:23 allanonjl Exp $
-inherit virtualx eutils flag-o-matic gnome2
+inherit virtualx eutils flag-o-matic gnome2 autotools
DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
@@ -15,7 +15,7 @@ IUSE="gnome libgda python static"
# bonobo gnomedb
RDEPEND=">=dev-libs/glib-2.4
- >=gnome-extra/libgsf-1.12
+ >=gnome-extra/libgsf-1.12.2
>=dev-libs/libxml2-2.4.12
>=x11-libs/pango-1.4
@@ -44,8 +44,6 @@ DEPEND="${RDEPEND}
app-text/scrollkeeper"
DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
-USE_DESTDIR="1"
-
pkg_setup() {
if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
@@ -71,7 +69,13 @@ src_unpack() {
# Backported patch to fix a potential integer overflow (bug #104010)
epatch ${FILESDIR}/${P}-pcre_int_overflow.patch
- automake || die
+ # fix for MACRO problem with newer libgsf
+ epatch "${FILESDIR}"/${PN}-1.4.3-libgsf-1.patch
+
+ # blow away deprecated things
+ epatch "${FILESDIR}"/${P}-remove-deprecated.patch
+
+ eautoreconf
}
src_compile() {