Changeset 5edcd4b

Timestamp:

06/29/2013 02:09:52 AM (11 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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:

35d0635

Parents:

4dbf88b

Message:

Fix FreeType

The docs version is different
Add recommended dependencies for the new minor version (libpng and which)
Fix sed to use extended regex

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

Files:

• general.ent (modified) (1 diff)
• general/graphlib/freetype2.xml (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/pango.xml (modified) (2 diffs)

general.ent

@@ -564 +564 @@
 <!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">

general/graphlib/freetype2.xml

@@ -103 +103 @@
     </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"/>
@@ -116 +124 @@
     </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>
@@ -123 +131 @@
     </para>
 
-<screen><userinput>sed -i -e "/AUX.*.gxvalid/s@^# @@" \
-       -e "/AUX.*.otvalid/s@^# @@" \
-       modules.cfg                         &amp;&amp;
-
-sed -i -e "/#.*.SUBPIXEL/s@/\* @@" 
-       -e "/#.*.SUBPIXEL/s@ \*/@@" \
-       include/freetype/config/ftoption.h  &amp;&amp;
-
-./configure --prefix=/usr --disable-static &amp;&amp;
+<screen><userinput>sed -i  -e "/AUX.*.gxvalid/s@^# @@" \
+        -e "/AUX.*.otvalid/s@^# @@" \
+        modules.cfg                         &amp;&amp;
+
+sed -ri -e 's:.*(#.*SUBPIXEL.*) .*:\1:' \
+        include/freetype/config/ftoption.h  &amp;&amp;
+
+./configure --prefix=/usr --disable-static  &amp;&amp;
 make</userinput></screen>
 

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Updated to pango-1.34.1.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Updated to gobject-introspection-1.36.0.</para>
         </listitem>

x/lib/pango.xml

@@ -5 +5 @@
   %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">
@@ -264 +264 @@
           /etc/pango,
           /usr/include/pango-1.0,
-          /usr/lib/pango and
+          /usr/lib/pango, and
           /usr/share/gtk-doc/html/pango
         </seg>