cvs commit: BLFS/BOOK/x/wm wm.xml

bdubbs at linuxfromscratch.org bdubbs at linuxfromscratch.org
Fri May 7 00:33:03 PDT 2004


bdubbs      04/05/07 01:33:03

  Modified:    BOOK     Makefile index.xml
               BOOK/introduction/welcome changelog.xml
               BOOK/x   x.ent
               BOOK/x/lib qt.xml
               BOOK/x/wm wm.xml
  Log:
  qt 3.3.2+restructuring+added alternative build method; broke out window manager intro to separate section
  
  Revision  Changes    Path
  1.5       +1 -1      BLFS/BOOK/Makefile
  
  Index: Makefile
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/Makefile,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile	2 May 2004 22:52:09 -0000	1.4
  +++ Makefile	7 May 2004 07:33:01 -0000	1.5
  @@ -11,7 +11,7 @@
   
   SRCDIR = $(PWD)
   
  -all: blfs-old
  +all: blfs
   
   blfs-old: index.xml
   	@if [ -z $(OUTPUTDIR) ]; then \
  
  
  
  1.452     +3 -3      BLFS/BOOK/index.xml
  
  Index: index.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/index.xml,v
  retrieving revision 1.451
  retrieving revision 1.452
  diff -u -r1.451 -r1.452
  --- index.xml	6 May 2004 13:16:47 -0000	1.451
  +++ index.xml	7 May 2004 07:33:01 -0000	1.452
  @@ -2,9 +2,9 @@
   <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
   			"/usr/share/docbook/docbookx.dtd" [
   
  -<!ENTITY version "CVS-20040506">
  -<!ENTITY releasedate "May 6th, 2004">
  -<!ENTITY pubdate "2004-05-06">
  +<!ENTITY version "CVS-20040507">
  +<!ENTITY releasedate "May 7th, 2004">
  +<!ENTITY pubdate "2004-05-07">
   <!ENTITY blfs-version "cvs">
   
   <!ENTITY % book SYSTEM "book/book.ent">
  
  
  
  1.1112    +7 -0      BLFS/BOOK/introduction/welcome/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/changelog.xml,v
  retrieving revision 1.1111
  retrieving revision 1.1112
  diff -u -r1.1111 -r1.1112
  --- changelog.xml	6 May 2004 20:50:15 -0000	1.1111
  +++ changelog.xml	7 May 2004 07:33:02 -0000	1.1112
  @@ -11,6 +11,13 @@
   
   <itemizedlist>
   
  +<listitem><para>May 7th, 2004 [bdubbs]: updated to qt-3.3.2.  
  +Change to the xml structure.  Added md5sum.  Explained alternative
  +build procedures.</para></listitem>
  +
  +<listitem><para>May 7th, 2004 [bdubbs]: separated the introduction to
  +window managers to a separate section.</para></listitem>
  +
   <listitem><para>May 6th, 2004 [larry]: updated udftools fro 2.4.26
   kernel patch.</para></listitem>
   
  
  
  
  1.16      +1 -1      BLFS/BOOK/x/x.ent
  
  Index: x.ent
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/x.ent,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- x.ent	19 Apr 2004 04:59:27 -0000	1.15
  +++ x.ent	7 May 2004 07:33:02 -0000	1.16
  @@ -13,7 +13,7 @@
   <!-- X Libraries -->
   <!ENTITY x-lib SYSTEM "lib/lib.xml">
   <!ENTITY % lesstif SYSTEM "lib/lesstif/lesstif.ent">
  -<!ENTITY % qt SYSTEM "lib/qt/qt.ent">
  +<!ENTITY % qt SYSTEM "lib/qt.ent">
   <!ENTITY % gtk SYSTEM "lib/gtk/gtk.ent">
   <!ENTITY % atk SYSTEM "lib/atk/atk.ent">
   <!ENTITY % pango SYSTEM "lib/pango/pango.ent">
  
  
  
  1.5       +227 -6    BLFS/BOOK/x/lib/qt.xml
  
  Index: qt.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/lib/qt.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- qt.xml	14 Apr 2004 03:02:41 -0000	1.4
  +++ qt.xml	7 May 2004 07:33:02 -0000	1.5
  @@ -2,11 +2,232 @@
   <?dbhtml filename="qt.html" ?>
   <title>Qt-&qt-version;</title>
   
  -&qt-intro;
  -&qt-inst;
  -&qt-exp;
  -&qt-config;
  -&qt-desc;
  +<sect2>
  +<title>Introduction to <application>Qt</application></title>
   
  -</sect1>
  +<para>The <application>Qt</application> package contains a
  +<application>C++</application> <acronym>GUI</acronym> library. This is useful 
  +for creating graphical applications or executing graphical applications that
  +are dynamically linked to the <application>Qt</application> library. One of the
  +major users of <application>Qt</application> is <application>KDE</application>.</para>
  +
  +<sect3><title>Package information</title>
  +<itemizedlist spacing='compact'>
  +<listitem><para>Download (HTTP): <ulink url="&qt-download-http;"/></para></listitem>
  +<listitem><para>Download (FTP): <ulink url="&qt-download-ftp;"/></para></listitem>
  +<listitem><para>MD5 Sum: &qt-md5sum;</para></listitem>
  +<listitem><para>Download size: &qt-size;</para></listitem>
  +<listitem><para>Estimated Disk space required: &qt-buildsize;</para></listitem>
  +<listitem><para>Estimated build time: &qt-time;</para></listitem></itemizedlist>
  +</sect3>
  +
  +<sect3><title><application>Qt</application> dependencies</title>
  +<sect4><title>Required</title>
  +<para><xref linkend="x-installing"/></para>
  +</sect4>
  +<sect4><title>Recommended</title>
  +<para><xref linkend="libjpeg"/> and <xref linkend="libmng"/>.</para>
  +</sect4>
  +
  +<sect4><title>Optional</title>
  +<para><xref linkend="nas"/>, <xref linkend="cups"/>, <xref linkend="mysql"/>,
  +<xref linkend="postgresql"/>, <ulink url="http://firebird.sourceforge.net/">Firebird</ulink>, 
  +and <ulink url="http://www.unixodbc.org/">unixODBC</ulink>.</para>
  +</sect4>
  +</sect3>
  +</sect2>
  +
  +<sect2>
  +<title>Installation of <application>Qt</application></title>
  +
  +<para>There are several ways to install a complicated package such as <application>Qt</application>.
  +The files are not completely position independent.  Installation procedures execute the 
  +program <filename>pkg-config</filename> to determine the location of package executables, libraries,
  +headers, and other files.  For <application>Qt</application>, <filename>pkg-config</filename> will
  +look for the file <filename>lib/pkgconfig/qt-mt.pc</filename> which must be modified if relocating the 
  +package.  This file is set up correctly by the build process.</para>
  +
  +<para>The default installation places the files in <filename class='directory'>/usr/local/qt/</filename>.
  +Many commercial distributions place the files in the system's 
  +<filename class='directory'>/usr</filename> hierarchy.  The package can also be installed 
  +in an arbitrary directory.</para>
  +
  +<para>This section will demonstrate two different methods.</para>
  +
  +
  +<note><para>The build time for <application>Qt</application> is quite long.  If you want to 
  +save some time and don't want the tutorials and examples, change the first make line to:</para>
  +
  +<para><userinput><command>make sub-tools</command></userinput></para>
  +</note>
  +
  +<sect3>
  +<title>Method 1 - Installing in the <filename class='directory'>/usr</filename> hierarchy</title>
  + 
  +<para>The advantage of this method is that no updates to the <filename>/etc/ld.so.conf</filename>
  +or <filename>/etc/man.conf</filename> files are required. The package files
  +are distributed within several subdirectories of the <filename class='directory'>/usr</filename>
  +hierarchy.  This is the method that most commercial distributions use.</para>
  +
  + 
  +<screen><userinput><command>sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf &&
  +bash
  +export PATH=$PWD/bin:$PATH &&
  +export LD_LIBRARY_PATH=$PWD/lib &&
  +./configure -prefix /usr -docdir /usr/share/doc/qt \
  +    -headerdir /usr/include/qt -plugindir /usr/lib/qt/plugins \
  +    -datadir /usr/share/qt -translationdir /usr/share/qt/translations \
  +    -sysconfdir /etc/qt -qt-gif -system-zlib \
  +    -no-exceptions -thread -plugin-imgfmt-png -system-libpng &&
  +make &&
  +find -type f -name Makefile | xargs sed -i "s at -Wl,-rpath,/usr/lib@@g" &&
  +make install &&
  +ln -sf libqt-mt.so /usr/lib/libqt.so &&
  +cp -r doc/man /usr/share &&
  +cp -r examples /usr/share/doc/qt &&
  +exit</command></userinput></screen>
  +
  +</sect3>
  +
  +<sect3>
  +<title>Method 2 - Installing in  <filename class='directory'>/opt</filename></title>
  +
  +<para>This is the method recommended by the <application>Qt</application> developers.  It
  +has the advantage of keeping all the package files consolidated in a dedicated directory
  +hierarchy.  By using this method, an update can be made without overwriting a previous 
  +installation and users can easily back up to a previous version by changing one symbolic
  +link.</para>
  +
  +<para>The <application>Qt</application> developers use a default location of 
  +<filename class='directory'>/usr/local/qt/</filename>, however this procedure puts the files
  +in <filename class='directory'>/opt/qt-&qt-version;/</filename> and then creates a
  +symbolic link to <filename>/opt/qt/</filename>.</para>
  +
  +
  +<screen><userinput><command>bash
  +export QTDIR=$PWD &&
  +export LD_LIBRARY_PATH=$PWD/lib &&
  +export PATH=$PWD/bin:$PATH &&
  +./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
  +   -system-libmng -system-zlib -system-libjpeg -no-exceptions \
  +   -thread -plugin-imgfmt-png &&
  +make &&
  +make install &&
  +ln -sfn qt-&qt-version; /opt/qt &&
  +ln -s libqt-mt.so /opt/qt/lib/libqt.so &&
  +cp -r doc/man /opt/qt/doc &&
  +cp -r examples /opt/qt/doc
  +exit</command></userinput></screen>
  +
  +<sect4>
  +<title>Configuration</title>
  +
  +<para>For Method 2 only, update the <filename>/etc/ld.so.conf</filename> and  
  +<filename>/etc/man.conf</filename> files.</para>
  +
  +
  +<screen><userinput><command>cat >> /etc/ld.so.conf << "EOF"
  +# Begin qt addition to /etc/ld.so.conf
  +
  +/opt/qt/lib
  +
  +# End qt addition
  +EOF
  +ldconfig
  +
  +cat >> /etc/man.conf << "EOF"
  +# Begin qt addition to man.conf
   
  +MANPATH /opt/qt/doc/man
  +
  +# End qt addition to man.conf
  +EOF</command></userinput></screen>
  +</sect4>
  +</sect3>
  +</sect2>
  +
  +<sect2>
  +<title>Command explanations</title>
  +
  +<para><command>sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf</command>:
  +<command>install</command> is safer than <command>cp</command> when
  +libraries are in use.</para>
  +
  +<para><command>bash</command>: This command enters a sub-shell to isolate 
  +environment changes.</para>
  +
  +<para><command>export QTDIR=$PWD</command>: This command 
  +defines where the root of the Qt directory is located.</para>
  +
  +<para><command>export LD_LIBRARY_PATH=$PWD/lib</command>: This command 
  +sets up the location of libraries for the build process.</para>
  +
  +<para><command>export PATH=$PWD/bin:$PATH</command>: This command 
  +allows the build process to find supporting executables.</para>
  +
  +<para><parameter>-qt-gif</parameter>: This switch adds support for gif
  +files to the libraries.</para>
  +
  +<para><parameter>-system-zlib -system-libpng</parameter>: This switch
  +forces the library to use the shared libraries that are on your system
  +instead of recreating its own set of support libraries for these
  +functions.</para>
  +
  +<para><parameter>-no-exceptions</parameter>: This switch disables
  +the exceptions coding generated by the <application>C++</application> compiler.</para>
  +
  +<para><parameter>-thread</parameter>: This switch adds
  +support for multi-threading.</para>
  +
  +<para><command>find -type f -name Makefile | xargs sed -i "s at -Wl,-rpath,/usr/lib@@g"</command>:
  +This command removes hardcoded run-time path, else
  +<command>uic</command> tries to run with system installed Qt
  +libraries.</para>
  +
  +<para><command>ln -s libqt-mt.so /usr/lib/libqt.so</command>: This
  +command allows configure scripts
  +to find a working <application>Qt</application> installation.</para>
  +
  +<para><command>cp -r doc/man /usr/share (or /opt/qt/doc)</command>: This command
  +installs the man pages which are missed by <command>make install</command>.</para>
  +
  +<para><command>cp -r examples /usr/share/doc/qt (or /opt/qt/doc)</command>: This command
  +installs the examples which are missed by <command>make install</command>.</para>
  +
  +<para><command>exit</command>: This command returns to the parent shell
  +and eliminates environment variables set earlier.</para>
  +
  +</sect2>
  +<sect2>
  +<title>Configuring <application>Qt</application></title>
  +
  +<sect3><title>Configuration Information</title>
  +
  +&library-config;
  +
  +</sect3>
  +
  +</sect2>
  +<sect2>
  +<title>Contents</title>
  +
  +<para>The <application>Qt</application>/<application>X11</application>
  +library contains <acronym>API</acronym>'s necessary to use
  +programs based on Qt <acronym>GUI</acronym> toolkit.</para>
  +
  +<para>The <application>Qt</application> package contains 
  +<command>assistant</command>,
  +<command>designer</command>,
  +<command>linguist</command>,
  +<command>lrelease</command>,
  +<command>lupdate</command>,
  +<command>moc</command>,
  +<command>qm2ts</command>,
  +<command>qmake</command>,
  +<command>qtconfig</command>,
  +<command>uic</command>, and the
  +<filename class="libraryfile">libqt-mt</filename> and 
  +<filename class="libraryfile">libqui</filename> libraries.</para>
  +
  +</sect2>
  +</sect1>
  
  
  
  1.11      +4 -1      BLFS/BOOK/x/wm/wm.xml
  
  Index: wm.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/wm/wm.xml,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- wm.xml	14 Apr 2004 03:02:41 -0000	1.10
  +++ wm.xml	7 May 2004 07:33:03 -0000	1.11
  @@ -2,6 +2,9 @@
   <?dbhtml filename="wm.html" ?>
   <title>Window Managers</title>
   
  +<sect1 id="Introduction">  
  +<title>Introduction</title>
  +
   <para>Window Mangers and Desktop Environments are the primary user
   interfaces into the <application>X</application> Window System.  A window manager is a program 
   that controls the appearance of windows and provides the means by which 
  @@ -31,7 +34,7 @@
   several Window Managers and one lightweight Desktop Environment are
   presented.  Later in the book, both <application><acronym>KDE</acronym></application> and
   <application><acronym>GNOME</acronym></application> have their own Parts.</para>
  -
  +</sect1>
   
   &sawfish;
   &fluxbox;
  
  
  



More information about the blfs-book mailing list