Index: general.ent
===================================================================
--- general.ent	(revision a2d546f5aee28e700c68169feba49cf4a74f7098)
+++ general.ent	(revision 2dfcd1d9145405656f7189b43ea4ed22eb5e293f)
@@ -378,5 +378,5 @@
 <!-- Chapter 34 -->    
 <!ENTITY koffice-version              "1.3.2">  
-<!ENTITY openoffice-version           "1.1.2"> 
+<!ENTITY openoffice-version           "1.1.3"> 
 
 <!-- Chapter 35 -->        
Index: general/prog/gcc3.xml
===================================================================
--- general/prog/gcc3.xml	(revision a2d546f5aee28e700c68169feba49cf4a74f7098)
+++ general/prog/gcc3.xml	(revision 2dfcd1d9145405656f7189b43ea4ed22eb5e293f)
@@ -42,6 +42,11 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
+
 <listitem><para>Required Patch: <ulink 
 url="&patch-root;/gcc-&gcc3-version;-no_fixincludes-1.patch"/></para></listitem>
+
+<listitem><para>Required Patch: <ulink
+url="&patch-root;/gcc-&gcc3-version;-linkonce-1.patch"/></para></listitem>
+
 </itemizedlist>
 </sect3>
@@ -54,5 +59,6 @@
 <para>Apply the patches:</para>
 
-<screen><userinput><command>patch -Np1 -i ../gcc-&gcc3-version;-no_fixincludes-1.patch</command></userinput></screen>
+<screen><userinput><command>patch -Np1 -i ../gcc-&gcc3-version;-no_fixincludes-1.patch &amp;&amp;
+patch -Np1 -i ../gcc-&gcc3-version;-linkonce-1.patch </command></userinput></screen>
 
 <para>The <acronym>GCC</acronym> development team recommends building in a 
Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision a2d546f5aee28e700c68169feba49cf4a74f7098)
+++ introduction/welcome/changelog.xml	(revision 2dfcd1d9145405656f7189b43ea4ed22eb5e293f)
@@ -22,4 +22,7 @@
 
 <itemizedlist>
+
+<listitem><para>December 19th, 2004 [dj]: Added gcc-3.3.3-linkonce patch
+and updated to OpenOffice-1.1.3 and associated patches.</para></listitem>
 
 <listitem><para>December 19th, 2004 [randy]: Updated FontConfig HTTP 
Index: xsoft/suites/openoffice.xml
===================================================================
--- xsoft/suites/openoffice.xml	(revision a2d546f5aee28e700c68169feba49cf4a74f7098)
+++ xsoft/suites/openoffice.xml	(revision 2dfcd1d9145405656f7189b43ea4ed22eb5e293f)
@@ -6,6 +6,6 @@
 
   <!ENTITY openoffice-download-http "http://download.openoffice.org/&openoffice-version;/source.html">
-  <!ENTITY openoffice-download-ftp  "ftp://ftp.ussg.iu.edu/pub/openoffice/stable/1.1.2/OOo_&openoffice-version;_source.tar.gz">
-  <!ENTITY openoffice-size          "221 MB">
+  <!ENTITY openoffice-download-ftp "ftp://ftp.ussg.iu.edu/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;-1_source.tar.gz">
+  <!ENTITY openoffice-size          "205 MB">
   <!ENTITY openoffice-buildsize     "5.8 GB">
   <!ENTITY openoffice-time          "81 SBU">
@@ -43,22 +43,38 @@
 <sect3><title>Additional downloads</title>
 <itemizedlist spacing='compact'>
+
 <listitem><para>Required patch (Executable <command>test</command> is in
 <filename class="directory">/bin</filename>,
 not in <filename class="directory">/usr/bin</filename>): <ulink
 url="&patch-root;/openoffice-&openoffice-version;-test_bin_loc-1.patch"/></para></listitem>
