[blfs-book] r11782 - in trunk/BOOK: archive server/mail x/installing x/lib xsoft/other

bdubbs at higgs.linuxfromscratch.org bdubbs at higgs.linuxfromscratch.org
Fri Sep 6 12:06:42 PDT 2013


Author: bdubbs
Date: Fri Sep  6 12:06:41 2013
New Revision: 11782

Log:
Move goffice 0.8 to archive since nothing in the book uses it.
More tags.

Added:
   trunk/BOOK/archive/goffice.xml
      - copied, changed from r11781, trunk/BOOK/x/lib/goffice.xml
Deleted:
   trunk/BOOK/x/lib/goffice.xml
Modified:
   trunk/BOOK/server/mail/exim.xml
   trunk/BOOK/x/installing/x7driver-mga.xml
   trunk/BOOK/x/lib/agg.xml
   trunk/BOOK/x/lib/goffice010.xml
   trunk/BOOK/x/lib/lib.xml
   trunk/BOOK/xsoft/other/balsa.xml
   trunk/BOOK/xsoft/other/blueman.xml
   trunk/BOOK/xsoft/other/pidgin.xml
   trunk/BOOK/xsoft/other/rox-filer.xml
   trunk/BOOK/xsoft/other/xchat.xml

Copied and modified: trunk/BOOK/archive/goffice.xml (from r11781, trunk/BOOK/x/lib/goffice.xml)
==============================================================================
--- trunk/BOOK/x/lib/goffice.xml	Fri Sep  6 10:46:32 2013	(r11781, copy source)
+++ trunk/BOOK/archive/goffice.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -41,7 +41,7 @@
       load/save routines for application documents and undo/redo functions.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -84,7 +84,7 @@
       <xref linkend="GConf"/>,
       <xref linkend="gtk2"/>,
       <xref linkend="intltool"/>,
-      <xref linkend="libgsf"/> and
+      <xref linkend="libgsf"/>, and
       <xref linkend="which"/>
     </para>
 
@@ -107,6 +107,7 @@
     </para>
 
 <screen><userinput>sed -i 's#info (r, NULL#full&, 0#' goffice/utils/regutf8.c &&
+
 ./configure --prefix=/usr --disable-static &&
 make</userinput></screen>
 
@@ -156,7 +157,7 @@
         <seg>
           /usr/include/libgoffice-0.8,
           /usr/lib/goffice,
-          /usr/share/gtk-doc/html/goffice-0.8 and
+          /usr/share/gtk-doc/html/goffice-0.8, and
           /usr/share/pixmaps/goffice.
         </seg>
       </seglistitem>

Modified: trunk/BOOK/server/mail/exim.xml
==============================================================================
--- trunk/BOOK/server/mail/exim.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/server/mail/exim.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -33,7 +33,7 @@
     Transport Agent written by the University of Cambridge, released
     under the GNU Public License.</para>
 
-    &lfs73_built;
+    &lfs74_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/x/installing/x7driver-mga.xml
==============================================================================
--- trunk/BOOK/x/installing/x7driver-mga.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/x/installing/x7driver-mga.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -32,7 +32,7 @@
         G4xx, G5xx, Millennium II and Mystique G200 chipsets.
       </para>
 
-      &lfs73_checked;
+      &lfs74_built;
 
       <bridgehead renderas="sect4">Package Information</bridgehead>
       <itemizedlist spacing="compact">

Modified: trunk/BOOK/x/lib/agg.xml
==============================================================================
--- trunk/BOOK/x/lib/agg.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/x/lib/agg.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -36,7 +36,7 @@
       where high quality 2D graphics is an essential part of the project.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -77,7 +77,7 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="pkgconfig"/>,
-      <xref linkend="sdl"/> and
+      <xref linkend="sdl"/>, and
       <xref linkend="xorg7-lib"/>
     </para>
 
@@ -94,8 +94,10 @@
       commands:
     </para>
 
-<screen><userinput>sed -i 's:  -L at x_libraries@::' src/platform/X11/Makefile.am &&
-sed -i '/^AM_C_PROTOTYPES/d' configure.in &&
+<screen><userinput>
+sed -i 's:  -L at x_libraries@::' src/platform/X11/Makefile.am &&
+sed -i '/^AM_C_PROTOTYPES/d'   configure.in                 &&
+
 bash autogen.sh --prefix=/usr --disable-static &&
 make</userinput></screen>
 
@@ -148,10 +150,10 @@
         <seg>
           libagg.so,
           libaggfontfreetype.so,
-          libaggplatformsdl.so and
-          libaggplatformX11.so.
+          libaggplatformsdl.so, and
+          libaggplatformX11.so
         </seg>
-        <seg>/usr/include/agg2.</seg>
+        <seg>/usr/include/agg2</seg>
       </seglistitem>
     </segmentedlist>
 

Modified: trunk/BOOK/x/lib/goffice010.xml
==============================================================================
--- trunk/BOOK/x/lib/goffice010.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/x/lib/goffice010.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -24,7 +24,7 @@
 
   <title>GOffice-&goffice010-version;</title>
 
-  <indexterm zone="goffice">
+  <indexterm zone="goffice010">
     <primary sortas="a-GOffice">GOffice</primary>
   </indexterm>
 
@@ -41,7 +41,7 @@
       load/save routines for application documents and undo/redo functions.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -83,7 +83,7 @@
     <para role="required">
       <xref linkend="gtk3"/>,
       <xref linkend="libgsf"/>,
-      <xref linkend="librsvg"/> and
+      <xref linkend="librsvg"/>, and
       <xref linkend="which"/>
     </para>
 
@@ -93,7 +93,7 @@
       <ulink url="http://www.freedesktop.org/wiki/Software/libspectre">
       libspectre</ulink>,
       <xref linkend="gs"/>,
