r5115 - in trunk: BOOK BOOK/introduction/welcome BOOK/xsoft/office patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Sun Sep 25 11:12:58 PDT 2005


Author: randy
Date: 2005-09-25 12:12:55 -0600 (Sun, 25 Sep 2005)
New Revision: 5115

Added:
   trunk/patches/gnumeric-1.4.3-libgsf-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/office/gnumeric.xml
Log:
Added a patch to fix a build problem with newer versions of libgsf and added a sed command so the default is to build the Perl plugin module to the Gnumeric instructions

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2005-09-22 05:11:12 UTC (rev 5114)
+++ trunk/BOOK/general.ent	2005-09-25 18:12:55 UTC (rev 5115)
@@ -1,8 +1,8 @@
-<!ENTITY day          "22">
+<!ENTITY day          "25">
 <!ENTITY month        "09">
 <!ENTITY year         "2005">
 <!ENTITY version      "svn-&year;&month;&day;">
-<!ENTITY releasedate  "September &day;nd, &year;">
+<!ENTITY releasedate  "September &day;th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- version|stable|testing|unstable|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2005-09-22 05:11:12 UTC (rev 5114)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2005-09-25 18:12:55 UTC (rev 5115)
@@ -42,6 +42,17 @@
 -->
 
     <listitem>
+      <para>September 25th, 2005</para>
+      <itemizedlist>
+        <listitem>
+          <para>[Randy] - Added a patch to fix a build problem with newer
+          versions of libgsf and added a sed command so the default is to
+          build the Perl plugin module to the Gnumeric instructions.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>September 22nd, 2005</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/xsoft/office/gnumeric.xml
===================================================================
--- trunk/BOOK/xsoft/office/gnumeric.xml	2005-09-22 05:11:12 UTC (rev 5114)
+++ trunk/BOOK/xsoft/office/gnumeric.xml	2005-09-25 18:12:55 UTC (rev 5115)
@@ -8,8 +8,8 @@
   <!ENTITY gnumeric-download-ftp  "ftp://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.4/gnumeric-&gnumeric-version;.tar.bz2">
   <!ENTITY gnumeric-md5sum        "b684eec48b1696d7a8d7152d1e17741c">
   <!ENTITY gnumeric-size          "13.7 MB">
-  <!ENTITY gnumeric-buildsize     "216 MB">
-  <!ENTITY gnumeric-time          "2.4 SBU">
+  <!ENTITY gnumeric-buildsize     "223 MB">
+  <!ENTITY gnumeric-time          "2.5 SBU">
 ]>
 
 <sect1 id="gnumeric" xreflabel="Gnumeric-&gnumeric-version;">
@@ -54,6 +54,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem> 
+        <para>Required patch: <ulink
+        url="&patch-root;/gnumeric-&gnumeric-version;-libgsf-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Gnumeric Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -83,7 +91,9 @@
     <para>Install <application>Gnumeric</application> by running the following
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --without-gnome \
+<screen><userinput>sed -i 's/perl_msg=no/perl_msg="yes"/' configure &&
+patch -Np1 -i ../gnumeric-&gnumeric-version;-libgsf-1.patch &&
+./configure --prefix=/usr --without-gnome \
     --localstatedir=/var/lib --sysconfdir=/etc/gnome &&
 make</userinput></screen>
 
@@ -105,6 +115,13 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><command>sed -i 's/perl_msg=no/perl_msg="yes"/' configure</command>:
+    A default LFS installation includes the <application>Perl</application>
+    package and the <application>Perl</application> discovery used by the
+    <command>configure</command> script does not work properly. This command
+    changes the default to build the <application>Perl</application> plugin
+    module.</para>
+
     <para><parameter>--without-gnome</parameter>: This switch prevents the
     build from looking for the <application>GNOME</application> session
     related components. Remove this switch if you have a

Added: trunk/patches/gnumeric-1.4.3-libgsf-1.patch
===================================================================
--- trunk/patches/gnumeric-1.4.3-libgsf-1.patch	2005-09-22 05:11:12 UTC (rev 5114)
+++ trunk/patches/gnumeric-1.4.3-libgsf-1.patch	2005-09-25 18:12:55 UTC (rev 5115)
@@ -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$
+$Date$
+
+
+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))
+ 


Property changes on: trunk/patches/gnumeric-1.4.3-libgsf-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list