r2719 - in trunk: BOOK BOOK/gnome/otherlibs BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Mon Sep 6 23:17:25 PDT 2004


Author: randy
Date: 2004-09-07 00:17:23 -0600 (Tue, 07 Sep 2004)
New Revision: 2719

Added:
   trunk/patches/Guppi-0.40.3-gcc34-1.patch
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/gnome/otherlibs/guppi.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added gcc34 patch to Guppi instructions to fix GCC-3.4.x related build issue

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2004-09-07 03:59:30 UTC (rev 2718)
+++ trunk/BOOK/general.ent	2004-09-07 06:17:23 UTC (rev 2719)
@@ -1,4 +1,4 @@
-<!ENTITY day          "06">
+<!ENTITY day          "07">
 <!ENTITY month        "09">
 <!ENTITY year         "2004">
 <!ENTITY version      "svn-&year;&month;&day;">

Modified: trunk/BOOK/gnome/otherlibs/guppi.xml
===================================================================
--- trunk/BOOK/gnome/otherlibs/guppi.xml	2004-09-07 03:59:30 UTC (rev 2718)
+++ trunk/BOOK/gnome/otherlibs/guppi.xml	2004-09-07 06:17:23 UTC (rev 2719)
@@ -9,7 +9,6 @@
 <!ENTITY guppi-size "1.0 MB">
 <!ENTITY guppi-buildsize "89.2 MB">
 <!ENTITY guppi-time "1.83 SBU">
-
 ]>
 
 <sect1 id="guppi" xreflabel="Guppi-&guppi-version;">
@@ -40,11 +39,21 @@
 &guppi-time;</para></listitem></itemizedlist>
 </sect3>
 
+<sect3><title>Additional downloads</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Required Patch (if compiled with
+<application><acronym>GCC</acronym></application>-3.4.x): <ulink
+url="&patch-root;/Guppi-&guppi-version;-gcc34-1.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
 <sect3><title><application>Guppi</application> dependencies</title>
 <sect4><title>Required</title>
 <para><xref linkend="bonobo14"/> and <xref linkend="gal1"/></para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="libglade14"/></para></sect4>
+<para><xref linkend="gnome-libs"/>, 
+<xref linkend="libglade14"/> and 
+<xref linkend="docbook-utils"/></para></sect4>
 </sect3>
 
 </sect2>
@@ -55,7 +64,8 @@
 <para>Install <application>Guppi</application> by running the following 
 commands:</para>
 
-<screen><userinput><command>./configure --prefix=/opt/gnome &&
+<screen><userinput><command>patch -Np1 -i ../Guppi-&guppi-version;-gcc34-1.patch &&
+./configure --prefix=/opt/gnome &&
 make &&
 make install</command></userinput></screen>
 
@@ -64,8 +74,8 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><parameter>--prefix=/opt/gnome</parameter>: Install <application>Guppi
-</application> in the
+<para><parameter>--prefix=/opt/gnome</parameter>: Install 
+<application>Guppi</application> in the
 <application><acronym>GNOME</acronym></application> 1.4 directory
 structure.</para>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-07 03:59:30 UTC (rev 2718)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-07 06:17:23 UTC (rev 2719)
@@ -23,7 +23,8 @@
 <itemizedlist>
 
 <listitem><para>September 6th, 2004 [randy]: Updated to 
-Nmap-3.70 and Gnumeric 1.2.13.</para></listitem>
+Nmap-3.70 and Gnumeric 1.2.13; added gcc34 patch to Guppi instructions 
+to fix a GCC-3.4.x related build issue.</para></listitem>
 
 <listitem><para>September 5th, 2004 [randy]: Added optional dependencies 
 and build/functionality fix patches to transcode instructions; updated

