r2731 - in trunk: BOOK/gnome/core BOOK/introduction/welcome patches

randy at linuxfromscratch.org randy at linuxfromscratch.org
Fri Sep 10 08:15:18 PDT 2004


Author: randy
Date: 2004-09-10 09:15:15 -0600 (Fri, 10 Sep 2004)
New Revision: 2731

Added:
   trunk/patches/gnome-terminal-2.6.1-gcc34-1.patch
Modified:
   trunk/BOOK/gnome/core/gnome-terminal.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added gcc34 patch to GNOME-Terminal to fix an LFS-6.0 build problem

Modified: trunk/BOOK/gnome/core/gnome-terminal.xml
===================================================================
--- trunk/BOOK/gnome/core/gnome-terminal.xml	2004-09-10 05:28:04 UTC (rev 2730)
+++ trunk/BOOK/gnome/core/gnome-terminal.xml	2004-09-10 15:15:15 UTC (rev 2731)
@@ -9,7 +9,6 @@
 <!ENTITY gnome-terminal-size "2.0 MB">
 <!ENTITY gnome-terminal-buildsize "26 MB">
 <!ENTITY gnome-terminal-time "0.28 SBU">
-
 ]>
 
 <sect1 id="gnome-terminal" xreflabel="GNOME Terminal-&gnome-terminal-version;">
@@ -21,10 +20,12 @@
 <title>GNOME Terminal-&gnome-terminal-version;</title>
 
 <sect2>
-<title>Introduction to <application><acronym>GNOME</acronym> Terminal</application></title>
+<title>Introduction to <application><acronym>GNOME</acronym> 
+Terminal</application></title>
 
-<para>The <application><acronym>GNOME</acronym> Terminal</application> package contains the console. This is useful
-for executing programs from a command prompt.</para>
+<para>The <application><acronym>GNOME</acronym> Terminal</application> package 
+contains the console. This is useful for executing programs from a command 
+prompt.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -39,7 +40,16 @@
 &gnome-terminal-time;</para></listitem></itemizedlist>
 </sect3>
 
-<sect3><title><application><acronym>GNOME</acronym> Terminal</application> dependencies</title>
+<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;/gnome-terminal-&gnome-terminal-version;-gcc34-1.patch"/></para>
+</listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>GNOME</acronym> Terminal</application> 
+dependencies</title>
 <sect4><title>Required</title>
 <para>
 <xref linkend="libgnomeui"/>,
@@ -55,11 +65,14 @@
 </sect2>
 
 <sect2>
-<title>Installation of <application><acronym>GNOME</acronym> Terminal</application></title>
+<title>Installation of <application><acronym>GNOME</acronym> 
+Terminal</application></title>
 
-<para>Install <application><acronym>GNOME</acronym> Terminal</application> by running the following commands:</para>
+<para>Install <application><acronym>GNOME</acronym> Terminal</application> by 
+running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
+<screen><userinput><command>patch -Np1 -i ../gnome-terminal-&gnome-terminal-version;-gcc34-1.patch &&
+./configure --prefix=`pkg-config --variable=prefix ORBit-2.0` \
     --localstatedir=/var/lib --sysconfdir=/etc/gnome &&
 make &&
 make install</command></userinput></screen>
@@ -69,13 +82,15 @@
 <sect2>
 <title>Command explanations</title>
 
-<para><parameter>--localstatedir=/var/lib</parameter>: This switch
-puts <application>ScrollKeeper</application> files in <filename
-class="directory">/var/lib/scrollkeeper</filename>
-instead of <filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
+<para><parameter>--localstatedir=/var/lib</parameter>: This switch puts 
+<application>ScrollKeeper</application> files in 
+<filename class="directory">/var/lib/scrollkeeper</filename> 
+instead of 
+<filename class="directory">$GNOME_PREFIX/var/scrollkeeper</filename>.</para>
 
 <para><parameter>--sysconfdir=/etc/gnome</parameter>: This switch
-puts configuration files in <filename class="directory">/etc/gnome</filename> instead of
+puts configuration files in <filename class="directory">/etc/gnome</filename> 
+instead of
 <filename class="directory">$GNOME_PREFIX/etc</filename>.</para>
 
 </sect2>
@@ -83,8 +98,8 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application><acronym>GNOME</acronym> Terminal</application> package contains
-<command>gnome-terminal</command>.</para>
+<para>The <application><acronym>GNOME</acronym> Terminal</application> package 
+contains <command>gnome-terminal</command>.</para>
 
 </sect2>
 
@@ -92,7 +107,8 @@
 
 <sect3><title>gnome-terminal</title>
 <para><command>gnome-terminal</command> provides the command prompt in
-the <application><acronym>GNOME</acronym></application> environment.</para></sect3>
+the <application><acronym>GNOME</acronym></application> environment.</para>
+</sect3>
 
 </sect2>
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-10 05:28:04 UTC (rev 2730)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-10 15:15:15 UTC (rev 2731)
@@ -22,6 +22,9 @@
 
 <itemizedlist>
 
+<listitem><para>September 10th, 2004 [randy]: Added gcc34 patch to 
+GNOME-Terminal to fix an LFS-6.0 build problem.</para></listitem>
+
 <listitem><para>September 10th, 2004 [randy]: Updated to 
 hdparm-5.7.</para></listitem>
 

Added: trunk/patches/gnome-terminal-2.6.1-gcc34-1.patch
===================================================================
--- trunk/patches/gnome-terminal-2.6.1-gcc34-1.patch	2004-09-10 05:28:04 UTC (rev 2730)
+++ trunk/patches/gnome-terminal-2.6.1-gcc34-1.patch	2004-09-10 15:15:15 UTC (rev 2731)
@@ -0,0 +1,27 @@
+Submitted By: Jeremy Utley (jeremy at linuxfromscratch.org)
+Date: 2004-05-20
+Initial Package Version: 2.6.0
+Upstream Status: Not Submitted
+Origin: Self Created
+Description: Fixes syntax issues with GCC 3.4
+
+$LastChangedBy$
+$Date$
+
+diff -ur gnome-terminal-2.6.0/src/eggcellrendererkeys.h 
+gnome-terminal-2.6.0.jbit/src/eggcellrendererkeys.h
+--- gnome-terminal-2.6.0/src/eggcellrendererkeys.h	2002-08-22 21:14:25.000000000 -0700
++++ gnome-terminal-2.6.0.jbit/src/eggcellrendererkeys.h	2004-04-13 13:15:43.881284633 -0700
+@@ -70,10 +70,10 @@
+ 
+ void             egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys     *keys,
+ 							 guint                    keyval,
+-							 EggVirtualModifierType   mask);
++							 GdkModifierType          mask);
+ void             egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys     *keys,
+ 							 guint                   *keyval,
+-							 EggVirtualModifierType  *mask);
++							 GdkModifierType         *mask);
+ void             egg_cell_renderer_keys_set_accel_mode  (EggCellRendererKeys     *keys,
+ 							 EggCellRendererKeysMode  accel_mode);
+ 


Property changes on: trunk/patches/gnome-terminal-2.6.1-gcc34-1.patch
___________________________________________________________________
Name: svn:keywords
   + LastChangedBy Date




More information about the blfs-book mailing list