Author: fernando
Date: Sun Aug 31 07:12:19 2014
New Revision: 14144

Log:
Update to libreoffice-4.3.1.2.
Completely modify and fix instructions for alsa-tools-1.0.28.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/alsa-tools.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/xsoft/office/libreoffice.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Sun Aug 31 02:38:03 2014        (r14143)
+++ trunk/BOOK/general.ent      Sun Aug 31 07:12:19 2014        (r14144)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "30">                   <!-- Always 2 digits -->
+<!ENTITY day          "31">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2014">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 30th, &year;">
+<!ENTITY releasedate  "August 31st, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development] -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Sun Aug 31 02:38:03 
2014        (r14143)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Sun Aug 31 07:12:19 
2014        (r14144)
@@ -45,6 +45,21 @@
 -->
 
     <listitem>
+      <para>August 31st, 2014</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Completely modify and fix instructions for
+          alsa-tools-1.0.28. Fixes
+          <ulink url="&blfs-ticket-root;5453">#5453</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[fernando] - Update to libreoffice-4.3.1.2. Fixes
+          <ulink url="&blfs-ticket-root;5445">#5445</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>August 30th, 2014</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/multimedia/libdriv/alsa-tools.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/alsa-tools.xml        Sun Aug 31 02:38:03 
2014        (r14143)
+++ trunk/BOOK/multimedia/libdriv/alsa-tools.xml        Sun Aug 31 07:12:19 
2014        (r14144)
@@ -98,26 +98,56 @@
   <sect2 role="installation">
     <title>Installation of ALSA Tools</title>
 
+&as_root;
+
+    <para>First, start a subshell that will exit on error:</para>
+
+<screen><userinput>bash -e</userinput></screen>
+
     <para>
-      The <application>ALSA Tools</application> package is only
-      needed by those with advanced requirements for their sound
-      card. The tools are not all built together, instead you
-      need to <command>cd</command> into the directory of each
-      tool you wish to compile and run the following commands:
+      Now, remove a tool that needs <application>Qt2 or 3</application> and two
+      unneed files (for the BLFS instructions below):
     </para>
 
-<screen><userinput>./configure --prefix=/usr &amp;&amp;
-make</userinput></screen>
+<screen><userinput>rm -rf qlo10k1 Makefile gitcompile</userinput></screen>
 
     <para>
-      This package does not come with a test suite.
+      The <application>ALSA Tools</application> package is only needed by those
+      with advanced requirements for their sound card. The tools can be built
+      all together at once, but if only a subset is needed, you need to
+      <command>cd</command> into the directory of each tool you wish to compile
+      and run the commands. Here, we present instructions to build all tools.
     </para>
 
     <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
+      Install all <application>ALSA Tools</application> by running the
+      following commands:
     </para>
 
-<screen role="root"><userinput>make install</userinput></screen>
+<screen><userinput>for tool in *
+do
+  case $tool in
+    seq )
+      tool_dir=seq/sbiload
+    ;;
+    * )
+      tool_dir=$tool
+    ;;
+  esac
+
+  pushd $tool_dir
+    ./configure --prefix=/usr
+    make
+    as_root make install
+    as_root /sbin/ldconfig
+  popd
+
+done
+unset tool tool_dir</userinput></screen>
+
+    <para>Finally, exit the shell that was started earlier:</para>
+
+<screen><userinput>exit</userinput></screen>
 
   </sect2>
 

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Sun Aug 31 02:38:03 2014        (r14143)
+++ trunk/BOOK/packages.ent     Sun Aug 31 07:12:19 2014        (r14144)
@@ -576,8 +576,8 @@
 <!ENTITY gnumeric-version             "1.12.17">
 <!ENTITY gnucash-version              "2.4.11">
 
-<!ENTITY libreoffice-version          "4.3.0">
-<!ENTITY libreoffice-patch            ".4">
+<!ENTITY libreoffice-version          "4.3.1">
+<!ENTITY libreoffice-patch            ".2">
 <!ENTITY libreoffice-dlversion        
"&libreoffice-version;&libreoffice-patch;">
 
 <!-- Chapter 35 -->

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml     Sun Aug 31 02:38:03 2014        
(r14143)
+++ trunk/BOOK/xsoft/office/libreoffice.xml     Sun Aug 31 07:12:19 2014        
(r14144)
@@ -7,19 +7,19 @@
   <!ENTITY libreoffice-dl 
"http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;";>
 
   <!ENTITY libreoffice-core-download-http 
"&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "de0d9322f3aaeb20abd5e06c5c0972bb">
-  <!ENTITY libreoffice-core-size          "145 MB">
+  <!ENTITY libreoffice-core-md5sum        "cf750c01b6cd0b5c6fdd1760672e67d4">
+  <!ENTITY libreoffice-core-size          "146 MB">
 
   <!ENTITY libreoffice-dict-download-http 
"&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "cd27ec060c68079a13abf0984dbbf5fa">
+  <!ENTITY libreoffice-dict-md5sum        "aae27f6c9db741c42acae48a1dfb0f5e">
   <!ENTITY libreoffice-dict-size          "36 MB">
 
   <!ENTITY libreoffice-help-download-http 
