Ticket #2507: OOo_2nd.diff

File OOo_2nd.diff, 3.2 KB (added by Randy McMurchy, 14 years ago)
  • xsoft/suites/openoffice.xml

    old new  
    161161    <para>The <application>OpenOffice</application> source code is now
    162162    distributed in several tarballs.  You should extract each from the
    163163    same top-level directory before entering the build directory.  At
    164     a minimum, you will need to extract the src and core tarballs.
    165     Additionally, the source directory name is not consistent with
    166     the tarball name and will be named
     164    a minimum, you will need to extract the <quote>Core</quote> and
     165    <quote>System</quote>. Note that the source directory name is not
     166    consistent with the tarball name and will be named
    167167    <filename class='directory'>OOG680_m9</filename>.</para>
    168168
    169169    <para>If you wish to build an in-tree <application>Mozilla</application>,
     
    196196      <command>configure</command>.</para>
    197197    </note>
    198198
    199     <para>Configure <application>OpenOffice</application> using the following
    200     commands:</para>
     199    <para><application>OpenOffice</application> fails to compile if
     200    <command>umask</command> is set to something exotic. The build can also
     201    fail if the <envar>LANG</envar> or <envar>LC_ALL</envar> environment
     202    variables are set. Use the following commands to change your
     203    environment accordingly:</para>
    201204
    202 <screen><userinput>pushd config_office &amp;&amp;
     205<screen><userinput>umask 0022 &amp;&amp;
     206unset LANG LC_ALL</userinput></screen>
     207
     208    <para>Install <application>OpenOffice</application> by running the
     209    following commands:</para>
     210
     211<screen><userinput>patch -Np1 -i ../OOo_&openoffice-version;-use_bin_hsqldb-1.patch &amp;&amp;
     212
     213pushd config_office &amp;&amp;
    203214./configure --prefix=/opt/openoffice-&openoffice-version; \
    204215            --enable-libart                \
    205216            --disable-fontooo              \
     
    220231            --disable-odk                  \
    221232            --disable-qadevooo             \
    222233            --with-use-shell=bash &amp;&amp;
    223 popd</userinput></screen>
    224 
    225     <para><application>OpenOffice</application> fails to compile if
    226     <command>umask</command> is set to something exotic. The build can also
    227     fail if the <envar>LANG</envar> or <envar>LC_ALL</envar> environment
    228     variables are set. Use the following commands to change your
    229     environment accordingly:</para>
    230 
    231 <screen><userinput>umask 0022 &amp;&amp;
    232 unset LANG LC_ALL</userinput></screen>
    233 
    234     <para>Compile <application>OpenOffice</application> using the following
    235     commands:</para>
     234popd &amp;&amp;
    236235
    237 <screen><userinput>patch -Np1 -i ../OOo_&openoffice-version;-use_bin_hsqldb-1.patch &amp;&amp;
    238236./bootstrap &amp;&amp;
    239237source LinuxX86Env.Set.sh &amp;&amp;
    240238dmake</userinput></screen>
    241239
    242240    <para>This package does not come with a test suite.</para>
    243241
    244     <para>Install <application>OpenOffice</application> as the
    245     <systemitem class="username">root</systemitem> user with the
    246     following commands:</para>
     242    <para>Now, as the <systemitem class="username">root</systemitem>
     243     user:</para>
    247244
    248245<screen role="root"><userinput>pushd instsetoo_native/unxlngi6.pro/OpenOffice/\
    249246native/install/en-US/linux-2.6-intel/buildroot/opt &amp;&amp;