cvs commit: BLFS/BOOK/x/lib/qt qt-config.xml qt-desc.xml qt-exp.xml qt-inst.xml qt-intro.xml

igor at linuxfromscratch.org igor at linuxfromscratch.org
Thu Apr 22 14:35:37 PDT 2004


igor        04/04/22 15:35:36

  Modified:    BOOK/book library-config.xml
               BOOK/gnome gnome.ent
               BOOK/introduction/welcome changelog.xml
               BOOK/x/lib/qt qt-config.xml qt-desc.xml qt-exp.xml
                        qt-inst.xml qt-intro.xml
  Log:
  moved qt to /usr
  
  Revision  Changes    Path
  1.6       +1 -1      BLFS/BOOK/book/library-config.xml
  
  Index: library-config.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/book/library-config.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- library-config.xml	8 Sep 2003 19:55:35 -0000	1.5
  +++ library-config.xml	22 Apr 2004 21:35:36 -0000	1.6
  @@ -1,7 +1,7 @@
   <para>As with most libraries, there is no configuration to do, save that
   the library directory i.e. <filename class="directory">/opt/lib</filename> or
   <filename class="directory">/usr/local/lib</filename> should appear in
  -<filename>/etc/ld.so.conf</filename> so that ldd can find the shared
  +<filename>/etc/ld.so.conf</filename> so that <command>ldd</command> can find the shared
   libraries.  After checking that this is the case,
   <command>/sbin/ldconfig</command> should be run while logged in as
   root.</para>
  
  
  
  1.90      +40 -40    BLFS/BOOK/gnome/gnome.ent
  
  Index: gnome.ent
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/gnome/gnome.ent,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- gnome.ent	21 Apr 2004 19:46:08 -0000	1.89
  +++ gnome.ent	22 Apr 2004 21:35:36 -0000	1.90
  @@ -6,75 +6,81 @@
   <!ENTITY gnome-lib SYSTEM "lib/lib.xml">
   <!ENTITY gnome-lib-config SYSTEM "lib/lib-config.xml">
   <!ENTITY % gtk-doc SYSTEM "lib/gtk-doc/gtk-doc.ent">
  -<!ENTITY % libIDL SYSTEM "lib/libidl/libidl.ent">
  -<!ENTITY % orbit2 SYSTEM "lib/orbit/orbit2.ent">
  -<!ENTITY % intltool SYSTEM "lib/intltool/intltool.ent">
  -<!ENTITY % libbonobo SYSTEM "lib/libbonobo/libbonobo.ent">
  -<!ENTITY % gconf SYSTEM "lib/gconf/gconf.ent">
  -<!ENTITY % gnome-mime-data SYSTEM "lib/gnome-mime-data/gnome-mime-data.ent">
  -<!ENTITY % gnome-vfs SYSTEM "lib/gnome-vfs/gnome-vfs.ent">
  -<!ENTITY % libgnome SYSTEM "lib/libgnome/libgnome.ent">
  -<!ENTITY % libart_lgpl SYSTEM "lib/libart_lgpl/libart_lgpl.ent">
  -<!ENTITY % libglade SYSTEM "lib/libglade/libglade.ent">
  -<!ENTITY % libgnomecanvas SYSTEM "lib/libgnomecanvas/libgnomecanvas.ent">
  -<!ENTITY % libbonoboui SYSTEM "lib/libbonoboui/libbonoboui.ent">
  -<!ENTITY % gnome-icon-themes SYSTEM "lib/gnome-icon-themes/gnome-icon-themes.ent">
  -<!ENTITY % gnome-keyring SYSTEM "lib/gnome-keyring/gnome-keyring.ent">
  -<!ENTITY % libgnomeui SYSTEM "lib/libgnomeui/libgnomeui.ent">
  -<!ENTITY % gtk-engines SYSTEM "lib/gtk-engines/gtk-engines.ent">
  -<!ENTITY % gnome-themes SYSTEM "lib/themes/gnome-themes.ent">
  -<!ENTITY % scrollkeeper SYSTEM "lib/scrollkeeper/scrollkeeper.ent">
  -<!ENTITY % gnome-desktop SYSTEM "lib/gnome-desktop/gnome-desktop.ent">
  -<!ENTITY % libwnck SYSTEM "lib/libwnck/libwnck.ent">
  -<!ENTITY % gnome-panel SYSTEM "lib/gnome-panel/gnome-panel.ent">
  -<!ENTITY % gnome-session SYSTEM "lib/gnome-session/gnome-session.ent">
  -<!ENTITY % vte SYSTEM "lib/vte/vte.ent">
  -<!ENTITY % gnome-terminal SYSTEM "add/terminal/gnome-terminal.ent">
  -<!ENTITY % libgtop SYSTEM "lib/libgtop/libgtop.ent">
  -<!ENTITY % gail SYSTEM "lib/gail/gail.ent">
  -<!ENTITY % gstreamer SYSTEM "add/gstreamer/gstreamer.ent">
  -<!ENTITY % gst-plugins SYSTEM "add/gst-plugins/gst-plugins.ent">
  -<!ENTITY % gnome-applets SYSTEM "add/applets/gnome-applets.ent">
  -<!ENTITY % libgsf SYSTEM "lib/libgsf/libgsf.ent">
  -<!ENTITY % libcroco SYSTEM "lib/libcroco/libcroco.ent">
  -<!ENTITY % librsvg SYSTEM "lib/librsvg/librsvg.ent">
  -<!ENTITY % eel SYSTEM "lib/eel/eel.ent">
  -<!ENTITY % nautilus SYSTEM "add/nautilus/nautilus.ent">
   %gtk-doc;
  +<!ENTITY % libIDL SYSTEM "lib/libidl/libidl.ent">
   %libIDL;
  +<!ENTITY % orbit2 SYSTEM "lib/orbit/orbit2.ent">
   %orbit2;
  +<!ENTITY % intltool SYSTEM "lib/intltool/intltool.ent">
   %intltool;
  +<!ENTITY % libbonobo SYSTEM "lib/libbonobo/libbonobo.ent">
   %libbonobo;
  +<!ENTITY % gconf SYSTEM "lib/gconf/gconf.ent">
   %gconf;
  +<!ENTITY % gnome-mime-data SYSTEM "lib/gnome-mime-data/gnome-mime-data.ent">
   %gnome-mime-data;
  +<!ENTITY % gnome-vfs SYSTEM "lib/gnome-vfs/gnome-vfs.ent">
   %gnome-vfs;
  +<!ENTITY % libgnome SYSTEM "lib/libgnome/libgnome.ent">
   %libgnome;
  +<!ENTITY % libart_lgpl SYSTEM "lib/libart_lgpl/libart_lgpl.ent">
   %libart_lgpl;
  +<!ENTITY % libglade SYSTEM "lib/libglade/libglade.ent">
   %libglade;
  +<!ENTITY % libgnomecanvas SYSTEM "lib/libgnomecanvas/libgnomecanvas.ent">
   %libgnomecanvas;
  +<!ENTITY % libbonoboui SYSTEM "lib/libbonoboui/libbonoboui.ent">
   %libbonoboui;
  +<!ENTITY % gnome-icon-themes SYSTEM "lib/gnome-icon-themes/gnome-icon-themes.ent">
   %gnome-icon-themes;
  +<!ENTITY % gnome-keyring SYSTEM "lib/gnome-keyring/gnome-keyring.ent">
   %gnome-keyring;
  +<!ENTITY % libgnomeui SYSTEM "lib/libgnomeui/libgnomeui.ent">
   %libgnomeui;
  +<!ENTITY % gtk-engines SYSTEM "lib/gtk-engines/gtk-engines.ent">
   %gtk-engines;
  +<!ENTITY % gnome-themes SYSTEM "lib/themes/gnome-themes.ent">
   %gnome-themes;
  +<!ENTITY % scrollkeeper SYSTEM "lib/scrollkeeper/scrollkeeper.ent">
   %scrollkeeper;
  +<!ENTITY % gnome-desktop SYSTEM "lib/gnome-desktop/gnome-desktop.ent">
   %gnome-desktop;
  +<!ENTITY % libwnck SYSTEM "lib/libwnck/libwnck.ent">
   %libwnck;
  +<!ENTITY % gnome-panel SYSTEM "lib/gnome-panel/gnome-panel.ent">
   %gnome-panel;
  +<!ENTITY % gnome-session SYSTEM "lib/gnome-session/gnome-session.ent">
   %gnome-session;
  +<!ENTITY % vte SYSTEM "lib/vte/vte.ent">
   %vte;
  +<!ENTITY % gnome-terminal SYSTEM "add/terminal/gnome-terminal.ent">
   %gnome-terminal;
  +<!ENTITY % libgtop SYSTEM "lib/libgtop/libgtop.ent">
   %libgtop;
  +<!ENTITY % gail SYSTEM "lib/gail/gail.ent">
   %gail;
  +<!ENTITY % gstreamer SYSTEM "add/gstreamer/gstreamer.ent">
   %gstreamer;
  +<!ENTITY % gst-plugins SYSTEM "add/gst-plugins/gst-plugins.ent">
   %gst-plugins;
  +<!ENTITY % gnome-applets SYSTEM "add/applets/gnome-applets.ent">
   %gnome-applets;
  +<!ENTITY % libgsf SYSTEM "lib/libgsf/libgsf.ent">
   %libgsf;
  +<!ENTITY % libcroco SYSTEM "lib/libcroco/libcroco.ent">
   %libcroco;
  +<!ENTITY % librsvg SYSTEM "lib/librsvg/librsvg.ent">
   %librsvg;
  +<!ENTITY % eel SYSTEM "lib/eel/eel.ent">
   %eel;
  +<!ENTITY % nautilus SYSTEM "add/nautilus/nautilus.ent">
   %nautilus;
  +<!ENTITY % control-center SYSTEM "core/control/control-center.ent">
  +%control-center;
  +<!ENTITY gnome-config SYSTEM "config/config.xml">
  +<!ENTITY gnome-config-core SYSTEM "config/config-core.xml">
  +
  +
   
   <!ENTITY % linc SYSTEM "lib/linc/linc.ent">
   <!ENTITY % bonobo-activation SYSTEM "lib/bonobo/bonobo-activation.ent">
  @@ -101,8 +107,6 @@
   
   <!-- Gnome Core -->
   <!ENTITY gnome-core SYSTEM "core/core.xml">
  -<!ENTITY % control-center SYSTEM "core/control/control-center.ent">
  -%control-center;
   
   <!-- Additional Gnome Packages -->
   <!ENTITY gnome-add SYSTEM "add/add.xml">
  @@ -137,10 +141,6 @@
   <!ENTITY % gdm SYSTEM "other/gdm/gdm.ent">
   %gconf-editor;
   %gdm;
  -
  -<!-- Configuring Gnome -->
  -<!ENTITY gnome-config SYSTEM "config/config.xml">
  -<!ENTITY gnome-config-core SYSTEM "config/config-core.xml">
   
   <!-- Additional Gnome 1.4 Libraries -->
   <!ENTITY gnome-otherlibs SYSTEM "otherlibs/otherlibs.xml">
  
  
  
  1.1083    +3 -0      BLFS/BOOK/introduction/welcome/changelog.xml
  
  Index: changelog.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/introduction/welcome/changelog.xml,v
  retrieving revision 1.1082
  retrieving revision 1.1083
  diff -u -r1.1082 -r1.1083
  --- changelog.xml	22 Apr 2004 14:04:15 -0000	1.1082
  +++ changelog.xml	22 Apr 2004 21:35:36 -0000	1.1083
  @@ -11,6 +11,9 @@
   
   <itemizedlist>
   
  +<listitem><para>April 22nd, 2004 [igor]: Moved Qt installation to
  +/usr with instructions submitted by Tushar Teredesai.</para></listitem>
  +
   <listitem><para>April 22nd, 2004 [igor]: Added cracklib-2.7,
   contributed by DJ Lucas.</para></listitem>
   
  
  
  
  1.10      +1 -34     BLFS/BOOK/x/lib/qt/qt-config.xml
  
  Index: qt-config.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/lib/qt/qt-config.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- qt-config.xml	23 Nov 2003 03:38:16 -0000	1.9
  +++ qt-config.xml	22 Apr 2004 21:35:36 -0000	1.10
  @@ -3,41 +3,8 @@
   
   <sect3><title>Configuration Information</title>
   
  -<para>As with most libraries, there is no configuration to do, save that
  -the library directory <filename class="directory">/opt/qt/lib</filename> should appear
  -in <filename>/etc/ld.so.conf</filename> so that ldd can find the
  -shared libraries. The following command will add it if it is missing:</para>
  -
  -<screen><userinput><command>cat >> /etc/ld.so.conf << "EOF"</command>
  -# Begin qt addition to /etc/ld.so.conf
  -
  -/opt/qt/lib
  -
  -# End qt addition
  -<command>EOF
  -ldconfig</command></userinput></screen>
  -
  -<para>You need to add the path for the <application>Qt</application> man pages to the
  -<filename>man.conf</filename>
  -file.  This can be done with the following command:</para>
  -
  -<screen><userinput><command>cat >> /etc/man.conf << "EOF"</command>
  -# Begin qt addition to man.conf
  -
  -MANPATH /opt/qt/doc/man
  -
  -# End qt addition to man.conf
  -<command>EOF</command></userinput></screen>
  -
  -<para>Most of the <application>Qt</application> based applications (such as
  -<application>KDE</application>) require the <envar>QTDIR</envar> to be
  -set during compilation. This can be achieved by the following command.
  -For convenience, this command may be added to <filename>/etc/profile</filename>
  -or <filename>$HOME/.bash_profile</filename>.</para>
  -
  -<screen><userinput><command>export QTDIR=/opt/qt</command></userinput></screen>
  +&library-config;
   
   </sect3>
   
   </sect2>
  -
  
  
  
  1.8       +1 -2      BLFS/BOOK/x/lib/qt/qt-desc.xml
  
  Index: qt-desc.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/lib/qt/qt-desc.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- qt-desc.xml	29 Nov 2003 16:46:01 -0000	1.7
  +++ qt-desc.xml	22 Apr 2004 21:35:36 -0000	1.8
  @@ -22,7 +22,6 @@
   <sect3><title>Qt library</title>
   <para>The <application>Qt</application>/<application>X11</application>
   library contains <acronym>API</acronym>'s necessary to use
  -<application><acronym>KDE</acronym></application>
  -programs.</para></sect3>
  +programs based on Qt <acronym>GUI</acronym> toolkit.</para></sect3>
   
   </sect2>
  
  
  
  1.13      +24 -27    BLFS/BOOK/x/lib/qt/qt-exp.xml
  
  Index: qt-exp.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/lib/qt/qt-exp.xml,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- qt-exp.xml	17 Apr 2004 10:10:56 -0000	1.12
  +++ qt-exp.xml	22 Apr 2004 21:35:36 -0000	1.13
  @@ -1,54 +1,51 @@
   <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 <application>Qt</application> directory is located.</para>
  -
  -<para><command>export LD_LIBRARY_PATH=$QTDIR/lib</command>: This command 
  +<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=$QTDIR/bin:$PATH</command>: This command 
  +<para><command>export PATH=$PWD/bin:$PATH</command>: This command 
   allows the build process to find supporting executables.</para>
   
  -<para><parameter>-prefix /opt/qt-&qt-version;</parameter>: This command sets up
  -the install destination.</para>
  -
  -<para><option>-qt-gif</option>: This command adds support for gif
  +<para><parameter>-qt-gif</parameter>: This switch adds support for gif
   files to the libraries.</para>
   
  -<para><option>-system-libpng -system-libmng -system-zlib
  --system-libjpeg</option>: This command 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>-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><option>-no-g++-exceptions</option>: This command disables
  +<para><parameter>-no-g++-exceptions</parameter>: This switch disables
   the exceptions coding generated by the <application>C++</application> compiler.</para>
   
  -<para><option>-thread</option>: This command compiles the library
  -to support multi-threading.</para>
  +<para><parameter>-thread</parameter>: This switch adds
  +support for multi-threading.</para>
   
  -<para><command>ln -sfn qt-&qt-version; /opt/qt</command>: This command
  -standardizes the location of the <application>Qt</application> libraries
  -to the <filename>ld.so.conf</filename> entry
  -described below.</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 /opt/qt/lib/libqt.so</command>: This
  +<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 /opt/qt/doc</command>: This command
  -installs the man directory which is missed by <command>make
  +<para><command>cp -r doc/man /usr/share</command>: This command
  +installs the man pages which are missed by <command>make
   install</command>.</para>
   
  -<para><command>cp -r examples /opt/qt/doc</command>: This command
  -installs the examples directory which is missed by <command>make
  +<para><command>cp -r examples /usr/share/doc/qt</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 envirnment variables set earlier.</para>
  +and eliminates environment variables set earlier.</para>
   
   </sect2>
  -
  
  
  
  1.17      +25 -11    BLFS/BOOK/x/lib/qt/qt-inst.xml
  
  Index: qt-inst.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/lib/qt/qt-inst.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- qt-inst.xml	17 Apr 2004 10:10:56 -0000	1.16
  +++ qt-inst.xml	22 Apr 2004 21:35:36 -0000	1.17
  @@ -1,19 +1,24 @@
   <sect2>
   <title>Installation of <application>Qt</application></title>
   
  -<screen><userinput><command>bash
  -export QTDIR=$PWD &&
  -export LD_LIBRARY_PATH=$QTDIR/lib &&
  -export PATH=$QTDIR/bin:$PATH &&
  -./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
  -   -system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
  -   -thread &&
  +<para>Install <application>Qt</application> by running the following
  +commands:</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 -release -shared -qt-gif -system-zlib \
  +    -no-g++-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 -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
  +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>
   
   <note><para>
  @@ -26,3 +31,12 @@
   </note>
   
   </sect2>
  +
  +<!--
  +-cups
  +-plugin-imgfmt-jpeg 
  +-plugin-imgfmt-mng 
  +-system-libjpeg
  +-system-libmng
  +-system-nas-sound
  +-->
  
  
  
  1.12      +13 -4     BLFS/BOOK/x/lib/qt/qt-intro.xml
  
  Index: qt-intro.xml
  ===================================================================
  RCS file: /home/cvsroot/BLFS/BOOK/x/lib/qt/qt-intro.xml,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- qt-intro.xml	29 Nov 2003 16:46:01 -0000	1.11
  +++ qt-intro.xml	22 Apr 2004 21:35:36 -0000	1.12
  @@ -17,11 +17,20 @@
   
   <sect3><title><application>Qt</application> dependencies</title>
   <sect4><title>Required</title>
  -<para><xref linkend="xfree86"/> and 
  -<xref linkend="libmng"/></para></sect4>
  +<para>
  +<xref linkend="xfree86"/>
  +</para></sect4>
   <sect4><title>Optional</title>
  -<para><xref linkend="nas"/> and <xref
  -linkend="cups"/></para></sect4>
  +<para>
  +<xref linkend="libjpeg"/>,
  +<xref linkend="libmng"/>,
  +<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>
  
  
  



More information about the blfs-book mailing list