Author: fernando
Date: Fri Aug  7 18:03:10 2015
New Revision: 16332

Log:
•  Update to tcsh-6.19.00.
•  Update to fribidi-0.19.7.
•  Update to subversion-1.9.0.
•  Update to mariadb-10.0.21.
•  Update to firefox-39.0.3.
•  SDL-1.2.15: Move "--disable-sdl-dlopen" to option.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/fribidi.xml
   trunk/BOOK/general/prog/subversion.xml
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/multimedia/libdriv/sdl.xml
   trunk/BOOK/packages.ent
   trunk/BOOK/postlfs/shells/tcsh.xml
   trunk/BOOK/server/databases/mariadb.xml
   trunk/BOOK/xsoft/graphweb/firefox.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Fri Aug  7 10:13:02 2015        (r16331)
+++ trunk/BOOK/general.ent      Fri Aug  7 18:03:10 2015        (r16332)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "06">                   <!-- Always 2 digits -->
+<!ENTITY day          "07">                   <!-- Always 2 digits -->
 <!ENTITY month        "08">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "August 6th &year;">
+<!ENTITY releasedate  "August 7th &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/general/graphlib/fribidi.xml
==============================================================================
--- trunk/BOOK/general/graphlib/fribidi.xml     Fri Aug  7 10:13:02 2015        
(r16331)
+++ trunk/BOOK/general/graphlib/fribidi.xml     Fri Aug  7 18:03:10 2015        
(r16332)
@@ -6,10 +6,10 @@
 
   <!ENTITY fribidi-download-http 
"http://fribidi.org/download/fribidi-&fribidi-version;.tar.bz2";>
   <!ENTITY fribidi-download-ftp  " ">
-  <!ENTITY fribidi-md5sum        "ce93d862344991173dabb609bf93ca1d">
-  <!ENTITY fribidi-size          "625 KB">
-  <!ENTITY fribidi-buildsize     "6.5 MB">
-  <!ENTITY fribidi-time          "0.1 SBU">
+  <!ENTITY fribidi-md5sum        "6c7e7cfdd39c908f7ac619351c1c5c23">
+  <!ENTITY fribidi-size          "636 KB">
+  <!ENTITY fribidi-buildsize     "6.7 MB (with tests)">
+  <!ENTITY fribidi-time          "less than 0.1 SBU (with tests)">
 ]>
 
 <sect1 id="fribidi" xreflabel="FriBidi-&fribidi-version;">
@@ -92,10 +92,8 @@
       commands:
     </para>
 
-<screen><userinput>sed -i "s|glib/gstrfuncs\.h|glib.h|" 
charset/fribidi-char-sets.c &amp;&amp;
-sed -i "s|glib/gmem\.h|glib.h|"      lib/mem.h                   &amp;&amp;
+<screen><userinput>./configure --prefix=/usr &amp;&amp;
 
-./configure --prefix=/usr                                        &amp;&amp;
 make</userinput></screen>
 
     <para>
@@ -108,14 +106,14 @@
 
 <screen role="root"><userinput>make install</userinput></screen>
   </sect2>
-
+<!--
   <sect2 role="commands">
     <title>Command Explanations</title>
 
     <para><command>sed -i ...</command>: These commands fix two header files if
     <application>GLib-2</application> is linked into the build.</para>
 
-  </sect2>
+  </sect2>-->
 
   <sect2 role="content">
     <title>Contents</title>

Modified: trunk/BOOK/general/prog/subversion.xml
==============================================================================
--- trunk/BOOK/general/prog/subversion.xml      Fri Aug  7 10:13:02 2015        
(r16331)
+++ trunk/BOOK/general/prog/subversion.xml      Fri Aug  7 18:03:10 2015        
(r16332)
@@ -9,10 +9,10 @@
   <!ENTITY subversion-download-http
   
"http://www.apache.org/dist/subversion/subversion-&subversion-version;.tar.bz2";>
   <!ENTITY subversion-download-ftp  " ">
