Author: bdubbs
Date: Fri Jun 28 19:09:52 2013
New Revision: 11339
Log:
Fix FreeType
The docs version is different
Add recommended dependencies for the new minor version (libpng and which)
Fix sed to use extended regex
Modified:
trunk/BOOK/general.ent
trunk/BOOK/general/graphlib/freetype2.xml
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/pango.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Fri Jun 28 13:05:21 2013 (r11338)
+++ trunk/BOOK/general.ent Fri Jun 28 19:09:52 2013 (r11339)
@@ -563,7 +563,7 @@
<!ENTITY hicolor-icon-theme-version "0.12">
<!ENTITY libnotify-version "0.7.5">
<!ENTITY libxklavier-version "5.3">
-<!ENTITY pango-version "1.32.5">
+<!ENTITY pango-version "1.34.1">
<!ENTITY pangox-version "0.0.2">
<!ENTITY pangomm-version "2.28.4">
<!ENTITY qt4-version "4.8.4">
Modified: trunk/BOOK/general/graphlib/freetype2.xml
==============================================================================
--- trunk/BOOK/general/graphlib/freetype2.xml Fri Jun 28 13:05:21 2013
(r11338)
+++ trunk/BOOK/general/graphlib/freetype2.xml Fri Jun 28 19:09:52 2013
(r11339)
@@ -102,6 +102,14 @@
</listitem>
</itemizedlist>
+ <bridgehead renderas="sect3">FreeType2 Dependencies</bridgehead>
+
+ <bridgehead renderas="sect4">Recommended</bridgehead>
+ <para role="recommended">
+ <xref linkend="which"/> and
+ <xref linkend="libpng"/>
+ </para>
+
<para condition="html" role="usernotes">User Notes:
<ulink url="&blfs-wiki;/freetype2"/>
</para>
@@ -115,22 +123,21 @@
source tree using the following command:
</para>
-<screen><userinput>tar -xf ../freetype-doc-&freetype2-version;.tar.bz2
--strip-components=2 -C docs</userinput></screen>
+<screen><userinput>tar -xf ../freetype-doc-&freetype2-doc-version;.tar.bz2
--strip-components=2 -C docs</userinput></screen>
<para>
Install <application>FreeType2</application> by running the following
commands:
</para>
-<screen><userinput>sed -i -e "/AUX.*.gxvalid/s@^# @@" \
- -e "/AUX.*.otvalid/s@^# @@" \
- modules.cfg &&
-
-sed -i -e "/#.*.SUBPIXEL/s@/\* @@"
- -e "/#.*.SUBPIXEL/s@ \*/@@" \
- include/freetype/config/ftoption.h &&
+<screen><userinput>sed -i -e "/AUX.*.gxvalid/s@^# @@" \
+ -e "/AUX.*.otvalid/s@^# @@" \
+ modules.cfg &&
+
+sed -ri -e 's:.*(#.*SUBPIXEL.*) .*:\1:' \
+ include/freetype/config/ftoption.h &&
-./configure --prefix=/usr --disable-static &&
+./configure --prefix=/usr --disable-static &&
make</userinput></screen>
<para>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Fri Jun 28 13:05:21
2013 (r11338)
+++ trunk/BOOK/introduction/welcome/changelog.xml Fri Jun 28 19:09:52
2013 (r11339)
@@ -47,6 +47,9 @@
<para>June 28th, 2013</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Updated to pango-1.34.1.</para>
+ </listitem>
+ <listitem>
<para>[bdubbs] - Updated to gobject-introspection-1.36.0.</para>
</listitem>
<listitem>
Modified: trunk/BOOK/x/lib/pango.xml
==============================================================================
--- trunk/BOOK/x/lib/pango.xml Fri Jun 28 13:05:21 2013 (r11338)
+++ trunk/BOOK/x/lib/pango.xml Fri Jun 28 19:09:52 2013 (r11339)
@@ -4,12 +4,12 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY pango-download-http
"&gnome-download-http;/pango/1.32/pango-&pango-version;.tar.xz">
- <!ENTITY pango-download-ftp
"&gnome-download-ftp;/pango/1.32/pango-&pango-version;.tar.xz">
- <!ENTITY pango-md5sum "8e846804d6e219bc795a26a4a39b5bfd">
- <!ENTITY pango-size "976 KB">
- <!ENTITY pango-buildsize "26 MB">
- <!ENTITY pango-time "0.2 SBU">
+ <!ENTITY pango-download-http
"&gnome-download-http;/pango/1.34/pango-&pango-version;.tar.xz">
+ <!ENTITY pango-download-ftp
"&gnome-download-ftp;/pango/1.34/pango-&pango-version;.tar.xz">
+ <!ENTITY pango-md5sum "e36dc70c0e246db84b41736a40edf7a0">
+ <!ENTITY pango-size "996 KB">
+ <!ENTITY pango-buildsize "33 MB">
+ <!ENTITY pango-time "0.3 SBU">
<!ENTITY pangox-download-http
"&gnome-download-http;/pangox-compat/0.0/pangox-compat-&pangox-version;.tar.xz">
<!ENTITY pangox-download-ftp
"&gnome-download-ftp;/pangox-compat/0.0/pangox-compat-&pangox-version;.tar.xz">
@@ -263,7 +263,7 @@
<seg>
/etc/pango,
/usr/include/pango-1.0,
- /usr/lib/pango and
+ /usr/lib/pango, and
/usr/share/gtk-doc/html/pango
</seg>
</seglistitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
