Changeset b8e6a3be for x

Timestamp:

08/22/2004 07:56:38 PM (20 years ago)

Author:

Randy McMurchy <randy@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 6.0, 6.1, 6.2, 6.2.0, 6.2.0-rc1, 6.2.0-rc2, 6.3, 6.3-rc1, 6.3-rc2, 6.3-rc3, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

1753548

Parents:

7268366

Message:

Updated to Qt-3.3.3

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

File:

• x/lib/qt.xml (modified) (6 diffs)

x/lib/qt.xml

@@ -7 +7 @@
   <!ENTITY qt-download-http "http://sunsite.rediris.es/mirror/Qt/source/qt-x11-free-&qt-version;.tar.bz2">
   <!ENTITY qt-download-ftp  "ftp://ftp.trolltech.com/qt/source/qt-x11-free-&qt-version;.tar.bz2">
-  <!ENTITY qt-md5sum        "903cad618274ad84d7d13fd0027a6c3c">
-  <!ENTITY qt-size          "14 MB">
+  <!ENTITY qt-md5sum        "3e0a0c8429b0a974b39b5f535ddff01c">
+  <!ENTITY qt-size          "14.4 MB">
   <!ENTITY qt-buildsize     "250 MB">
-  <!ENTITY qt-time          "21.2 SBU (full), 13.4 SBU (sub-tools)">
+  <!ENTITY qt-time          "19.3 SBU (full), 13.4 SBU (sub-tools)">
 ]>
 
@@ -45 +45 @@
 <para><xref linkend="x-installing"/></para>
 </sect4>
+
 <sect4><title>Recommended</title>
-<para><xref linkend="libjpeg"/> and <xref linkend="libmng"/>.</para>
+<para><xref linkend="libjpeg"/> and <xref linkend="libmng"/></para>
 </sect4>
 
@@ -53 +54 @@
 <xref linkend="postgresql"/>, <ulink url="http://sqlite.org/">SQLite</ulink>, 
 <ulink url="http://firebird.sourceforge.net/">Firebird</ulink> 
-and <ulink url="http://www.unixodbc.org/">unixODBC</ulink>.</para>
+and <ulink url="http://www.unixodbc.org/">unixODBC</ulink></para>
 </sect4>
 </sect3>
@@ -109 +110 @@
 make install &amp;&amp;
 ln -sf libqt-mt.so /usr/lib/libqt.so &amp;&amp;
+rm /usr/bin/qmake &amp;&amp;
+install -m755 -oroot -groot qmake/qmake /usr/bin &amp;&amp;
 cp -r doc/man /usr/share &amp;&amp;
 cp -r examples /usr/share/doc/qt &amp;&amp;
@@ -140 +143 @@
 ln -sfn qt-&qt-version; /opt/qt &amp;&amp;
 ln -s libqt-mt.so /opt/qt/lib/libqt.so &amp;&amp;
+rm /opt/qt-&qt-version;/bin/qmake &amp;&amp;
+install -m755 -oroot -groot qmake/qmake /opt/qt-&qt-version;/bin &amp;&amp;
 cp -r doc/man /opt/qt/doc &amp;&amp;
 cp -r examples /opt/qt/doc
 exit</command></userinput></screen>
 
-<note><para>If you're building <application>Qt</application> on top of 
-<acronym>LFS</acronym> &gt;=6.0, the build will fail if you pass the 
-<option>--plugin-sql-<replaceable>[driver]</replaceable></option> switch to the 
-<command>configure</command> command.</para></note>
+<note><para>If you pass the 
+<option>-plugin-sql-<replaceable>[driver]</replaceable></option> switch to the 
+<command>configure</command> command, you must also pass 
+<option>-I<replaceable>[/path/to/sql/headers]</replaceable></option> so 
+<command>make</command> can find the appropriate header files.</para></note>
 </sect3>
 
@@ -195 +201 @@
 allows <command>configure</command> scripts to find a working 
 <application>Qt</application> installation.</para>
+
+<para><command>rm .../qmake; install -m755 -oroot -groot qmake/qmake .../bin</command>: 
+The <command>qmake</command> program is installed incorrectly by 
+<command>make install</command>. These two commands install the program
+correctly.</para>
 
 <para><command>cp -r doc/man /usr/share (or /opt/qt/doc)</command>: This command