moved qt to /usr

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@2046 af4574ff-66df-0310-9fd7-8a98e5e911e0

book/library-config.xml

@@ -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>

gnome/gnome.ent

@@ -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">
@@ -138,10 +142,6 @@
 %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">
 <!ENTITY gnome-otherlibs-config SYSTEM "otherlibs/otherlibs-config.xml">

introduction/welcome/changelog.xml

@@ -11,6 +11,9 @@ who wrote what.</para>
 
 <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>
 

x/lib/qt/qt-config.xml

@@ -3,41 +3,8 @@
 
 <sect3><title>Configuration Information</title>
 
-<para>As with most libraries, there is no configuration to do, save that
+&library-config;
-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 &gt;&gt; /etc/ld.so.conf &lt;&lt; "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 &gt;&gt; /etc/man.conf &lt;&lt; "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>
 
 </sect3>
 
 </sect2>
-

x/lib/qt/qt-desc.xml

@@ -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 based on Qt <acronym>GUI</acronym> toolkit.</para></sect3>
-programs.</para></sect3>
 
 </sect2>

x/lib/qt/qt-exp.xml

@@ -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
+<para><command>export LD_LIBRARY_PATH=$PWD/lib</command>: This command 
-root of the <application>Qt</application> directory is located.</para>
-
-<para><command>export LD_LIBRARY_PATH=$QTDIR/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
+<para><parameter>-qt-gif</parameter>: This switch adds support for gif
-the install destination.</para>
-
-<para><option>-qt-gif</option>: This command adds support for gif
 files to the libraries.</para>
 
-<para><option>-system-libpng -system-libmng -system-zlib
+<para><parameter>-system-zlib -system-libpng</parameter>: This switch
--system-libjpeg</option>: This command forces the library to use the
+forces the library to use the shared libraries that are on your system
-shared libraries that are on your system instead of recreating its own
+instead of recreating its own set of support libraries for these
-set of support libraries for these functions.</para>
+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
+<para><parameter>-thread</parameter>: This switch adds
-to support multi-threading.</para>
+support for multi-threading.</para>
 
-<para><command>ln -sfn qt-&qt-version; /opt/qt</command>: This command
+<para><command>find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g"</command>:
-standardizes the location of the <application>Qt</application> libraries
+This command removes hardcoded run-time path, else
-to the <filename>ld.so.conf</filename> entry
+<command>uic</command> tries to run with system installed Qt
-described below.</para>
+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
+<para><command>cp -r doc/man /usr/share</command>: This command
-installs the man directory which is missed by <command>make
+installs the man pages which are missed by <command>make
 install</command>.</para>
 
-<para><command>cp -r examples /opt/qt/doc</command>: This command
+<para><command>cp -r examples /usr/share/doc/qt</command>: This command
-installs the examples directory which is missed by <command>make
+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>
-

x/lib/qt/qt-inst.xml

@@ -1,19 +1,24 @@
 <sect2>
 <title>Installation of <application>Qt</application></title>
 
-<screen><userinput><command>bash
+<para>Install <application>Qt</application> by running the following
-export QTDIR=$PWD &amp;&amp;
+commands:</para>
-export LD_LIBRARY_PATH=$QTDIR/lib &amp;&amp;
+
-export PATH=$QTDIR/bin:$PATH &amp;&amp;
+<screen><userinput><command>sed -i "s:cp -f:install:" mkspecs/linux-g++/qmake.conf &amp;&amp;
-./configure -prefix /opt/qt-&qt-version; -qt-gif -system-libpng \
+bash
-&nbsp;&nbsp;&nbsp;-system-libmng -system-zlib -system-libjpeg -no-g++-exceptions \
+export PATH=$PWD/bin:$PATH &amp;&amp;
-&nbsp;&nbsp;&nbsp;-thread &amp;&amp;
+export LD_LIBRARY_PATH=$PWD/lib &amp;&amp;
+./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 &amp;&amp;
 make &amp;&amp;
+find -type f -name Makefile | xargs sed -i "s@-Wl,-rpath,/usr/lib@@g" &amp;&amp;
 make install &amp;&amp;
-ln -sfn qt-&qt-version; /opt/qt &amp;&amp;
+ln -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
-ln -s libqt-mt.so /opt/qt/lib/libqt.so &amp;&amp;
+cp -r doc/man /usr/share &amp;&amp;
-cp -r doc/man /opt/qt/doc &amp;&amp;
+cp -r examples /usr/share/doc/qt &amp;&amp;
-cp -r examples /opt/qt/doc
 exit</command></userinput></screen>
 
 <note><para>
@@ -26,3 +31,12 @@ The build time for <application>Qt</application> is quite long.  If you want to
 </note>
 
 </sect2>
+
+<!--
+-cups
+-plugin-imgfmt-jpeg 
+-plugin-imgfmt-mng 
+-system-libjpeg
+-system-libmng
+-system-nas-sound
+-->

x/lib/qt/qt-intro.xml

@@ -17,11 +17,20 @@ are dynamically linked to the <application>Qt</application> library.</para>
 
 <sect3><title><application>Qt</application> dependencies</title>
 <sect4><title>Required</title>
-<para><xref linkend="xfree86"/> and 
+<para>
-<xref linkend="libmng"/></para></sect4>
+<xref linkend="xfree86"/>
+</para></sect4>
 <sect4><title>Optional</title>
-<para><xref linkend="nas"/> and <xref
+<para>
-linkend="cups"/></para></sect4>
+<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>