-  <!ENTITY subversion-md5sum        "4413417b529d7bdf82f74e50df02e88b">
-  <!ENTITY subversion-size          "6.6 MB">
-  <!ENTITY subversion-buildsize     "135 MB (349 MB with all bindings and API 
documentation built; additional 703 MB for tests)">
-  <!ENTITY subversion-time          "1.1 SBU (2.9 SBU with all bindings and 
API documentation built; additional 21 SBU for tests)">
+  <!ENTITY subversion-md5sum        "20ae7b0d4ef07eeaf73eb4e23317b495">
+  <!ENTITY subversion-size          "7.4 MB">
+  <!ENTITY subversion-buildsize     "174 MB (436 MB with all bindings and API 
documentation built; additional 785 MB for tests)">
+  <!ENTITY subversion-time          "1 SBU (2.8 SBU with all bindings and API 
documentation built; additional 68 SBU for tests)">
 ]>
 
 <sect1 id="subversion" xreflabel="Subversion-&subversion-version;">
@@ -121,7 +121,7 @@
     <para role="optional">
       One of <xref linkend="openjdk"/>,
       <ulink url="http://www.inet.no/dante/";>Dante</ulink> or
-      <ulink 
url="http://oss.software.ibm.com/developerworks/opensource/jikes/";>Jikes</ulink>,
+      <ulink url="http://jikes.sourceforge.net/";>Jikes</ulink>,
       and <xref linkend="junit"/> (to test the Java bindings)
     </para>
 
@@ -158,17 +158,6 @@
     </para>
 
     <para>
-      If you have a multi core CPU and normally run <command>make</command> 
with
-      multiple jobs (eg <command>make -j4</command>) then a bug in the
-      <filename>Makefile</filename> will prevent the
-      <application>Perl</application> bindings compiling correctly. Fix the
-      <filename>Makefile</filename> with:
-    </para>
-    <para>
-     <screen><command>sed -i 's#Makefile.PL.in$#&amp; libsvn_swig_perl#' 
Makefile.in</command></screen>
-    </para>
-
-    <para>
       If you want to compile <application>Perl</application>,
       <application>Python2</application>, or <application>Ruby</application>
       bindings, issue any of the following command:
@@ -182,7 +171,7 @@
     </para>
 
     <para>
-      To test the results, issue: <command>make check</command>. 
+      To test the results, issue: <command>make check</command>.
     </para>
 
     <para>
@@ -209,7 +198,8 @@
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
 
