Author: fernando
Date: Thu Jan 2 06:10:27 2014
New Revision: 12506
Log:
Fixes for the book (patch received, thanks).
Modified:
trunk/BOOK/general/graphlib/aalib.xml
trunk/BOOK/general/graphlib/poppler.xml
trunk/BOOK/gnome/applications/gnome-terminal.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/multimedia/libdriv/faad2.xml
trunk/BOOK/xfce/core/libxfce4util.xml
trunk/BOOK/xfce/core/xfdesktop.xml
Modified: trunk/BOOK/general/graphlib/aalib.xml
==============================================================================
--- trunk/BOOK/general/graphlib/aalib.xml Thu Jan 2 05:52:37 2014
(r12505)
+++ trunk/BOOK/general/graphlib/aalib.xml Thu Jan 2 06:10:27 2014
(r12506)
@@ -78,8 +78,7 @@
<para>Install <application>AAlib</application> by running the following
commands:</para>
-<screen><userinput>
-./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr \
--infodir=/usr/share/info \
--mandir=/usr/share/man \
--disable-static &&
Modified: trunk/BOOK/general/graphlib/poppler.xml
==============================================================================
--- trunk/BOOK/general/graphlib/poppler.xml Thu Jan 2 05:52:37 2014
(r12505)
+++ trunk/BOOK/general/graphlib/poppler.xml Thu Jan 2 06:10:27 2014
(r12506)
@@ -145,6 +145,16 @@
<title>Installation of Poppler</title>
<para>
+ If you are building <application>Qt5</application> library, fix
+ <application>Qt5</application> detection by running the
+ following command:
+ </para>
+
+<screen><userinput>sed -i -e "s:grep \"Qt 5\":grep \"Qt\\\|moc 5\":g" \
+ -e "s:QT_SELECT=qt5:QT_SELECT=5:" \
+ configure</userinput></screen>
+
+ <para>
Install <application>Poppler</application> by running the following
commands:
</para>
Modified: trunk/BOOK/gnome/applications/gnome-terminal.xml
==============================================================================
--- trunk/BOOK/gnome/applications/gnome-terminal.xml Thu Jan 2 05:52:37
2014 (r12505)
+++ trunk/BOOK/gnome/applications/gnome-terminal.xml Thu Jan 2 06:10:27
2014 (r12506)
@@ -5,9 +5,9 @@
%general-entities;
<!ENTITY gnome-terminal-download-http
-
"&gnome-download-http;/gnome-terminal/&gnome-minor;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+
"&gnome-download-http;/gnome-terminal/&gnome-minor;/gnome-terminal-&gnome-terminal-version;.tar.xz">
<!ENTITY gnome-terminal-download-ftp
-
"&gnome-download-ftp;/gnome-terminal/&gnome-minor;/gnome-terminal-&gnome-terminal-version;.tar.xz">
+
"&gnome-download-ftp;/gnome-terminal/&gnome-minor;/gnome-terminal-&gnome-terminal-version;.tar.xz">
<!ENTITY gnome-terminal-md5sum "746417ef4b6252ed3deb8388d8a1a02a">
<!ENTITY gnome-terminal-size "1.7 MB">
<!ENTITY gnome-terminal-buildsize "40 MB">
@@ -82,6 +82,7 @@
<xref linkend="yelp-xsl"/>
</para>
+ <bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<xref linkend="nautilus"/>
</para>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Thu Jan 2 05:52:37
2014 (r12505)
+++ trunk/BOOK/introduction/welcome/changelog.xml Thu Jan 2 06:10:27
2014 (r12506)
@@ -47,6 +47,10 @@
<para>January 2nd, 2014</para>
<itemizedlist>
<listitem>
+ <para>[fernando] - Fixes for the book (patch received, thanks). Fixes
+ <ulink url="&blfs-ticket-root;4513">#4513</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[fernando] - Fix FFmpeg-2.1.1 to build with FreeType-2.5.x.
Fixes <ulink url="&blfs-ticket-root;4512">#4512</ulink>.</para>
</listitem>
Modified: trunk/BOOK/multimedia/libdriv/faad2.xml
==============================================================================
--- trunk/BOOK/multimedia/libdriv/faad2.xml Thu Jan 2 05:52:37 2014
(r12505)
+++ trunk/BOOK/multimedia/libdriv/faad2.xml Thu Jan 2 06:10:27 2014
(r12506)
@@ -91,7 +91,8 @@
following commands:</para>
<screen><userinput>patch -Np1 -i ../faad2-&faad2-version;-mp4ff-1.patch
&&
-sed "s@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g" -i configure.in &&
+sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" configure.in &&
+sed -i "s:man_MANS:man1_MANS:g" frontend/Makefile.am &&
autoreconf -fi &&
./configure --prefix=/usr --disable-static &&
make</userinput></screen>
@@ -138,6 +139,12 @@
to create the <command>configure</command> script and other
required build files.</para> -->
+ <para>
+ <command>sed -i ...</command>: First command fixes autotools scripts to
+ be compatible with latest version of <application>Automake</application>
+ and second command fixes manual page install location.
+ </para>
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="../../xincludes/static-libraries.xml"/>
Modified: trunk/BOOK/xfce/core/libxfce4util.xml
==============================================================================
--- trunk/BOOK/xfce/core/libxfce4util.xml Thu Jan 2 05:52:37 2014
(r12505)
+++ trunk/BOOK/xfce/core/libxfce4util.xml Thu Jan 2 06:10:27 2014
(r12506)
@@ -97,7 +97,7 @@
commands:
</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &&
make</userinput></screen>
<para>
Modified: trunk/BOOK/xfce/core/xfdesktop.xml
==============================================================================
--- trunk/BOOK/xfce/core/xfdesktop.xml Thu Jan 2 05:52:37 2014 (r12505)
+++ trunk/BOOK/xfce/core/xfdesktop.xml Thu Jan 2 06:10:27 2014 (r12506)
@@ -103,7 +103,7 @@
commands:
</para>
-<screen><userinput>./configure --prefix=/usr &&
+<screen><userinput>./configure --prefix=/usr --sysconfdir=/etc &&
make</userinput></screen>
<para>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
