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

randy at linuxfromscratch.org randy at linuxfromscratch.org
Tue Sep 7 11:50:30 PDT 2004


Author: randy
Date: 2004-09-07 12:50:28 -0600 (Tue, 07 Sep 2004)
New Revision: 2722

Added:
   trunk/patches/gtkhtml-1.1.7-gcc34-1.patch
Modified:
   trunk/BOOK/gnome/otherlibs/gtkhtml1.xml
   trunk/BOOK/gnome/otherlibs/otherlibs.xml
   trunk/BOOK/introduction/welcome/changelog.xml
Log:
Added optional dependencies and gcc34 patch to GtkHTML-1.1.7

Modified: trunk/BOOK/gnome/otherlibs/gtkhtml1.xml
===================================================================
--- trunk/BOOK/gnome/otherlibs/gtkhtml1.xml	2004-09-07 16:51:58 UTC (rev 2721)
+++ trunk/BOOK/gnome/otherlibs/gtkhtml1.xml	2004-09-07 18:50:28 UTC (rev 2722)
@@ -21,10 +21,12 @@
 <title>GtkHTML-&gtkhtml1-version;</title>
 
 <sect2>
-<title>Introduction to <application><acronym>Gtk</acronym><acronym>HTML</acronym></application></title>
+<title>Introduction to <application><acronym>Gtk</acronym><acronym>HTML</acronym></application>
+</title>
 
-<para>The <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> package contains a lightweight
-<acronym>HTML</acronym> rendering/printing/editing engine.</para>
+<para>The <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> 
+package contains a lightweight <acronym>HTML</acronym> 
+rendering/printing/editing engine.</para>
 
 <sect3><title>Package information</title>
 <itemizedlist spacing='compact'>
@@ -39,23 +41,42 @@
 &gtkhtml1-time;</para></listitem></itemizedlist>
 </sect3>
                                                                                 
-<sect3><title><application><acronym>Gtk</acronym><acronym>HTML</acronym></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;/gtkhtml-&gtkhtml1-version;-gcc34-1.patch"/></para></listitem>
+</itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>Gtk</acronym><acronym>HTML</acronym></application> 
+dependencies</title>
+
 <sect4><title>Required</title>
-<para><xref linkend="GConf1"/>, <xref linkend="gal1"/>, <xref
-linkend ="libglade14"/> and <xref linkend="libcapplet"/></para></sect4>
+<para><xref linkend="GConf1"/>, 
+<xref linkend="gal1"/>, 
+<xref linkend ="libglade14"/> and 
+<xref linkend="libcapplet"/></para></sect4>
+
 <sect4><title>Optional</title>
-<para><xref linkend="soup"/></para></sect4>
+<para><xref linkend="soup"/>, 
+<xref linkend="bonobo14"/>, 
+<xref linkend="libghttp"/>, 
+<xref linkend="gtk-doc"/></para></sect4>
 </sect3>
 
 </sect2>
 
 <sect2>
-<title>Installation of <application><acronym>Gtk</acronym><acronym>HTML</acronym></application></title>
+<title>Installation of 
+<application><acronym>Gtk</acronym><acronym>HTML</acronym></application></title>
 
-<para>Install <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> by running the following 
-commands:</para>
+<para>Install 
+<application><acronym>Gtk</acronym><acronym>HTML</acronym></application> by 
+running the following commands:</para>
 
-<screen><userinput><command>./configure --prefix=/opt/gnome --disable-gtk-doc &&
+<screen><userinput><command>patch -Np1 -i ../gtkhtml-&gtkhtml1-version;-gcc34-1.patch &&
+./configure --prefix=/opt/gnome --disable-gtk-doc &&
 make &&
 make install</command></userinput></screen>
 
@@ -65,7 +86,7 @@
 <title>Command explanations</title>
 
 <para><parameter>--prefix=/opt/gnome</parameter>: Install
-<application><acronym>GTK</acronym> <acronym>HTML</acronym></application> in the
+<application><acronym>Gtk</acronym><acronym>HTML</acronym></application> in the 
 <application><acronym>GNOME</acronym></application> 1.4 directory
 structure.</para>
 
@@ -74,8 +95,9 @@
 <sect2>
 <title>Contents</title>
 
-<para>The <application><acronym>Gtk</acronym><acronym>HTML</acronym></application> package contains the
-<application><acronym>GNOME</acronym></application> 1.4 
+<para>The 
+<application><acronym>Gtk</acronym><acronym>HTML</acronym></application> 
+package contains the <application><acronym>GNOME</acronym></application> 1.4 
 <acronym>HTML</acronym> rendering engine.</para>
 
 </sect2>

Modified: trunk/BOOK/gnome/otherlibs/otherlibs.xml
===================================================================
--- trunk/BOOK/gnome/otherlibs/otherlibs.xml	2004-09-07 16:51:58 UTC (rev 2721)
+++ trunk/BOOK/gnome/otherlibs/otherlibs.xml	2004-09-07 18:50:28 UTC (rev 2722)
@@ -31,7 +31,7 @@
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="guppi.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libcapplet.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="soup.xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libghttp.xml"/>
 <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="gtkhtml1.xml"/>
-<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="libghttp.xml"/>
 
 </chapter>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2004-09-07 16:51:58 UTC (rev 2721)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2004-09-07 18:50:28 UTC (rev 2722)
@@ -23,7 +23,7 @@
 <itemizedlist>
 
 <listitem><para>September 7th, 2004 [randy]: Added optional dependencies 
-and a gcc34 patch to Soup instructions.</para></listitem>
+and a gcc34 patch to Soup and GtkHTML-1.1.7 instructions.</para></listitem>
 
 <listitem><para>September 7th, 2004 [randy]: Added gcc34 patch to Guppi 
 instructions to fix a GCC-3.4.x related build issue.</para></listitem>

Added: trunk/patches/gtkhtml-1.1.7-gcc34-1.patch
===================================================================
--- trunk/patches/gtkhtml-1.1.7-gcc34-1.patch	2004-09-07 16:51:58 UTC (rev 2721)
+++ trunk/patches/gtkhtml-1.1.7-gcc34-1.patch	2004-09-07 18:50:28 UTC (rev 2722)
@@ -0,0 +1,22 @@
+Submitted By: Jeremy Utley (jeremy at linuxfromscratch.org)
+Date: 2004-05-20
+Initial Package Version: 1.1.7
+Upstream Status: Not Submitted
+Origin: Self Created
+Description: Fixes syntax issues with GCC 3.4
+
+$LastChangedBy$
+$Date$
+
+diff -aur gtkhtml-1.1.7/components/html-editor/popup.c 
+gtkhtml-1.1.7-new/components/html-editor/popup.c
+--- gtkhtml-1.1.7/components/html-editor/popup.c	2002-10-02 10:11:34.000000000 -0700
++++ gtkhtml-1.1.7-new/components/html-editor/popup.c	2004-04-13 14:46:26.853482876 -0700
+@@ -500,6 +500,7 @@
+ 			ADD_PROP (TABLE);
+ 			ADD_ITEM (_("Table..."), prop_dialog, TABLE);
+ 		default:
++		break;
+ 		}
+ 		if (obj->parent && obj->parent->parent && HTML_IS_TABLE_CELL (obj->parent->parent)) {
+ 			if (cd->format_html) {


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




More information about the blfs-book mailing list