Added: trunk/patches/Guppi-0.40.3-gcc34-1.patch
===================================================================
--- trunk/patches/Guppi-0.40.3-gcc34-1.patch	2004-09-07 03:59:30 UTC (rev 2718)
+++ trunk/patches/Guppi-0.40.3-gcc34-1.patch	2004-09-07 06:17:23 UTC (rev 2719)
@@ -0,0 +1,93 @@
+Submitted By: Jeremy Utley (jeremy at linuxfromscratch.org)
+Date: 2004-05-20
+Initial Package Version: 0.40.3
+Upstream Status: Not Submitted
+Origin: Self Created
+Description: Fixes syntax issues with GCC 3.4
+
+$LastChangedBy$
+$Date$
+
+diff -aur Guppi-0.40.3/libguppitank/guppi-object-barchart.c 
+Guppi-0.40.3-new/libguppitank/guppi-object-barchart.c
+--- Guppi-0.40.3/libguppitank/guppi-object-barchart.c	2002-01-07 22:28:53.000000000 -0800
++++ Guppi-0.40.3-new/libguppitank/guppi-object-barchart.c	2004-04-13 15:00:04.587307405 -0700
+@@ -701,6 +701,7 @@
+     break;
+ 
+   default:
++  break;
+   }
+ }
+ 
+@@ -733,6 +734,7 @@
+     break;
+ 
+   default:
++  break;
+   }
+ }
+ 
+diff -aur Guppi-0.40.3/src/demo.c Guppi-0.40.3-new/src/demo.c
+--- Guppi-0.40.3/src/demo.c	2002-01-07 22:28:57.000000000 -0800
++++ Guppi-0.40.3-new/src/demo.c	2004-04-13 14:58:41.413566037 -0700
+@@ -451,6 +451,7 @@
+     compass_pos = GUPPI_NORTH;
+     break;
+   default:
++  break;
+   }
+ 
+   guppi_element_state_set (state,
+diff -aur Guppi-0.40.3/src/libguppiplot/guppi-layout-constraint.c Guppi-0.40.3-new/src/libguppiplot/guppi-layout-constraint.c
+--- Guppi-0.40.3/src/libguppiplot/guppi-layout-constraint.c	2002-01-18 18:45:21.000000000 -0800
++++ Guppi-0.40.3-new/src/libguppiplot/guppi-layout-constraint.c	2004-04-13 14:57:20.328315976 -0700
+@@ -165,6 +165,7 @@
+ 
+   default:
+     /* Fall through, do nothing. */
++  break;
+   }
+ 
+   ti = term_info_new (type, factor, geom);
+diff -aur Guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c Guppi-0.40.3-new/src/libguppiplot/guppi-root-group-item.c
+--- Guppi-0.40.3/src/libguppiplot/guppi-root-group-item.c	2002-01-07 22:31:08.000000000 -0800
++++ Guppi-0.40.3-new/src/libguppiplot/guppi-root-group-item.c	2004-04-13 14:58:00.977415073 -0700
+@@ -548,6 +548,7 @@
+     return motion_notify_event (root, &(ev->motion));
+ 
+   default:
++  break;
+   }
+ 
+   return FALSE;
+@@ -777,6 +778,7 @@
+   case ROOT_GROUP_RESIZE_NONE:
+   default:
+     /* insure we do nothing */
++  break;
+   }
+ 
+   if (please_resize_canvas)
+diff -aur Guppi-0.40.3/src/libguppiplot/guppi-text-block.c Guppi-0.40.3-new/src/libguppiplot/guppi-text-block.c
+--- Guppi-0.40.3/src/libguppiplot/guppi-text-block.c	2001-11-26 12:00:17.000000000 -0800
++++ Guppi-0.40.3-new/src/libguppiplot/guppi-text-block.c	2004-04-13 14:56:55.358397900 -0700
+@@ -900,6 +900,7 @@
+ 
+     default:
+       /* Do nothing. */
++    break;
+     }
+ 
+     render_stack_evolve (stack, tt);
+diff -aur Guppi-0.40.3/src/libguppiplot/guppi-view-interval.c Guppi-0.40.3-new/src/libguppiplot/guppi-view-interval.c
+--- Guppi-0.40.3/src/libguppiplot/guppi-view-interval.c	2002-01-18 18:45:21.000000000 -0800
++++ Guppi-0.40.3-new/src/libguppiplot/guppi-view-interval.c	2004-04-13 14:56:16.518858049 -0700
+@@ -227,6 +227,7 @@
+ #endif
+ 
+   default:
++  break;
+   }
+ 
+   return TRUE;


Property changes on: trunk/patches/Guppi-0.40.3-gcc34-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list