[blfs-book] r10355 - in trunk/BOOK: . introduction/welcome kde4/add x/lib

rthomsen at linuxfromscratch.org rthomsen at linuxfromscratch.org
Tue Jun 26 02:38:06 PDT 2012


Author: rthomsen
Date: 2012-06-26 03:38:02 -0600 (Tue, 26 Jun 2012)
New Revision: 10355

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/kde4/add/add-pkgs.xml
   trunk/BOOK/x/lib/qt4.xml
Log:
Qt 4.8.2

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent	2012-06-25 23:55:12 UTC (rev 10354)
+++ trunk/BOOK/general.ent	2012-06-26 09:38:02 UTC (rev 10355)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "23">                   <!-- Always 2 digits -->
+<!ENTITY day          "26">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 23rd, &year;">
+<!ENTITY releasedate  "June 26th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -671,7 +671,7 @@
 <!ENTITY pango-version                "1.30.1">
 <!ENTITY pangomm-version              "2.28.4">
 <!-- <!ENTITY qt-version                   "3.3.8d"> -->
-<!ENTITY qt4-version                  "4.8.1">
+<!ENTITY qt4-version                  "4.8.2">
 <!ENTITY shared-mime-info-version     "1.0">
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.8.1">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	2012-06-25 23:55:12 UTC (rev 10354)
+++ trunk/BOOK/introduction/welcome/changelog.xml	2012-06-26 09:38:02 UTC (rev 10355)
@@ -42,6 +42,18 @@
 
 -->
     <listitem>
+      <para>June 26th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rthomsen] - Upgrade to Qt 4.8.2.
+	  Fixes <ulink url="&blfs-ticket-root;3432">#3432</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+
+
+    <listitem>
       <para>June 23rd, 2012</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/kde4/add/add-pkgs.xml
===================================================================
--- trunk/BOOK/kde4/add/add-pkgs.xml	2012-06-25 23:55:12 UTC (rev 10354)
+++ trunk/BOOK/kde4/add/add-pkgs.xml	2012-06-26 09:38:02 UTC (rev 10355)
@@ -45,7 +45,7 @@
         </listitem>
       </itemizedlist>
       
-      <para>Most of these packages can be built with the standard KDE4 instructions:</para>
+      <para>Most of these packages can be built with the standard KDE instructions:</para>
 <screen><userinput>mkdir build &&
 cd build &&
 cmake -DCMAKE_INSTALL_PREFIX=$KDE4_PREFIX \

Modified: trunk/BOOK/x/lib/qt4.xml
===================================================================
--- trunk/BOOK/x/lib/qt4.xml	2012-06-25 23:55:12 UTC (rev 10354)
+++ trunk/BOOK/x/lib/qt4.xml	2012-06-26 09:38:02 UTC (rev 10355)
@@ -4,9 +4,9 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY qt4-download-http "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
-  <!ENTITY qt4-download-ftp  "ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
-  <!ENTITY qt4-md5sum        "7960ba8e18ca31f0c6e4895a312f92ff">
+  <!ENTITY qt4-download-http "http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
+  <!ENTITY qt4-download-ftp  " ">
+  <!ENTITY qt4-md5sum        "3c1146ddf56247e16782f96910a8423b">
   <!ENTITY qt4-size          "228 MB">
   <!ENTITY qt4-buildsize     "1.8 GB (full), 619 (essential)">
   <!ENTITY qt4-time          "69 SBU (full), 54 SBU (essential)">
@@ -64,11 +64,6 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>GCC 4.7 patch: <ulink
-	url="&patch-root;/qt-everywhere-opensource-src-&qt4-version;-gcc_fix-1.patch"/>
-	</para>
-      </listitem>
-      <listitem>
         <para>GLib 2.32 patch: <ulink
 	url="&patch-root;/qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch"/>
         </para>
@@ -170,8 +165,7 @@
     <para>Configure <application>Qt</application> by running the
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-gcc_fix-1.patch &&
-patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch &&
+<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch &&
 sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &&
 ./configure -prefix /opt/qt-&qt4-version;  \
             -release               \
@@ -208,8 +202,7 @@
     <title>Command Explanations</title>
 
     <para><command>patch -Np1 -i qt-everywhere-...</command>:
-    The two patches fix compiling with <application>GCC</application>
-    4.7 and <application>GLib</application> 2.32.</para>
+    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 
@@ -271,7 +264,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
@@ -288,7 +281,7 @@
       the <filename>/etc/profile.d/qt.sh</filename> file:</para>
 
 <screen role="root"><userinput>cat > /etc/profile.d/qt.sh << "EOF"
-# Begin /etc/profile.d/qt.sh
+<literal># Begin /etc/profile.d/qt.sh
 
 QTDIR=/opt/qt
 
@@ -297,7 +290,7 @@
 
 export QTDIR
 
-# End /etc/profile.d/qt.sh
+# End /etc/profile.d/qt.sh</literal>
 EOF</userinput></screen>
       
     </sect3>
@@ -480,7 +473,7 @@
         <listitem>
           <para>is a tool to generate Qt4 code out of
           user interface files generated by the Qt3
-          version of <command>designer</command>.</para>
+          version of designer.</para>
           <indexterm zone="qt4 qt4-uic3">
             <primary sortas="b-uic3">uic3</primary>
           </indexterm>




More information about the blfs-book mailing list