-      <xref linkend="gobject-introspection"/> and
+      <xref linkend="gobject-introspection"/>, and
       <xref linkend="gtk-doc"/>
     </para>
 
@@ -149,7 +149,7 @@
         </seg>
         <seg>
           /usr/include/libgoffice-0.10,
-          /usr/lib/goffice and
+          /usr/lib/goffice, and
           /usr/share/gtk-doc/html/goffice-0.10
         </seg>
       </seglistitem>

Modified: trunk/BOOK/x/lib/lib.xml
==============================================================================
--- trunk/BOOK/x/lib/lib.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/x/lib/lib.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -37,7 +37,6 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="clutter-gtk.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="freeglut.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gdk-pixbuf.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="goffice.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="goffice010.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="gtk+3.xml"/>

Modified: trunk/BOOK/xsoft/other/balsa.xml
==============================================================================
--- trunk/BOOK/xsoft/other/balsa.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/xsoft/other/balsa.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -32,7 +32,7 @@
     <para>The <application>Balsa</application> package contains a
     <application>GNOME</application>-2 based mail client.</para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -83,7 +83,7 @@
       <xref linkend="compface"/>,
       <xref linkend="mitkrb"/>,
       <xref linkend="libnotify"/>,
-      <xref linkend="sqlite"/>, and and
+      <xref linkend="sqlite"/>, and 
       <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> command, note that it is only used if you
       didn't install the recommended <application>libESMTP</application>

Modified: trunk/BOOK/xsoft/other/blueman.xml
==============================================================================
--- trunk/BOOK/xsoft/other/blueman.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/xsoft/other/blueman.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -34,7 +34,7 @@
       Bluetooth manager.
     </para>
 
-    &lfs73_built;
+    &lfs74_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -79,7 +79,7 @@
       <xref linkend="gtk2"/>,
       <xref linkend="notify-python"/>,
       <xref linkend="pygtk"/> (with <xref linkend="gtk2"/> support),
-      <xref linkend="pyrex"/> and
+      <xref linkend="pyrex"/>, and
       <xref linkend="startup-notification"/>
     </para>
 
@@ -148,14 +148,14 @@
       <seglistitem>
         <seg>
           blueman-adapters, blueman-applet, blueman-assistant, blueman-browse,
-          blueman-manager, blueman-sendto and blueman-services
+          blueman-manager, blueman-sendto, and blueman-services
         </seg>
         <seg>
           None
         </seg>
         <seg>
           /usr/lib/blueman,
-          /usr/lib/python&python2-majorver;/site-packages/blueman and
+          /usr/lib/python&python2-majorver;/site-packages/blueman, and
           /usr/share/blueman
         </seg>
       </seglistitem>

Modified: trunk/BOOK/xsoft/other/pidgin.xml
==============================================================================
--- trunk/BOOK/xsoft/other/pidgin.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/xsoft/other/pidgin.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -35,7 +35,7 @@
       GroupWise, MSN, Jabber, IRC, Napster, Gadu-Gadu, SILC, Zephyr and Yahoo!
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -120,7 +120,7 @@
       <xref linkend="startup-notification"/>,
       <xref linkend="sqlite"/> (required for the Contact Availability Prediction
       plugin),
-      <xref linkend="tcl"/> and
+      <xref linkend="tcl"/>, and
       <ulink url="http://packages.debian.org/stable/source/zephyr">Zephyr</ulink>
     </para>
 
@@ -289,11 +289,11 @@
       <seglistitem>
         <seg>
           finch, pidgin, purple-client-example,
-          purple-remote, purple-send, purple-send-async and
+          purple-remote, purple-send, purple-send-async, and
           purple-url-handler
         </seg>
         <seg>
-          libgnt.so, libpurple.so and libpurple-client.so
+          libgnt.so, libpurple.so, and libpurple-client.so
         </seg>
         <seg>
           /usr/include/finch,
@@ -306,7 +306,7 @@
           /usr/lib/purple-2,
           /usr/share/doc/pidgin-&pidgin-version;,
           /usr/share/pixmaps/pidgin,
-          /usr/share/purple and
+          /usr/share/purple, and
           /usr/share/sounds/purple
         </seg>
       </seglistitem>

Modified: trunk/BOOK/xsoft/other/rox-filer.xml
==============================================================================
--- trunk/BOOK/xsoft/other/rox-filer.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/xsoft/other/rox-filer.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -35,7 +35,7 @@
       manager.
     </para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">

Modified: trunk/BOOK/xsoft/other/xchat.xml
==============================================================================
--- trunk/BOOK/xsoft/other/xchat.xml	Fri Sep  6 10:46:32 2013	(r11781)
+++ trunk/BOOK/xsoft/other/xchat.xml	Fri Sep  6 12:06:41 2013	(r11782)
@@ -34,7 +34,7 @@
     publicly, have private one-on-one conversations, etc.  File transfers are
     also possible.</para>
 
-    &lfs73_checked;
+    &lfs74_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -82,7 +82,7 @@
       <xref linkend="dbus-glib"/>,
       <xref linkend="GConf"/>,
       <xref linkend="openssl"/>,
-      <xref linkend="python2"/> and
+      <xref linkend="python2"/>, and
       <xref linkend="tcl"/>
     </para>
 
@@ -98,7 +98,9 @@
     commands:</para>
 
 <screen><userinput>patch -Np1 -i ../xchat-&xchat-version;-glib-2.31-1.patch &&
-LIBS+="-lgmodule-2.0" ./configure --prefix=/usr \
+
+LIBS+="-lgmodule-2.0"         \
+./configure --prefix=/usr     \
             --sysconfdir=/etc \
             --enable-shm &&
 make</userinput></screen>



More information about the blfs-book mailing list