cvs commit: BLFS/BOOK/x/wm/sawfish sawfish-exp.xml sawfish-inst.xml sawfish-intro.xml

larry at linuxfromscratch.org larry at linuxfromscratch.org
Sat Aug 31 08:36:53 PDT 2002


larry       02/08/31 08:36:53

  Modified:    BOOK     index.xml
               BOOK/gnome gnome.ent
               BOOK/gnome/lib lib.xml
               BOOK/gnome/lib/gnomelib gnome-libs-intro.xml
               BOOK/gnome/lib/libglade libglade-intro.xml
               BOOK/introduction/welcome changelog.xml credits.xml
               BOOK/x/wm/sawfish sawfish-exp.xml sawfish-inst.xml
                        sawfish-intro.xml
  Added:       BOOK/gnome/lib gnome-common.xml
               BOOK/gnome/lib/gnome-common gnome-common-desc.xml
                        gnome-common-inst.xml gnome-common-intro.xml
                        gnome-common.ent
  Log:
  add gnome-common-1..2.4, update sawfish
  
  Revision  Changes    Path
  1.39      +2 -2      BLFS/BOOK/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/index.xml,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- index.xml	30 Aug 2002 19:53:38 -0000	1.38
  +++ index.xml	31 Aug 2002 15:36:52 -0000	1.39
  @@ -2,8 +2,8 @@
   <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
   			"/usr/share/docbook/docbookx.dtd" [
   
  -<!ENTITY version "20020830">
  -<!ENTITY releasedate "August 30th, 2002">
  +<!ENTITY version "20020831">
  +<!ENTITY releasedate "August 31st, 2002">
   
   <!ENTITY % book SYSTEM "book/book.ent">
   <!ENTITY % preface SYSTEM "preface/preface.ent">
  
  
  
  1.10      +2 -0      BLFS/BOOK/gnome/gnome.ent
  
  Index: gnome.ent
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/gnome.ent,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- gnome.ent	28 Aug 2002 03:30:25 -0000	1.9
  +++ gnome.ent	31 Aug 2002 15:36:52 -0000	1.10
  @@ -10,6 +10,7 @@
   <!ENTITY % gnome-libs SYSTEM "lib/gnomelib/gnome-libs.ent">
   <!ENTITY % gtk-doc SYSTEM "lib/gtk-doc/gtk-doc.ent">
   <!ENTITY % linc SYSTEM "lib/linc/linc.ent">
  +<!ENTITY % gnome-common SYSTEM "lib/gnome-common/gnome-common.ent">
   %libglade;
   %intltool;
   %scrollkeeper;
  @@ -18,6 +19,7 @@
   %gnome-libs;
   %gtk-doc;
   %linc;
  +%gnome-common;
   
   <!-- Gnome Core -->
   <!ENTITY gnome-core SYSTEM "core/core.xml">
  
  
  
  1.14      +5 -4      BLFS/BOOK/gnome/lib/lib.xml
  
  Index: lib.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/lib/lib.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- lib.xml	28 Aug 2002 03:30:25 -0000	1.13
  +++ lib.xml	31 Aug 2002 15:36:53 -0000	1.14
  @@ -42,13 +42,14 @@
   libghttp
   </screen></para>
   
  -&gtk-doc;
  -&gdk;
  +&libglade;
   &intltool;
   &scrollkeeper;
  +&gtk-doc;
  +&linc;
  +&gnome-common;
   &ORBit;
   &gnome-libs;
  -&linc;
  -&libglade;
  +&gdk;
   
   </chapter>
  
  
  
  1.1                  BLFS/BOOK/gnome/lib/gnome-common.xml
  
  Index: gnome-common.xml
  ===================================================================
  <sect1 id="gnome-common" xreflabel="gnome-common-&gnome-common-version;">
  <?dbhtml filename="gnome-common.html" dir="gnome"?>
  <title>gnome-common-&gnome-common-version;</title>
  
  &gnome-common-intro;
  &gnome-common-inst;
  &gnome-common-desc;
  
  </sect1>
  
  
  
  
  1.1                  BLFS/BOOK/gnome/lib/gnome-common/gnome-common-desc.xml
  
  Index: gnome-common-desc.xml
  ===================================================================
  <sect2>
  <title>Contents</title>
  
  <para>The gnome-common package contains <userinput>GNOME macros</userinput>.</para>
  
  </sect2>
  
  
  
  
  1.1                  BLFS/BOOK/gnome/lib/gnome-common/gnome-common-inst.xml
  
  Index: gnome-common-inst.xml
  ===================================================================
  <sect2>
  <title>Installation of gnome-common</title>
  
  <para>Install gnome-common by running the following commands:</para>
  
  <para><screen><userinput>./configure --prefix=/opt/gnome2 &&
  make &&
  make install</userinput></screen></para>
  
  </sect2>
  
  
  
  
  1.1                  BLFS/BOOK/gnome/lib/gnome-common/gnome-common-intro.xml
  
  Index: gnome-common-intro.xml
  ===================================================================
  <sect2>
  <title>Introduction to gnome-common</title>
  
  <screen>Download location (HTTP):       <ulink url="&gnome-common-download-http;"/>
  Download location (FTP):        <ulink url="&gnome-common-download-ftp;"/>
  Version used:                   &gnome-common-version;
  Package size:                   &gnome-common-size;
  Estimated Disk space required:  &gnome-common-buildsize;</screen>
  
  <para>The gnome-common package contains the common macros for the GNOME
  2 environment.</para>
  
  <screen>gnome-common depends on:
  <xref linkend="pkgconfig"/></screen>
  
  </sect2>
  
  
  
  1.1                  BLFS/BOOK/gnome/lib/gnome-common/gnome-common.ent
  
  Index: gnome-common.ent
  ===================================================================
  <!ENTITY gnome-common SYSTEM "../gnome-common.xml">
  <!ENTITY gnome-common-intro SYSTEM "gnome-common-intro.xml">
  <!ENTITY gnome-common-inst SYSTEM "gnome-common-inst.xml">
  <!ENTITY gnome-common-exp SYSTEM "gnome-common-exp.xml">
  <!ENTITY gnome-common-desc SYSTEM "gnome-common-desc.xml">
  <!ENTITY gnome-common-config SYSTEM "gnome-common-config.xml">
  <!ENTITY gnome-common-buildsize "1.2 MB">
  <!ENTITY gnome-common-version "1.2.4">
  <!ENTITY gnome-common-download-http "http://ftp.gnome.org/pub/GNOME/2.0.1/sources/gnome-common/gnome-common-1.2.4.tar.gz">
  <!ENTITY gnome-common-download-ftp "ftp://ftp.gnome.org/pub/GNOME/2.0.1/source/gnome-common/gnome-common-1.2.4.tar.gz">
  <!ENTITY gnome-common-size "216 KB">
  
  
  
  1.3       +1 -1      BLFS/BOOK/gnome/lib/gnomelib/gnome-libs-intro.xml
  
  Index: gnome-libs-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/lib/gnomelib/gnome-libs-intro.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- gnome-libs-intro.xml	27 Aug 2002 13:55:09 -0000	1.2
  +++ gnome-libs-intro.xml	31 Aug 2002 15:36:53 -0000	1.3
  @@ -13,6 +13,6 @@
   <screen>gnome-libs depends on:
   <xref linkend="ORBit"/>, <xref linkend="GTK"/>, <xref linkend="imlib"/> and <xref linkend="db"/>
   gnome-libs will utilize:
  -<xref linkend="audiofile"/>, <xref linkend="esound"/>, gtk-doc and <xref linkend="DocBook"/></screen>
  +<xref linkend="audiofile"/>, <xref linkend="esound"/> and <xref linkend="gtk-doc"/></screen>
   
   </sect2>
  
  
  
  1.4       +1 -1      BLFS/BOOK/gnome/lib/libglade/libglade-intro.xml
  
  Index: libglade-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/lib/libglade/libglade-intro.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- libglade-intro.xml	30 Aug 2002 19:53:38 -0000	1.3
  +++ libglade-intro.xml	31 Aug 2002 15:36:53 -0000	1.4
  @@ -13,7 +13,7 @@
   <screen>libglade depends on:
   <xref linkend="libxml2"/> and <xref linkend="GTK2"/>
   libglade will utilize:
  -gnome-libs</screen>
  +<xref linkend="Python"/> if compiled utilizing expat.</screen>
   
   <para>If you have not installed GTK-&GTK2-version; or if you want
   libglade-1 in addition to libglade-2, then install libglade-0.17:</para>
  
  
  
  1.103     +4 -0      BLFS/BOOK/introduction/welcome/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/changelog.xml,v
  retrieving revision 1.102
  retrieving revision 1.103
  diff -u -r1.102 -r1.103
  --- changelog.xml	31 Aug 2002 01:58:23 -0000	1.102
  +++ changelog.xml	31 Aug 2002 15:36:53 -0000	1.103
  @@ -10,6 +10,10 @@
   
   <itemizedlist>
   
  +<listitem><para>August 31st, 2002 [larry]: Gnome; Added
  +gnome-common-1.2.4 and reworked sawfish to dance around its conflict
  +with gdk-pixbuf.</para></listitem>
  +
   <listitem><para>August 30th, 2002 [larry]: General: Fixed path
   errors in gcc and gnat instructions. Updated links.</para></listitem>
   
  
  
  
  1.48      +1 -1      BLFS/BOOK/introduction/welcome/credits.xml
  
  Index: credits.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/credits.xml,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- credits.xml	30 Aug 2002 02:35:02 -0000	1.47
  +++ credits.xml	31 Aug 2002 15:36:53 -0000	1.48
  @@ -75,7 +75,7 @@
   
   <listitem><para>ATK, audiofile, bc, cdrdao, cdrtools, cpio, curl, dhcp,
   DocBook, enlightenment, esound, fcron, fluxbox, FNLIB, gcc, gdbm, gmp, gnat,
  -imlib, GLib2, gnome-libs, GTK+2, gtk-doc, intltool, j2sdk, libao,
  +imlib, GLib2, gnome-common, gnome-libs, GTK+2, gtk-doc, intltool, j2sdk, libao,
   libglade, libogg, librep, lame, libvorbis, libxml2, libxslt, linc, mutt, OpenSSH, ORBit, Pango, pccts, pcre, pkgconfig, postfix, procmail, Python, QT, rep-gtk, ruby, sawfish, scrollkeeper, unzip, vorbis-tools, wget, XFce and zip: <emphasis>Larry Lawrence</emphasis></para></listitem>
   
   <listitem><para>CDParanoia, mpg123, SDL and XMMS: <emphasis>Jeroen
  
  
  
  1.2       +3 -1      BLFS/BOOK/x/wm/sawfish/sawfish-exp.xml
  
  Index: sawfish-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/wm/sawfish/sawfish-exp.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sawfish-exp.xml	20 Aug 2002 01:39:46 -0000	1.1
  +++ sawfish-exp.xml	31 Aug 2002 15:36:53 -0000	1.2
  @@ -6,7 +6,9 @@
   control center.</para>
   
   <para><userinput>--with-gdk-pixbuf :</userinput> This command directs
  -sawfish to use gdk-pixbuf for image management instead of imlib.</para>
  +sawfish to use gdk-pixbuf for image management instead of imlib. GTK+2
  +includes gdk-pixbuf in its package, whereas GTK+ requires an additional
  +package called gdk-pixbuf.</para>
   
   <para><userinput>--with-audiofile :</userinput> This command directs
   sawfish to use libaudiofile for sound manipulation.</para>
  
  
  
  1.2       +8 -1      BLFS/BOOK/x/wm/sawfish/sawfish-inst.xml
  
  Index: sawfish-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/wm/sawfish/sawfish-inst.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sawfish-inst.xml	20 Aug 2002 01:39:46 -0000	1.1
  +++ sawfish-inst.xml	31 Aug 2002 15:36:53 -0000	1.2
  @@ -1,10 +1,17 @@
   <sect2>
   <title>Installation of sawfish</title>
   
  -<para>Install sawfish by running the following commands:</para>
  +<para>Install sawfish-&sawfish-version;  by running the following commands:</para>
   
   <para><screen><userinput>./configure --prefix=/usr --libexec=/usr/sbin --infodir=/usr/share/info --enable-capplet \
    --with-gdk-pixbuf --with-gnome-prefix=/opt/gnome2 &&
  +make &&
  +make install</userinput></screen></para>
  +
  +<para>Install sawfish-1.1-GTK1 by running the following commands:</para>
  +
  +<para><screen><userinput>./configure --prefix=/usr --libexec=/usr/sbin --infodir=/usr/share/info --enable-capplet \
  +--with-gdk-pixbuf --with-gnome-prefix=/opt/gnome &&
   make &&
   make install</userinput></screen></para>
   
  
  
  
  1.4       +10 -5     BLFS/BOOK/x/wm/sawfish/sawfish-intro.xml
  
  Index: sawfish-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/wm/sawfish/sawfish-intro.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sawfish-intro.xml	31 Aug 2002 03:24:26 -0000	1.3
  +++ sawfish-intro.xml	31 Aug 2002 15:36:53 -0000	1.4
  @@ -12,13 +12,18 @@
   configurable and all user-interface policy is controlled through the
   extension language.</para>
   
  -<screen>sawfish depends on:
  +<screen>sawfish-&sawfish-version; depends on:
   <xref linkend="xfree86"/>, <xref linkend="imlib"/>, <xref linkend="librep"/>, <xref linkend="rep-gtk"/> and <xref linkend="GTK2"/>
   sawfish will utilize:
  -<xref linkend="audiofile"/>, <xref linkend="libglade"/> and <xref linkend="esound"/></screen>
  +<xref linkend="audiofile"/>, <xref linkend="libglade"/> and <xref linkend="esound"/>
  +sawfish will <emphasis>not</emphasis> build with this package installed:
  +<xref linkend="gdk"/></screen>
   
  -<para>Use sawfish-1.1-gtk1 if you do not have GTK2 installed. The
  -install directions are the same, except for
  ---with-gnome-prefix=/opt/gnome and <xref linkend="gdk"/> is required.</para>
  +<para>Use sawfish-1.1-gtk1 if you do not have GTK2 installed.</para>
  +
  +<screen>sawfish-1.1-gtk1 depends on:
  +<xref linkend="xfree86"/>, <xref linkend="imlib"/> or <xref linkend="gdk"/>, <xref linkend="librep"/>, <xref linkend="GTK"/> and rep-gtk-0.15
  +sawfish will utilize:
  +<xref linkend="audiofile"/>, <xref linkend="esound"/> and libglade-0.17</screen>
   
   </sect2>
  
  
  
-- 
Unsubscribe: send email to listar at linuxfromscratch.org
and put 'unsubscribe blfs-book' in the subject header of the message



More information about the blfs-book mailing list