-<listitem><para>Required patch if Linux-<acronym>PAM</acronym>-&Linux_PAM-version; 
-is not installed: <ulink
-url="&patch-root;/openoffice-&openoffice-version;-no_pam-1.patch"/></para></listitem>
+
+<listitem><para>Required patch to use system freetype: <ulink
+url="&patch-root;/openoffice-&openoffice-version;-freetype-1.patch"/></para>
+</listitem>
+
+<listitem><para>Required patch if 
+Linux-<acronym>PAM</acronym>-&Linux_PAM-version; is not installed: <ulink
+url="&patch-root;/openoffice-&openoffice-version;-no_pam-1.patch"/></para>
+</listitem>
+
 <listitem><para>Required patch if compiling with 
 <acronym>JDK</acronym>-&j2sdk-src-version;: <ulink
-url="&patch-root;/openoffice-&openoffice-version;-jdk_&j2sdk-src-version;_fix-1.patch"/></para></listitem>
-<listitem><para>Recommended patch: <ulink
-url="&patch-root;/openoffice-&openoffice-version;-domainname-1.patch"/></para></listitem>
+url="&patch-root;/openoffice-&openoffice-version;-jdk_&j2sdk-src-version;_fix-1.patch"/></para>
+</listitem>
+
+<listitem><para>Required patch for gcc-3.3.3: <ulink 
+url="&patch-root;/openoffice-&openoffice-version;-gcc33-1.patch"/></para>
+</listitem>
+
 <listitem><para>General Polygon Clipper Library (Optional if 
 libart_lgpl-&libart_lgpl-version; is used): <ulink
-url="ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"/></para></listitem>
+url="ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"/></para>
+</listitem>
+
 <listitem><para>The source <acronym>TAR</acronym> ball only contains English 
 language help. A localized help content file may be available at: <ulink
-url="http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/"/>.</para></listitem>
+url="http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/"/>.</para>
+</listitem>
+
 </itemizedlist>
 </sect3>
@@ -67,8 +83,10 @@
 <sect4><title>Required</title>
 <para>X (<xref linkend="xfree86"/> or <xref linkend="xorg"/>), 
+<xref linkend="freetype2"/>, 
 <xref linkend="zip"/>, 
 <xref linkend="unzip"/>, 
-<xref linkend="tcsh"/> and 
-<xref linkend="which"/></para>
+<xref linkend="tcsh"/>, 
+<xref linkend="which"/> and 
+<xref linkend="gcc3"/></para>
 </sect4>
 
@@ -80,6 +98,7 @@
 <para><xref linkend="Linux_PAM"/>, 
 <xref linkend="libart_lgpl"/>, 
-<xref linkend="startup-notification"/> and 
-<xref linkend="apache-ant"/></para>
+<xref linkend="startup-notification"/>, 
+<xref linkend="apache-ant"/> and 
+<xref linkend="curl"/></para>
 </sect4>
 </sect3>
@@ -93,8 +112,21 @@
 files:</para>
 