-<screen role="root"><userinput>make -j1 install &amp;&amp;
+<screen role="root"><userinput>make install &amp;&amp;
+
 install -v -m755 -d /usr/share/doc/subversion-&subversion-version; &amp;&amp;
 cp      -v -R       doc/* \
                     
/usr/share/doc/subversion-&subversion-version;</userinput></screen>
@@ -255,6 +245,11 @@
       if <application>Apache</application> is not installed.
     </para>
 
+    <para>
+      <option>---disable-gmock</option>: Do not use the Googlemock testing
+      framework.
+    </para>
+
   </sect2>
 
   <sect2 role="configuration">
@@ -306,8 +301,8 @@
 
       <seglistitem>
         <seg>
-          svn, svnadmin, svndumpfilter, svnlook, svnmucc, svnrdump, svnserve,
-          svnsync, and svnversion
+          svn, svnadmin, svnbench, svndumpfilter, svnfsfs, svnlook, svnmucc,
+          svnrdump, svnserve, svnsync, and svnversion
         </seg>
         <seg>
           libsvn_*-1.so and optionally, a Java library, the mod_dav_svn.so and
@@ -361,6 +356,18 @@
         </listitem>
       </varlistentry>
 
+      <varlistentry id="svnbench">
+        <term><command>svnbench</command></term>
+        <listitem>
+          <para>
+            is a benchmarking tool.
+          </para>
+          <indexterm zone="subversion svnbench">
+            <primary sortas="b-svnbench">svnbench</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="svndumpfilter">
         <term><command>svndumpfilter</command></term>
         <listitem>
@@ -373,6 +380,20 @@
           </indexterm>
         </listitem>
       </varlistentry>
+
+      <varlistentry id="svnfsfs">
+        <term><command>svnfsfs</command></term>
+        <listitem>
+          <para>
+            is the FSFS (FileSystem atop of the FileSystem -
+            <application>Subversion</application> filesystem implementation)
+            repository manipulation tool.
+          </para>
+          <indexterm zone="subversion svnfsfs">
+            <primary sortas="b-svnfsfs">svnfsfs</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
 
       <varlistentry id="svnlook">
         <term><command>svnlook</command></term>

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Fri Aug  7 10:13:02 
2015        (r16331)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Fri Aug  7 18:03:10 
2015        (r16332)
@@ -45,6 +45,32 @@
 -->
 
       <listitem>
+        <para>August 7th, 2015</para>
+        <itemizedlist>
+          <listitem>
+            <para>[fernando] - Update to firefox-39.0.3.  Fixes
+            <ulink url="&blfs-ticket-root;6794">#6794</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to mariadb-10.0.21.  Fixes
+            <ulink url="&blfs-ticket-root;6793">#6793</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to subversion-1.9.0.  Fixes
+            <ulink url="&blfs-ticket-root;6792">#6792</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to fribidi-0.19.7.  Fixes
+            <ulink url="&blfs-ticket-root;6791">#6791</ulink>.</para>
+          </listitem>
+          <listitem>
+            <para>[fernando] - Update to tcsh-6.19.00.  Fixes
+            <ulink url="&blfs-ticket-root;6790">#6790</ulink>.</para>
+          </listitem>
+        </itemizedlist>
+      </listitem>
+
+      <listitem>
         <para>August 6th, 2015</para>
         <itemizedlist>
           <listitem>

Modified: trunk/BOOK/multimedia/libdriv/sdl.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/sdl.xml       Fri Aug  7 10:13:02 2015        
(r16331)
+++ trunk/BOOK/multimedia/libdriv/sdl.xml       Fri Aug  7 18:03:10 2015        
(r16332)
@@ -61,19 +61,18 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="aalib"/>,
       <xref linkend="alsa"/>,
-      <xref linkend='pulseaudio'/>
-      <xref linkend="nasm"/>,
-      <xref linkend="x-window-system"/>,
       <xref linkend="glu"/>,
-      <xref linkend="aalib"/>,
+      <xref linkend="nasm"/>,
+      <xref linkend="pulseaudio"/>,
       <xref linkend="pth"/>,
+      <xref linkend="x-window-system"/>,
       <ulink url="http://www.directfb.org/";>DirectFB</ulink>,
-      <ulink url="http://www.ggi-project.org/";>GGI</ulink>,
-      <ulink url="http://my.arava.co.il/~matan/svgalib/";>SVGAlib-1.9.5</ulink>
-      (<ulink 
url="&patch-root;/svgalib-1.9.25-megafixes-1.patch">patched</ulink>),
-      <ulink url="http://caca.zoy.org/wiki/libcaca";>libcaca</ulink> and
-      <ulink url="http://picogui.org/";>PicoGUI</ulink>
+      <ulink url="http://ibiblio.org/ggicore/";>GGI</ulink>,
+      <ulink url="http://caca.zoy.org/wiki/libcaca";>libcaca</ulink>,
+      <ulink url="http://picogui.org/";>PicoGUI</ulink>, and
+      <ulink url="http://arava.co.il/matan/svgalib/";>SVGAlib</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:
@@ -87,9 +86,11 @@
     <para>Install <application>SDL</application> by running the
     following commands:</para>
 
-<screen><userinput>sed -i '/_XData32/s:register long:register _Xconst long:' 
src/video/x11/SDL_x11sym.h &amp;&amp;
+<screen><userinput>sed -e '/_XData32/s:register long:register _Xconst long:' \
+    -i src/video/x11/SDL_x11sym.h &amp;&amp;
+
+./configure --prefix=/usr --disable-static &amp;&amp;
 
-./configure --prefix=/usr --disable-static --disable-sdl-dlopen &amp;&amp;
 make</userinput></screen>
 
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
@@ -117,21 +118,29 @@
 
     <para>You'll need to manually run all the test programs (they are listed in
     the <filename>README</filename> file in this directory).  Many of them will
-    need to be manually killed, and you'll need to turn your speakers on with 
the
-    volume at a suitable level.</para>
+    need to be manually killed, and you'll need to turn your speakers on with
+    the volume at a suitable level.</para>
 
   </sect2>
 
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed -i ...</command>: This command fixes compilation with 
libX11-1.6.0</para>
+    <para><command>sed -e ...</command>: This command fixes compilation with
+    libX11-1.6.0</para>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
       href="../../xincludes/static-libraries.xml"/>
 
-    <para><parameter>--disable-sdl-dlopen</parameter>: This switch disables
-    using dlopen for shared object loading.</para>
+    <para><option>--disable-alsa-shared</option>: This switch disables
+    dynamically loading ALSA shared libraries.</para>
+
+    <para><option>--disable-sdl-dlopen</option>: This switch disables using
+    dlopen for shared object loading. Loading image backend libraries like
+    libpng dynamically on the fly does not work.</para>
+
+    <para><option>--disable-x11-shared</option>: This switch disables
+    dynamically loading X11 shared libraries.</para>
 
   </sect2>
 

Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent     Fri Aug  7 10:13:02 2015        (r16331)
+++ trunk/BOOK/packages.ent     Fri Aug  7 18:03:10 2015        (r16332)
@@ -61,7 +61,7 @@
 
 <!-- Chapter 7 -->
 <!ENTITY dash-version                 "0.5.8">
-<!ENTITY tcsh-version                 "6.18.01">
+<!ENTITY tcsh-version                 "6.19.00">
 <!ENTITY zsh-version                  "5.0.8">
 
 <!-- Chapter 8 Virtualization -->
@@ -156,7 +156,7 @@
 <!ENTITY exiv2-version                "0.25">
 <!ENTITY freetype2-version            "2.6">
 <!ENTITY fontconfig-version           "2.11.1">  <!-- stable lt .90 micro 
version -->
-<!ENTITY fribidi-version              "0.19.6">
+<!ENTITY fribidi-version              "0.19.7">
 <!ENTITY gegl-version                 "0.2.0">
 <!ENTITY giflib-version               "5.1.1">
 <!ENTITY graphite2-version            "1.3.0">
@@ -274,7 +274,7 @@
 <!ENTITY ruby-patch-version           "0">
 <!ENTITY scons-version                "2.3.6">
 <!ENTITY slang-version                "2.2.4">
-<!ENTITY subversion-version           "1.8.13">
+<!ENTITY subversion-version           "1.9.0">
 <!ENTITY swig-version                 "3.0.7">
 <!ENTITY tcl-version                  "8.6.4">
 <!ENTITY tk-version                   "8.6.4">
@@ -419,7 +419,7 @@
 
 <!-- Chapter 22 -->
 <!ENTITY db-version                   "6.1.26">
-<!ENTITY mariadb-version              "10.0.20">
+<!ENTITY mariadb-version              "10.0.21">
 <!ENTITY postgresql-version           "9.4.4">
 <!ENTITY sqlite-version               "3.8.11.1">
 
@@ -631,7 +631,7 @@
 
 <!-- Chapter 43 -->
 <!ENTITY seamonkey-version            "2.33.1">
-<!ENTITY firefox-version              "39.0">
+<!ENTITY firefox-version              "39.0.3">
 
 <!-- Chapter 44 -->
 <!ENTITY balsa-version                "2.5.2">

Modified: trunk/BOOK/postlfs/shells/tcsh.xml
==============================================================================
--- trunk/BOOK/postlfs/shells/tcsh.xml  Fri Aug  7 10:13:02 2015        (r16331)
+++ trunk/BOOK/postlfs/shells/tcsh.xml  Fri Aug  7 18:03:10 2015        (r16332)
@@ -4,12 +4,15 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY tcsh-download-http 
"http://www.sfr-fresh.com/unix/misc/tcsh-&tcsh-version;.tar.gz";>
+  <!-- Following URL does not have previous versions
+  <!ENTITY tcsh-download-http 
"http://www.sfr-fresh.com/unix/misc/tcsh-&tcsh-version;.tar.gz";>-->
+  <!-- Following URL does have previous versions -->
+  <!ENTITY tcsh-download-http 
"http://fossies.org/linux/misc/tcsh-&tcsh-version;.tar.gz";>
   <!ENTITY tcsh-download-ftp  
"ftp://ftp.astron.com/pub/tcsh/tcsh-&tcsh-version;.tar.gz";>
-  <!ENTITY tcsh-md5sum        "6eed09dbd4223ab5b6955378450d228a">
-  <!ENTITY tcsh-size          "912 KB">
-  <!ENTITY tcsh-buildsize     "12.6 MB">
-  <!ENTITY tcsh-time          "0.2 SBU">
+  <!ENTITY tcsh-md5sum        "f5f854833578647795bc906dd4bcb5d5">
+  <!ENTITY tcsh-size          "928 KB">
+  <!ENTITY tcsh-buildsize     "15 MB (with tests)">
+  <!ENTITY tcsh-time          "0.2 SBU (with tests)">
 ]>
 
 <sect1 id="tcsh" xreflabel="Tcsh-&tcsh-version;">
@@ -36,7 +39,7 @@
     and also because some programs require the C shell in order to perform
     installation tasks.</para>
 
-    &lfs77_checked;
+    &lfs77_checked; &gcc5_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -68,12 +71,21 @@
   <sect2 role="installation">
     <title>Installation of Tcsh</title>
 
+    <para>
+      First, fix the package for gcc5 optimizations:
+    </para>
+
+<screen><userinput>sed -e 's/ i)/ k)/' \
+    -e '/ k)/  i \    k = i;' \
+    -e '/\*cp/ a \    volatile size_t k;' \
+    -i tc.alloc.c</userinput></screen>
+
     <para>Install <application>Tcsh</application> by running the following
     commands:</para>
 
-<screen><userinput>sed -i -e 's|\$\*|#&amp;|' -e 's|fR/g|&amp;m|' 
tcsh.man2html &amp;&amp;
-
+<screen><userinput>sed -i 's|fR/g|&amp;m|' tcsh.man2html       &amp;&amp;
 ./configure --prefix=/usr --bindir=/bin &amp;&amp;
+
 make &amp;&amp;
 sh ./tcsh.man2html</userinput></screen>
 
@@ -82,8 +94,10 @@
     <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
 
 <screen role="root"><userinput>make install install.man &amp;&amp;
+
 ln -v -sf tcsh   /bin/csh &amp;&amp;
 ln -v -sf tcsh.1 /usr/share/man/man1/csh.1 &amp;&amp;
+
 install -v -m755 -d          /usr/share/doc/tcsh-&tcsh-version;/html &amp;&amp;
 install -v -m644 tcsh.html/* /usr/share/doc/tcsh-&tcsh-version;/html &amp;&amp;
 install -v -m644 FAQ         
/usr/share/doc/tcsh-&tcsh-version;</userinput></screen>
@@ -93,7 +107,7 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
-    <para><command>sed -i -e 's|\$\*|#&amp;|' -e 's|fR/g|&amp;m|' 
tcsh.man2html</command>:
+    <para><command>sed -i 's|fR/g|&amp;m|' tcsh.man2html</command>:
     This updates some deprecated Perl code.</para>
 
     <para><parameter>--bindir=/bin</parameter>: This installs the
@@ -176,6 +190,48 @@
 /bin/csh</literal>
 EOF</userinput></screen>
 
+      <para>
+        The following <filename>~/.cshrc</filename> provides two alternative
+        colour prompts and coloured <command>ls</command> output. If you prefer
+        a global modification, issue the command as the <systemitem
+        class="username">root</systemitem> user, replacing
+        <filename>~/.cshrc</filename> by <filename>/etc/csh.cshrc</filename>.
+      </para>
+
+<screen><userinput>cat &gt; ~/.cshrc &lt;&lt; "EOF"
+<literal># Original at:
+# https://www.cs.umd.edu/~srhuang/teaching/code_snippets/prompt_color.tcsh.html
+
+# Modified BLFS Development Team:
+
+# Add these lines to your ~/.cshrc (or to /etc/csh.cshrc).
+
+# Colors!
+set     red="%{\033[1;31m%}"
+set   green="%{\033[0;32m%}"
+set  yellow="%{\033[1;33m%}"
+set    blue="%{\033[1;34m%}"
+set magenta="%{\033[1;35m%}"
+set    cyan="%{\033[1;36m%}"
+set   white="%{\033[0;37m%}"
+set     end="%{\033[0m%}" # This is needed at the end...
+
+# Setting the actual prompt.  Two separate versions for you to try, pick
+# whichever one you like better, and change the colors as you want.
+# Just don't mess with the ${end} guy in either line...  Comment out or
+# delete the prompt you don't use.
+
+set prompt="${green}%n${blue}@%m ${white}%~ ${green}%%${end} "
+set prompt="[${green}%n${blue}@%m ${white}%~ ]${end} "
+
+# This was not in the original URL above
+# Provides coloured ls
+alias ls ls --color=always
+
+# Clean up after ourselves...
+unset red green yellow blue magenta cyan yellow white end</literal>
+EOF</userinput></screen>
+
     </sect3>
 
   </sect2>

Modified: trunk/BOOK/server/databases/mariadb.xml
==============================================================================
--- trunk/BOOK/server/databases/mariadb.xml     Fri Aug  7 10:13:02 2015        
(r16331)
+++ trunk/BOOK/server/databases/mariadb.xml     Fri Aug  7 18:03:10 2015        
(r16332)
@@ -6,10 +6,10 @@
 
   <!ENTITY mariadb-download-http 
"https://downloads.mariadb.org/interstitial/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz";>
   <!ENTITY mariadb-download-ftp  
"ftp://mirrors.fe.up.pt/pub/mariadb/mariadb-&mariadb-version;/source/mariadb-&mariadb-version;.tar.gz";>
-  <!ENTITY mariadb-md5sum        "59d6c00827ad56f2ac76340fece32fc0">
+  <!ENTITY mariadb-md5sum        "956561f3798d1fe8dfbe4b665287a87a">
   <!ENTITY mariadb-size          "54 MB">
   <!ENTITY mariadb-buildsize     "1.5 GB (with tests)">
-  <!ENTITY mariadb-time          "5.7 SBU, using parallelism=2 (with tests)">
+  <!ENTITY mariadb-time          "10 SBU, (with tests)">
 ]>
 
 <sect1 id="mariadb" xreflabel="MariaDB-&mariadb-version;">
@@ -121,7 +121,7 @@
 
     <warning>
       <para>
-        MariaDB and MySQL cannot be installed on the same system without 
+        MariaDB and MySQL cannot be installed on the same system without
         extensive changes to the build configuration of one of the two 
applications.
       </para>
     </warning>
@@ -183,7 +183,7 @@
 
     <para>
       <command>sed -i ...</command>: Set correct installation
-      directory for some components. 
+      directory for some components.
     </para>
 
     <para>
@@ -409,12 +409,8 @@
           and several under /usr/lib/mysql/plugin/
         </seg>
         <seg>
-          /etc/mysql,
-          /srv/mysql,
-          /usr/include/mysql,
-          /usr/lib/mysql,
-          /usr/share/doc/mariadb-&mariadb-version;, and
-          /usr/share/mysql
+          /{etc,srv,usr/{include,lib,share}}/mysql and
+          /usr/share/doc/mariadb-&mariadb-version;
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -436,4 +432,4 @@
 
   </sect2>
 
-</sect1>
+</sect1>
\ No newline at end of file

Modified: trunk/BOOK/xsoft/graphweb/firefox.xml
==============================================================================
--- trunk/BOOK/xsoft/graphweb/firefox.xml       Fri Aug  7 10:13:02 2015        
(r16331)
+++ trunk/BOOK/xsoft/graphweb/firefox.xml       Fri Aug  7 18:03:10 2015        
(r16332)
@@ -4,14 +4,14 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY firefox-download-http
-           
"&mozilla-http;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY firefox-download-ftp
-           
"&mozilla-ftp;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
-  <!ENTITY firefox-md5sum        "34d9841bc9b8a85aaf06e311cf1cb263">
+  <!ENTITY firefox-download-http 
"&mozilla-http;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
+<!-- 550 Permission denied.
+  <!ENTITY firefox-download-ftp 
"&mozilla-ftp;/firefox/releases/&firefox-version;/source/firefox-&firefox-version;.source.tar.bz2">
 -->
+  <!ENTITY firefox-download-ftp " ">
+  <!ENTITY firefox-md5sum        "6ef31cbd34d9905a0648104d916269cb">
   <!ENTITY firefox-size          "172 MB">
   <!ENTITY firefox-buildsize     "3.7 GB (74 MB installed)">
-  <!ENTITY firefox-time          "5.6 SBU (using parallelism=10)">
+  <!ENTITY firefox-time          "8.2 SBU (using parallelism=4)">
 ]>
 
 <sect1 id="firefox" xreflabel="Firefox-&firefox-version;">
@@ -78,8 +78,8 @@
     <para role="required">
       <xref linkend="alsa-lib"/>,
       <xref linkend="gtk2"/>,
-      <xref linkend="nss"/>, 
-      <xref linkend="unzip"/>, 
+      <xref linkend="nss"/>,
+      <xref linkend="unzip"/>,
       <xref linkend="yasm"/>, and
       <xref linkend="zip"/>
     </para>
@@ -112,7 +112,7 @@
         exists.  If it does not, reinstall <xref linkend="python2"/> (after
         installing <xref linkend="openssl"/>.  The latest version of any
         <emphasis>currently maintained</emphasis> version of Openssl should be
-        satisfactory if already installed. 
+        satisfactory if already installed.
       </para>
     </note>
 
@@ -125,15 +125,15 @@
       <xref linkend="gst10-plugins-good"/> and
       <xref linkend="gst10-libav"/> at runtime),
       <xref linkend="libnotify"/>,
-      <ulink url="https://code.google.com/p/libproxy/";>libproxy</ulink>,
       <xref linkend="openjdk"/>,
       <xref linkend="pulseaudio"/>,
       <xref linkend="startup-notification"/>,
       <xref linkend="valgrind"/>,
       <xref linkend="wget"/>,
       <xref linkend="wireless_tools"/>,
-      <ulink url="http://hunspell.sourceforge.net/";>Hunspell</ulink>, and
-      <ulink 
url="http://sourceforge.net/projects/liboauth/files/";>liboauth</ulink>
+      <ulink url="http://hunspell.sourceforge.net/";>Hunspell</ulink>,
+      <ulink 
url="http://sourceforge.net/projects/liboauth/files/";>liboauth</ulink>, and
+      <ulink url="https://code.google.com/p/libproxy/";>libproxy</ulink>,
     </para>
 
     <para condition="html" role="usernotes">
@@ -230,12 +230,6 @@
 EOF</userinput></screen>
 
     <para>
-      First, fix building with system freetype-2.6 or later:
-    </para>
-
-<screen><userinput>sed -i '/^ftglyph.h/ i ftfntfmt.h' 
config/system-headers</userinput></screen>
-
-    <para>
       Compile <application>Firefox</application> by issuing the following
       commands:
     </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