cvs commit: BLFS/BOOK/xsoft/suites/openoffice openoffice-exp.xml openoffice-inst.xml openoffice-intro.xml openoffice.ent

tushar at linuxfromscratch.org tushar at linuxfromscratch.org
Sat Apr 24 14:52:52 PDT 2004


tushar      04/04/24 15:52:52

  Modified:    BOOK/introduction/welcome changelog.xml
               BOOK/xsoft/suites/openoffice openoffice-exp.xml
                        openoffice-inst.xml openoffice-intro.xml
                        openoffice.ent
  Log:
  Update to openoffice-1.1.1
  
  Revision  Changes    Path
  1.1087    +3 -0      BLFS/BOOK/introduction/welcome/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/changelog.xml,v
  retrieving revision 1.1086
  retrieving revision 1.1087
  diff -u -u -r1.1086 -r1.1087
  --- changelog.xml	24 Apr 2004 18:38:52 -0000	1.1086
  +++ changelog.xml	24 Apr 2004 21:52:50 -0000	1.1087
  @@ -11,6 +11,9 @@
   
   <itemizedlist>
   
  +<listitem><para>April 24th, 2004 [tushar]: Updated to
  +openoffice-1.1.1.</para></listitem>
  +
   <listitem><para>April 24th, 2004 [larry]: Updated to
   cvs-1.11.15.</para></listitem>
   
  
  
  
  1.9       +11 -1     BLFS/BOOK/xsoft/suites/openoffice/openoffice-exp.xml
  
  Index: openoffice-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/xsoft/suites/openoffice/openoffice-exp.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -u -r1.8 -r1.9
  --- openoffice-exp.xml	4 Oct 2003 00:28:30 -0000	1.8
  +++ openoffice-exp.xml	24 Apr 2004 21:52:52 -0000	1.9
  @@ -6,11 +6,21 @@
   
   <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-libart</parameter>: Use libart instead of gpc for polygon clipping.</para>
  +
  +<para><parameter>--with-libsn</parameter>: Use startup-notification.</para>
  +
  +<para><parameter>--disable-java</parameter>: Do not build components that need java.</para>
  +
  +<para><parameter>--without-gpc</parameter>: Do not use gpc. Removes polygon clipping capability.</para>
  +
   <para><command>./bootstrap</command>: Create packages required to bootstrap the build.</para>
   
   <para><command>dmake</command>: Compile the package.</para>
   
  -<para><command>sed -e "s:^oo_home=...</command>: Remove version specific
  +<para><command>sed -i "s:^oo_home=...</command>: Remove version specific
   installation directory</para>
   
   <para><command>for appl in swriter scalc sdraw simpress smath soffice;
  
  
  
  1.19      +7 -10     BLFS/BOOK/xsoft/suites/openoffice/openoffice-inst.xml
  
  Index: openoffice-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/xsoft/suites/openoffice/openoffice-inst.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -u -r1.18 -r1.19
  --- openoffice-inst.xml	23 Dec 2003 08:03:21 -0000	1.18
  +++ openoffice-inst.xml	24 Apr 2004 21:52:52 -0000	1.19
  @@ -1,10 +1,9 @@
   <sect2>
   <title>Installation of <application>OpenOffice</application></title>
   
  -<para>Apply the downloaded patches and copy gpc files.</para>
  +<para>Apply the downloaded patches and optionally copy the gpc files.</para>
   
   <screen><userinput><command>mv ../gpc231/* external/gpc &&
  -rm -rf ../gpc231 &&
   for p in ../openoffice-&openoffice-version;-*.patch
   do patch -Np1 -i $p
   done</command></userinput></screen>
  @@ -15,11 +14,8 @@
   -fomit-frame-pointer. The best option is to not use any custom optimizations.
   The following command removes an incorrect -mcpu option in the above file.</para>
   
  -<screen><userinput><command>cd solenv/inc &&
  -cp unxlngi4.mk unxlngi4.mk.orig &&
  -sed -e "s:\-mcpu=pentiumpro::" \
  -unxlngi4.mk.orig > unxlngi4.mk &&
  -cd ../..</command></userinput></screen>
  +<screen><userinput><command>sed -i "s:\-mcpu=pentiumpro::" \
  +solenv/inc/unxlngi4.mk</command></userinput></screen>
   
   <para>Configure openoffice using the following commands. You may build install
   sets for only specific languages based on your preferences.
  @@ -32,7 +28,9 @@
   set, unset it before compiling.</para>
   
   <screen><userinput><command>cd config_office/ &&
  -./configure --with-lang=ALL &&
  +./configure --with-lang=ALL \
  +--with-dict=ALL \
  +--enable-libsn --with-system-zlib &&
   cd ..</command></userinput></screen>
   
   <para>Compile <application>OpenOffice</application> using the following
  @@ -66,8 +64,7 @@
   can use <application>Xvfb</application> if you are compiling on a console.</para>
   
   <screen><userinput><command>cd instsetoo/unxlngi4.pro/01/normal &&
  -cp install install.orig &&
  -sed -e "s:^oo_home=.*:oo_home=openoffice:" install.orig > install &&
  +sed -i "s:^oo_home=.*:oo_home=openoffice:" install &&
   ./install --prefix=/opt &&
   for appl in swriter scalc sdraw simpress smath soffice spadmin
   do ln -sf /opt/openoffice/program/$appl /usr/bin/$appl
  
  
  
  1.25      +7 -5      BLFS/BOOK/xsoft/suites/openoffice/openoffice-intro.xml
  
  Index: openoffice-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/xsoft/suites/openoffice/openoffice-intro.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -u -r1.24 -r1.25
  --- openoffice-intro.xml	25 Jan 2004 03:12:36 -0000	1.24
  +++ openoffice-intro.xml	24 Apr 2004 21:52:52 -0000	1.25
  @@ -20,20 +20,22 @@
   
   <sect3><title><application>OpenOffice</application> dependencies</title>
   <sect4><title>Required</title>
  -<para><xref linkend="xfree86"/>, <xref linkend="j2sdk"/>,
  +<para><xref linkend="xfree86"/>
   <xref linkend="zip"/>, <xref linkend="unzip"/>, <xref linkend="tcsh"/>,
   <xref linkend="which"/></para></sect4>
  +<sect4><title>Recommended</title>
  +<para><xref linkend="j2sdk"/></para></sect4>
   <sect4><title>Optional</title>
  -<para><xref linkend="Linux_PAM"/> and <ulink
  +<para><xref linkend="Linux_PAM"/>,
  +<xref linkend="libart_lgpl"/>,
  +<xref linkend="startup-notification"/> and <ulink
   url="http://ant.apache.org/">Apache Ant</ulink></para></sect4>
   </sect3>
   
   <sect3><title>Additional downloads</title>
   <itemizedlist spacing='compact'>
  -<listitem><para>General Polygon Clipper Library (Required): <ulink
  +<listitem><para>General Polygon Clipper Library (Optional if <xref linkend="libart_lgpl"/> is used): <ulink
   url="ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z"/></para></listitem>
  -<listitem><para>Required patch (Disable building of mozilla addressbook): <ulink
  -url="&patch-root;/openoffice-&openoffice-version;-no-mozab.patch"/></para></listitem>
   <listitem><para>Required patch (Executable <command>test</command> is in
   <filename class="directory">/bin</filename>,
   not in <filename class="directory">/usr/bin</filename>): <ulink
  
  
  
  1.12      +3 -3      BLFS/BOOK/xsoft/suites/openoffice/openoffice.ent
  
  Index: openoffice.ent
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/xsoft/suites/openoffice/openoffice.ent,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -u -r1.11 -r1.12
  --- openoffice.ent	29 Jan 2004 19:45:00 -0000	1.11
  +++ openoffice.ent	24 Apr 2004 21:52:52 -0000	1.12
  @@ -3,9 +3,9 @@
   <!ENTITY openoffice-inst SYSTEM "openoffice-inst.xml">
   <!ENTITY openoffice-exp SYSTEM "openoffice-exp.xml">
   <!ENTITY openoffice-desc SYSTEM "openoffice-desc.xml">
  -<!ENTITY openoffice-version "1.1.0">
  -<!ENTITY openoffice-download-http "http://www.openoffice.org/dev_docs/source/&openoffice-version;/source.html">
  +<!ENTITY openoffice-version "1.1.1">
  +<!ENTITY openoffice-download-http "http://download.openoffice.org/&openoffice-version;/source.html">
   <!ENTITY openoffice-download-ftp "">
  -<!ENTITY openoffice-size "155 MB">
  +<!ENTITY openoffice-size "189 MB">
   <!ENTITY openoffice-buildsize "5.0 GB">
   <!ENTITY openoffice-time "">
  
  
  



More information about the blfs-book mailing list