"&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "89d9da0ff2d5ea07f8c30c680fee2b0a">
+  <!ENTITY libreoffice-help-md5sum        "24692bf69bbe877ad2524653c991705a">
   <!ENTITY libreoffice-help-size          "1.8 MB">
 
   <!ENTITY libreoffice-translations-download-http 
"&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        
"8e2f7905a0f827f655a1e21d93c6ddf7">
+  <!ENTITY libreoffice-translations-md5sum        
"b8d3445100c10bb4f21f6c8f25c5c600">
   <!ENTITY libreoffice-translations-size          "121 MB">
 
   <!-- This package has some peculiarities, some discussed in the text.
@@ -27,8 +27,11 @@
   measured by editors, depending on architecture and sometimes installed
   dependencies (with-system... -->
 
-  <!ENTITY libreoffice-buildsize          "8.23 GB (497 MB installed) - 9.6 GB 
(528 MB installed), with translations">
-  <!ENTITY libreoffice-time               "144 SBU - 165 SBU, with 
translations">
+  <!ENTITY libreoffice-buildsize          "8.1 GB (497 MB installed) - 9.6 GB 
(528 MB installed), with translations">
+  <!ENTITY libreoffice-time               "200 SBU, with translations">
+  <!-- [fo] For version 4.3.1.2 I've got, for i686, SBU larger than the upper
+  limit, thus, temporarily, decided to used a single SBU, instead of a range.
+  -->
   <!-- This package has some peculiarities, some discussed in the text.
   Two values for SBU and buildsize are given due to the large difference
   measured by editors, depending on architecture and sometimes installed
@@ -138,6 +141,12 @@
       </listitem>
       <listitem>
         <para>
+          Required patch for to fix building with system Boost:
+          <ulink 
url="&patch-root;/libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
           Required patch for i686 systems, in order to fix a problem inroduced
           by <application>&gcc-490;</application>:
           <ulink 
url="&patch-root;/libreoffice-&libreoffice-dlversion;-gcc_4_9_0-1.patch"/>
@@ -166,7 +175,7 @@
     </note>
 
     <para role="recommended">
-    <!--<xref linkend="boost"/>,-->
+      <xref linkend="boost"/>,
       <xref linkend="clucene"/>,
       <xref linkend="cups"/>,
       <xref linkend="curl"/>,
@@ -250,7 +259,7 @@
 
   <sect2 role="installation">
     <title>Installation of LibreOffice</title>
-
+<!--
     <warning>
       <para>
         Untaring the libreoffice-&libreoffice-dlversion; tarball as
@@ -270,11 +279,11 @@
         <emphasis>not</emphasis> untaring it as
         <systemitem class="username">root</systemitem>. If you must untar it as
         <systemitem class="username">root</systemitem> pass the option
-        <option>--no-overwrite-dir</option> to tar. This is the default when 
you
+        <option>-\-no-overwrite-dir</option> to tar. This is the default when 
you
         untar as a user but has to be passed as an option when untaring as
         <systemitem class="username">root</systemitem>:
       </para>
-    </warning>
+    </warning>-->
 
 <screen role="root"><userinput>tar -xf 
libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
 cd libreoffice-&libreoffice-dlversion;</userinput></screen>
@@ -309,7 +318,7 @@
       If you have downloaded the translations tarball, create a symlink:
     </para>
 
-<screen><userinput>ln -sv 
../../libreoffice-translations-&libreoffice-dlversion;.tar.xz 
external/tarballs/</userinput></screen>
+<screen><userinput>ln -sv 
../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz 
external/tarballs/</userinput></screen>
 
     <note>
       <para>
@@ -349,15 +358,13 @@
       the following commands:
     </para>
 
-<screen><userinput>sed -e "/gzip -f/d"   \
+<screen><userinput>patch -Np1 -i 
../libreoffice-&libreoffice-dlversion;-boost_1_56_0-1.patch &amp;&amp;
+
+sed -e "/gzip -f/d"   \
     -e "s|.1.gz|.1|g" \
     -i bin/distro-install-desktop-integration        &amp;&amp;
-sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
 
-sed -e "/distro-install-file-lists/d"           \
-    -e "s:fetch_Download_item:&amp;_unchecked:" \
-    -e "/fetch_Download_item/s:,no-check::"     \
-   -i Makefile.in                                  &amp;&amp;
+sed -e "/distro-install-file-lists/d" -i Makefile.in &amp;&amp;
 
 chmod -v +x bin/unpack-sources                     &amp;&amp;
 sed -e "s/target\.mk/langlist\.mk/"                \
@@ -376,8 +383,8 @@
              --disable-odk               \
              --disable-postgresql-sdbc   \
              --enable-release-build=yes  \
-             --enable-python=system      \<!--
-             - -with-system-boost    \ --> 
+             --enable-python=system      \
+             --with-system-boost         \
              --with-system-clucene       \
              --with-system-cairo         \
              --with-system-curl          \
@@ -457,8 +464,7 @@
     <para>
       <command>sed -e ...</command>: First sed prevents compression of the
       manual pages, the second one prevents a script that causes install to
-      fail from running, the third one fixes the download location and the
-      fourth one fixes the unpack script.
+      fail from running, the third one fixes the unpack script.
     </para>
 
     <para>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to