Changeset e7d7f69

Timestamp:

10/07/2005 12:29:33 AM (19 years ago)

Author:

DJ Lucas <dj@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

829c219

Parents:

b89c7ca

Message:

Updated to OOo-1.1.5

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@5149 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• xsoft/suites/openoffice.xml (modified) (10 diffs)

general.ent

@@ -450 +450 @@
 <!-- Chapter 34 -->
 <!ENTITY koffice-version              "1.4.1">
-<!ENTITY openoffice-version           "1.1.4">
+<!ENTITY openoffice-version           "1.1.5">
 
 <!-- Chapter 35 -->

introduction/welcome/changelog.xml

@@ -51 +51 @@
           <para>[dj] - Updated to JDK (source build) 1.5.0_04.</para>
         </listitem>
+        <listitem>
+          <para>[dj] - Updated to OpenOffice 1.1.5.</para>
+        </listitem>
       </itemizedlist>
     </listitem>

xsoft/suites/openoffice.xml

@@ -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/&openoffice-version;/OOo_&openoffice-version;_source.tar.gz">
-  <!ENTITY openoffice-md5sum        "20c10db97865ae4c51dc827d668b8939">
-  <!ENTITY openoffice-size          "214 MB">
-  <!ENTITY openoffice-buildsize     "2.8 GB">
-  <!ENTITY openoffice-time          "75 SBU">
+  <!ENTITY openoffice-download-ftp "ftp://ftp.ussg.iu.edu/pub/openoffice/stable/&openoffice-version;/OOo_&openoffice-version;_src.tar.gz">
+  <!ENTITY openoffice-md5sum        "1c8e860adae05087a53bdba5646962a9">
+  <!ENTITY openoffice-size          "213 MB">
+  <!ENTITY openoffice-buildsize     "3120 MB">
+  <!ENTITY openoffice-time          "70 SBU">
 ]>
 
@@ -58 +58 @@
     <itemizedlist spacing='compact'>
       <listitem>
-        <para>Required security patch: <ulink
-        url="&patch-root;/OOo_&openoffice-version;-security-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
         <para>Required patch for gcc-&gcc-version;: <ulink
-        url="&patch-root;/OOo_&openoffice-version;-gcc_3.4.2+_fixes-2.patch"/>
+        url="&patch-root;/OOo_&openoffice-version;-gcc4-1.patch"/>
         </para>
       </listitem>
@@ -78 +73 @@
       </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
-        url="&patch-root;/OOo_&openoffice-version;-test_bin_loc-1.patch"/></para>
-      </listitem>
-      <listitem>
         <para>Required patch for STLport-4.6.2: <ulink
         url="&patch-root;/OOo_&openoffice-version;-STLport_4.6.2-1.patch"/></para>
       </listitem>
       <listitem>
-        <para>Required patch for use with glibc-2.3.4: <ulink
+        <para>Required patch for use with glibc-2.3.5: <ulink
         url="&patch-root;/OOo_&openoffice-version;-doublefree-1.patch"/></para>
       </listitem>
@@ -142 +131 @@
     <title>Installation of OpenOffice</title>
 
-    <para><application>OpenOffice</application> does not create a directory
-    when you extract the TAR ball. Create a build directory and extract the
-    source with the following commands:</para>
-
-<screen><userinput>mkdir OOo-build &amp;&amp;
-cd OOo-build &amp;&amp;
-tar -zxf ../OOo_&openoffice-version;_source.tar.gz</userinput></screen>
-
     <para>Apply all of the downloaded patches:</para>
 
@@ -163 +144 @@
     temporary symlink in place to satisfy STLport:</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
+    <para>As the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>ln -sf /usr/include/c++/&gcc-version; /usr/g++-v3</userinput></screen>
-
-    <para>Create a temporary symlink to the JRE's
-    <application>motif</application> libraries:</para>
-
-    <para>Again, as the <systemitem class="username">root</systemitem> user:</para>
-
-<screen role="root"><userinput>ln -sf ${JAVA_HOME}/jre/lib/i?86/motif21/libmawt.so /usr/lib</userinput></screen>
 
     <para>If you want to optimize the build, edit
@@ -181 +155 @@
     incorrect <option>-mcpu</option> option in the above file:</para>
 
-    <para>Now, as an unprivileged user:</para>
-
 <screen><userinput>sed -i "s:\-mcpu=pentiumpro::" \
     solenv/inc/unxlngi4.mk</userinput></screen>
@@ -188 +160 @@
     <para>Configure <application>OpenOffice</application> using the following
     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 US English. If you need other languages, be sure
-    to add <parameter>ENUS</parameter> to the list; otherwise the build will
-    fail:</para>
+    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 US English. 
+    If you need other languages, be sure to add <parameter>ENUS</parameter> 
+    to the list; otherwise the build will fail:</para>
 
 <screen><userinput>cd config_office/ &amp;&amp;
@@ -216 +188 @@
 
 <screen><userinput>./bootstrap &amp;&amp;
-bash -c "source LinuxIntelEnv.Set.sh; dmake"</userinput></screen>
+. LinuxIntelEnv.Set.sh &amp;&amp;
+dmake</userinput></screen>
 
     <para>If you have downloaded localized help content <filename>tgz</filename>
@@ -249 +222 @@
     the <filename>*.desktop</filename> files to
     <filename>/usr/share/applications</filename> with the following
-    commands as the <systemitem class="username">root</systemitem> use:</para>
+    commands as the <systemitem class="username">root</systemitem> user:</para>
 
 <screen role="root"><userinput>install -v -d /usr/share/applications -m 755 &amp;&amp;
@@ -255 +228 @@
     /usr/share/applications/ &amp;&amp;
 rename -v ooo645 ooo /usr/share/applications/ooo645*.desktop</userinput></screen>
-
-    <para>Finally, as the <systemitem class="username">root</systemitem>user:
-    remove the temporary symlinks:</para>
-
-<screen role="root"><userinput>rm /usr/g++-v3 &amp;&amp;
-rm /usr/lib/libmawt.so</userinput></screen>
 
   </sect2>