Changeset df1fe4e

Timestamp:

09/13/2012 07:12:55 PM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 12.2, 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, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

ffb5c7b

Parents:

defe82d

Message:

Qt 4.8.3.

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

Files:

• general.ent (modified) (3 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qt.xml (modified) (9 diffs)

general.ent

@@ -4 +4 @@
 -->
 
-<!ENTITY day          "12">                   <!-- Always 2 digits -->
+<!ENTITY day          "13">                   <!-- Always 2 digits -->
 <!ENTITY month        "09">                   <!-- Always 2 digits -->
 <!ENTITY year         "2012">
@@ -10 +10 @@
 <!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 -->
@@ -735 +735 @@
 <!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">

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
 -->
+   <listitem>
+      <para>September 13th, 2012</para>
+      <itemizedlist>
+        <listitem>
+          <para>[rthomsen] - Qt 4.8.3.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+    
     <listitem>
       <para>September 12th, 2012</para>

x/lib/qt.xml

@@ -7 +7 @@
   <!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)">
@@ -61 +61 @@
     </itemizedlist>
 
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -70 +70 @@
        </listitem>
     </itemizedlist>
-
+-->
     
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
@@ -166 +166 @@
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt-version;-glib_fix-1.patch &amp;&amp;
-sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &amp;&amp;
-./configure -prefix /opt/qt-&qt-version;  \
+<screen><userinput>./configure -prefix /opt/qt-&qt-version;  \
             -release               \
             -nomake examples       \
@@ -201 +199 @@
   <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>:
@@ -265 +254 @@
       run-time cache file:</para>
 
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; EOF
 <literal># Begin Qt addition
 
@@ -281 +270 @@
       the <filename>/etc/profile.d/qt.sh</filename> file:</para>
 
-<screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; "EOF"
+<screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; EOF
 <literal># Begin /etc/profile.d/qt.sh
 
@@ -306 +295 @@
 
       <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>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>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, 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>
@@ -438 +428 @@
       </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>