-<screen><userinput><command>mv ../gpc231/* external/gpc &amp;&amp;
-for p in ../openoffice-&openoffice-version;-*.patch
-  do patch -Np1 -i $p
+<screen><userinput><command>tar -zxf ../gpc231.tar.Z &amp;&amp;
+mv gpc231/* external/gpc &amp;&amp;
+rmdir gpc231 &amp;&amp;
+for patch in ../openoffice-&openoffice-version;-*.patch
+  do patch -Np1 -i $patch
   done</command></userinput></screen>
+
+<para>STLport looks for the c++ headers in the wrong location.  Put a
+temporary symlink in place to satisfy STLport:</para>
+
+<screen><userinput><command>ln -sf /opt/gcc-3.3.3/include/c++/3.3.3 /usr/g++-v3</command></userinput></screen>
+
+<para>OpenOffice fails to build with gcc-3.4.1.  Set your path to
+include gcc-3.3.3.</para>
+
+<screen><userinput><command>export PATH_HOLD=$PATH &amp;&amp;
+export PATH=/opt/gcc-3.3.3/bin:$PATH</command></userinput></screen>
 
 <para>If you want to optimize the build, edit
@@ -109,25 +141,28 @@
 
 <para>Configure <application>OpenOffice</application> using the following 
-commands. You may build install sets for only specific languages based on your 
-preferences. If a particular component is not available in the language of your 
-choice, the default will be English. The following option compiles all 
-available languages. If you restrict the languages, be sure to add 
-<parameter>ENUS</parameter> to the list; otherwise the build fails. Also, the 
-build fails when the environment variable <envar>LANG</envar> is set. Unset it 
-before compiling.</para>
+commands. You may build install sets for specific languages based on your 
+preferences. Supply a comma separated list to the <envar>--with-lang=</envar> 
+switch.  If a particular component is not available in the language of your 
+choice, the default will be English. If you need other languages, be sure to 
+add <parameter>ENUS</parameter> to the list; otherwise the build will 
+fail.</para>
 
 <screen><userinput><command>cd config_office/ &amp;&amp;
-./configure --with-lang=ALL \
-    --with-dict=ALL --without-fonts \
-    --enable-libsn --with-system-zlib &amp;&amp;
+./configure --with-lang=ENUS \
+    --with-dict=ENUS --without-fonts \
+    --enable-libsn --with-system-zlib \
+    --with-system-freetype &amp;&amp;
 cd ..</command></userinput></screen>
+
+<para><application>OpenOffice</application> fails to compile if 
+<command>umask</command> is set to something exotic. The build can also
+fial if the <envar>LANG</envar> or <envar>LC_ALL</envar> evvironment
+variables are set.</para>
+
+<screen><userinput><command>umask 0022 &amp;&amp;
+unset LANG LC_ALL</command></userinput></screen>
 
 <para>Compile <application>OpenOffice</application> using the following
 commands:</para>
-
-<note><para><application>OpenOffice</application> fails to compile if 
-<command>umask</command> is set to something exotic. Set 
-<command>umask 0022</command> if you normally set it to 
-something else.</para></note>
 
 <screen><userinput><command>./bootstrap &amp;&amp;
@@ -139,5 +174,5 @@
 
 <screen><userinput><command>cd solver/645/unxlngi4.pro/pck &amp;&amp;
-for i in $(ls ../../../../../helpcontent_*_unix.tgz)
+for i in ../../../../../helpcontent_*_unix.tgz
   do tar -xvzf $i
   done &amp;&amp;
@@ -149,9 +184,6 @@
 <para>Install <application>OpenOffice</application> using the following
 commands to install the English language set. To install a localized version,
-replace the 01 with the international telephone country code for your country.
-Note that when installing, <application>OpenOffice</application> needs an
-<application>X</application> display, even though there is no visible
-<application>X</application> window. You can use <command>Xvfb</command> if 
-you are compiling on a console.</para>
+replace the 01 with the international telephone country code for your 
+country.</para>
 
 <screen><userinput><command>cd instsetoo/unxlngi4.pro/01/normal &amp;&amp;
@@ -165,4 +197,9 @@
 </sect2>
 
+<para>Finally, return your environment to it's original state:</para>
+
+<screen><userinput><command>export PATH=$PATH_HOLD &amp;&amp;
+rm -f /usr/g++-v3</command></userinput></screen>
+
 <sect2>
 <title>Command explanations</title>
@@ -172,9 +209,9 @@
 appropriate location.</para>
 
-<para><parameter>--with-lang=ALL</parameter>: Make install sets for all 
-available languages.</para>
-
-<para><parameter>--with-dict=ALL</parameter>: Install dictionaries for all 
-available languages.</para>
+<para><parameter>--with-lang=ENUS</parameter>: Make install set for the
+US English language.</para>
+
+<para><parameter>--with-dict=ENUS</parameter>: Install dictionaries for
+the US English language.</para>
 
 <para><parameter>--enable-libart</parameter>: Use libart instead of gpc for 
@@ -192,4 +229,7 @@
 <para><parameter>--without-fonts</parameter>: Do not install Bitstream Vera 
 fonts since they are already bundled with <application>X</application>.</para>
+
+<para><parameter>--with-system-curl</parameter>: Use the system
+installed curl.</para>
 
 <para><command>./bootstrap</command>: Create packages required to bootstrap 
