[blfs-book] r10662 - in trunk/BOOK: . introduction/welcome x/lib

rthomsen at linuxfromscratch.org rthomsen at linuxfromscratch.org
Thu Sep 13 12:13:05 PDT 2012


Author: rthomsen
Date: 2012-09-13 13:12:55 -0600 (Thu, 13 Sep 2012)
New Revision: 10662

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/qt.xml
Log:
Qt 4.8.3.

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-09-12 23:42:01 UTC (rev 10661)
+++ trunk/BOOK/general.ent	2012-09-13 19:12:55 UTC (rev 10662)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "13">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "September 12th, &year;">
+<!ENTITY releasedate  "September 13th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -734,7 +734,7 @@
 <!ENTITY notification-daemon-version  "0.7.5">
 <!ENTITY pango-version                "1.30.1">
 <!ENTITY pangomm-version              "2.28.4">
-<!ENTITY qt-version                   "4.8.2">
+<!ENTITY qt-version                   "4.8.3">
 <!ENTITY shared-mime-info-version     "1.0">
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.8.2">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-09-12 23:42:01 UTC (rev 10661)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-09-13 19:12:55 UTC (rev 10662)
@@ -43,6 +43,15 @@
     </listitem>
 
 -->
+   <listitem>
+      <para>September 13th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rthomsen] - Qt 4.8.3.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
     <listitem>
       <para>September 12th, 2012</para>
       <itemizedlist>

Modified: trunk/BOOK/x/lib/qt.xml
===================================================================
--- trunk/BOOK/x/lib/qt.xml	2012-09-12 23:42:01 UTC (rev 10661)
+++ trunk/BOOK/x/lib/qt.xml	2012-09-13 19:12:55 UTC (rev 10662)
@@ -6,8 +6,8 @@
 
   <!ENTITY qt-download-http "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-&qt-version;.tar.gz">
   <!ENTITY qt-download-ftp  " ">
-  <!ENTITY qt-md5sum        "3c1146ddf56247e16782f96910a8423b">
-  <!ENTITY qt-size          "228 MB">
+  <!ENTITY qt-md5sum        "a663b6c875f8d7caa8ac9c30e4a4ec3b">
+  <!ENTITY qt-size          "234 MB">
   <!ENTITY qt-buildsize     "1.8 GB (full), 619 (essential)">
   <!ENTITY qt-time          "69 SBU (full), 54 SBU (essential)">
 ]>
@@ -60,7 +60,7 @@
       </listitem>
     </itemizedlist>
 
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -69,7 +69,7 @@
         </para>
        </listitem>
     </itemizedlist>
-
+-->
     
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
 
@@ -165,9 +165,7 @@
     <para>Configure <application>Qt</application> by running the
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt-version;-glib_fix-1.patch &&
-sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&
-./configure -prefix /opt/qt-&qt-version;  \
+<screen><userinput>./configure -prefix /opt/qt-&qt-version;  \
             -release               \
             -nomake examples       \
             -nomake demos          \
@@ -200,15 +198,6 @@
 
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para><command>patch -Np1 -i qt-everywhere-...</command>:
-    The patch fixes compiling with <application>GLib</application> 2.32.</para>
-    
-    <para><command>sed -i '/-Werror/d'...</command>:
-    This sed prevents some compiler warnings being treated as errors when 
-    compiling with <application>GCC</application> 4.7. You can omit it if
-    you are compiling with older <application>GCC</application> versions.
-    </para>
    
     <para><parameter>-release</parameter>:
     This switch disables building with debugging symbols.</para>
@@ -264,7 +253,7 @@
       the <filename>/etc/ld.so.conf</filename> file and the dynamic linker's
       run-time cache file:</para>
 
-<screen role="root"><userinput>cat >> /etc/ld.so.conf << "EOF"
+<screen role="root"><userinput>cat >> /etc/ld.so.conf << EOF
 <literal># Begin Qt addition
 
 /opt/qt/lib
@@ -280,7 +269,7 @@
       <para>As the <systemitem class="username">root</systemitem> user, create 
       the <filename>/etc/profile.d/qt.sh</filename> file:</para>
 
-<screen role="root"><userinput>cat > /etc/profile.d/qt.sh << "EOF"
+<screen role="root"><userinput>cat > /etc/profile.d/qt.sh << EOF
 <literal># Begin /etc/profile.d/qt.sh
 
 QTDIR=/opt/qt
@@ -305,18 +294,19 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>assistant, assistant_adp, designer, lconvert, linguist, lrelease,
-        lupdate, moc, pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml,
-        qdbusviewer, qdbusxml2cpp, qhelpconverter, qhelpgenerator,qmake,
-        qt3to4, qtconfig, qtdemo, rcc, uic, uic3 and xmlpatterns</seg>
+        <seg>assistant, designer, lconvert, linguist, lrelease, lupdate, moc,
+        pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml, qdbusviewer,
+        qdbusxml2cpp, qdoc3, qhelpconverter, qhelpgenerator, qmake,
+        qmlplugindump, qmlviewer, qt3to4, qtconfig, qttracereplay, rcc, uic,
+        uic3, xmlpatterns and xmlpatternsvalidator</seg>
 
-        <seg>libphonon.so, libQt3Support.so, libQtAssistantClient.so,
-        libQtCLucene.so, libQtCore.so, libQtDesigner.so, libQtDBus.so,
-        libQtDesignerComponents.so, libQtGui.so, libQtHelp.so, libQtNetwork.so,
-        libQtOpenGL.so, libQtScript.so, libQtScriptTools.so, libQtSql.so,
-        libQtSvg.so, libQtTest.so, libQtUiTools.a, libQtWebKit.so, libQtXml.so,
-        libQtXmlPatterns.so and numerous plugin modules installed in
-        <filename class='directory'>/opt/qt/plugins</filename></seg>
+        <seg>libphonon.so, libQt3Support.so, libQtCLucene.so, libQtCore.so,
+        libQtDBus.so, libQtDeclarative.so, libQtDesigner.so,
+        libQtDesignerComponents.so, libQtGui.so, libQtHelp.so, libQtMultimedia,
+        libQtNetwork.so, libQtOpenGL.so, libQtScript.so, libQtScriptTools.so,
+        libQtSql.so, libQtSvg.so, libQtTest.so, libQtUiTools.a, libQtWebKit.so,
+        libQtXml.so, libQtXmlPatterns.so and numerous plugin modules installed
+        in <filename class='directory'>/opt/qt/plugins</filename></seg>
 
         <seg>/opt/qt-&qt-version;</seg>
       </seglistitem>
@@ -437,17 +427,6 @@
         </listitem>
       </varlistentry>
 
-      <varlistentry id="qt-qtdemo">
-        <term><command>qtdemo</command></term>
-        <listitem>
-          <para>is a portal into various demonstrations of Qt
-          applications.</para>
-          <indexterm zone="qt qt-qtdemo">
-            <primary sortas="b-qtdemo">qtdemo</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
       <varlistentry id="qt-rcc">
         <term><command>rcc</command></term>
         <listitem>




More information about the blfs-book mailing list