[blfs-book] r11756 - in trunk/BOOK: general/graphlib gnome/platform x/lib

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Tue Sep 3 08:50:36 PDT 2013


Author: bdubbs
Date: Tue Sep  3 08:50:35 2013
New Revision: 11756

Log:
A few more tags

Modified:
   trunk/BOOK/general/graphlib/libwebp.xml
   trunk/BOOK/gnome/platform/gcr.xml
   trunk/BOOK/gnome/platform/gnome-keyring.xml
   trunk/BOOK/x/lib/webkitgtk2.xml

Modified: trunk/BOOK/general/graphlib/libwebp.xml
==============================================================================
--- trunk/BOOK/general/graphlib/libwebp.xml	Tue Sep  3 06:39:29 2013	(r11755)
+++ trunk/BOOK/general/graphlib/libwebp.xml	Tue Sep  3 08:50:35 2013	(r11756)
@@ -34,7 +34,7 @@
       and support programs to encode and decode images in WebP format.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/gnome/platform/gcr.xml
==============================================================================
--- trunk/BOOK/gnome/platform/gcr.xml	Tue Sep  3 06:39:29 2013	(r11755)
+++ trunk/BOOK/gnome/platform/gcr.xml	Tue Sep  3 08:50:35 2013	(r11756)
@@ -36,7 +36,7 @@
       <application>GNOME</application> Desktop.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -79,7 +79,7 @@
       <xref linkend="glib2"/>,
       <xref linkend="intltool"/>,
       <xref linkend="libgcrypt"/>,
-      <xref linkend="libtasn1"/> and
+      <xref linkend="libtasn1"/>, and
       <xref linkend="p11-kit"/>
     </para>
 
@@ -87,7 +87,7 @@
     <para role="recommended">
       <xref linkend="gnupg"/> or
       <xref linkend="gnupg2"/>,
-      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gobject-introspection"/>, and
       <xref linkend="gtk3"/>
     </para>
 
@@ -110,7 +110,7 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --libexecdir=/usr/lib/gnome-keyring &&
 make</userinput></screen>
@@ -152,7 +152,7 @@
           gcr-viewer
         </seg>
         <seg>
-          libgck-1.so, libgcr-3.so, libgcr-base-3.so and
+          libgck-1.so, libgcr-3.so, libgcr-base-3.so, and
           libmock-test-module.so
         </seg>
         <seg>
@@ -160,7 +160,7 @@
           /usr/include/gcr-3,
           /usr/lib/gnome-keyring,
           /usr/share/gcr-3,
-          /usr/share/gtk-doc/html/gck and
+          /usr/share/gtk-doc/html/gck, and
           /usr/share/gtk-doc/html/gcr-3
         </seg>
       </seglistitem>

Modified: trunk/BOOK/gnome/platform/gnome-keyring.xml
==============================================================================
--- trunk/BOOK/gnome/platform/gnome-keyring.xml	Tue Sep  3 06:39:29 2013	(r11755)
+++ trunk/BOOK/gnome/platform/gnome-keyring.xml	Tue Sep  3 08:50:35 2013	(r11756)
@@ -36,7 +36,7 @@
       daemon that keeps passwords and other secrets for users.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -106,7 +106,7 @@
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --with-pam-dir=/lib/security &&
 make</userinput></screen>
@@ -143,7 +143,7 @@
 
       <seglistitem>
         <seg>
-          gnome-keyring, gnome-keyring-3 and gnome-keyring-daemon
+          gnome-keyring, gnome-keyring-3, and gnome-keyring-daemon
         </seg>
         <seg>
           gnome-keyring-pkcs11.so and pam_gnome_keyring.so

Modified: trunk/BOOK/x/lib/webkitgtk2.xml
==============================================================================
--- trunk/BOOK/x/lib/webkitgtk2.xml	Tue Sep  3 06:39:29 2013	(r11755)
+++ trunk/BOOK/x/lib/webkitgtk2.xml	Tue Sep  3 08:50:35 2013	(r11756)
@@ -35,7 +35,7 @@
       <application>GTK+ 3</application> platform.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -134,7 +134,10 @@
       following commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr \
+<screen><userinput>sed -i "/%union/i %lex-param {YYLEX_PARAM}" \
+   Source/ThirdParty/ANGLE/src/compiler/glslang.y &&
+
+./configure --prefix=/usr \
             --libexecdir=/usr/lib/webkitgtk3 \
             --enable-introspection &&
 make</userinput></screen>
@@ -143,6 +146,14 @@
       This package does not have a working testsuite.
     </para>
 
+    <note><para>
+      When installing, the Makefile does some additional compiling and linking.
+      If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
+      variables need to be defined for the root user.  If using sudo to assume
+      root, use the -E option to pass your current envronment variables for the
+      install process.
+    </para></note>
+
     <para>
       Now, as the <systemitem class="username">root</systemitem> user:
     </para>
@@ -154,6 +165,11 @@
     <title>Command Explanations</title>
 
     <para>
+      <command>sed ... glslang.y</command>: This command fixes a problem
+      when using bison-3.0 or later.
+    </para>
+
+    <para>
       <option>--enable-introspection</option>: This switch enables support for
       <application>Gobject Introspection</application> and is required for a
       <application>GNOME</application> Desktop. Remove if you don't have



More information about the blfs-book mailing list