Changeset e641675

Timestamp:

02/16/2019 11:16:14 PM (4 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 8.4, 9.0, 9.1, ken/inkscape-core-mods, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

7b20b74

Parents:

83349bf

Message:

Add harfbuzz as an optional (circular) dependency of cairo.
A few tags.

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

Files:

• general/genutils/xdg-user-dirs.xml (modified) (1 diff)
• general/graphlib/giflib.xml (modified) (2 diffs)
• lxde/desktop/libfm-extra.xml (modified) (1 diff)
• lxde/desktop/lxmenu-data.xml (modified) (1 diff)
• lxde/desktop/menu-cache.xml (modified) (1 diff)
• x/lib/cairo.xml (modified) (2 diffs)

general/genutils/xdg-user-dirs.xml

@@ -39 +39 @@
     </para>
 
-    &lfs83_checked;
+    &lfs84_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

general/graphlib/giflib.xml

@@ -34 +34 @@
     working with GIF files.</para>
 
-    &lfs83_checked;
+    &lfs84_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -83 +83 @@
     <para>Now, as the <systemitem class="username">root</systemitem> user:</para>
 
-<screen role="root"><userinput>make PREFIX=/usr install&amp;&amp;
-rm -v /usr/lib/libgif.a</userinput></screen>
+<screen role="root"><userinput>make PREFIX=/usr install &amp;&amp;
+rm -vf /usr/lib/libgif.a</userinput></screen>
 
     <para>If <xref linkend="xmlto"/> is installed, then the API documentation

lxde/desktop/libfm-extra.xml

@@ -36 +36 @@
     </para>
 
-    &lfs83_checked;
+    &lfs84_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

lxde/desktop/lxmenu-data.xml

@@ -36 +36 @@
     </para>
 
-    &lfs83_checked;
+    &lfs84_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

lxde/desktop/menu-cache.xml

@@ -36 +36 @@
     </para>
 
-    &lfs83_checked;
+    &lfs84_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>

x/lib/cairo.xml

@@ -105 +105 @@
       <xref linkend="gtk3"/> and <xref linkend="gtk2"/>,
       <xref linkend="gtk-doc"/>,
+      <xref linkend="harfbuzz"/>,
       <xref linkend="libdrm"/>,
       <xref linkend="librsvg"/>,
@@ -117 +118 @@
       <ulink url="http://download.qt.io/archive/qt/4.8/">Qt4</ulink>.
     </para>
+
+    <note><para>There is a circular dependency between cairo and harfbuzz.
+    If cairo is built before harbuzz, it is necessary to rebuild cairo
+    after harfbuzz in order to build pango.</para></note>
 
     <para condition="html" role="usernotes">