Changeset ecc84ee9 for x/lib

Timestamp:

06/26/2012 09:38:02 AM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 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:

07fef33

Parents:

88e0d96

Message:

Qt 4.8.2

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

File:

• x/lib/qt4.xml (modified) (8 diffs)

x/lib/qt4.xml

@@ -5 +5 @@
   %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)">
@@ -64 +64 @@
     <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
@@ -171 +166 @@
     following commands:</para>
 
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-gcc_fix-1.patch &amp;&amp;
-patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch &amp;&amp;
+<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-glib_fix-1.patch &amp;&amp;
 sed -i '/-Werror/d' src/3rdparty/webkit/Source/WebKit.pri &amp;&amp;
 ./configure -prefix /opt/qt-&qt4-version;  \
@@ -209 +203 @@
 
     <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>:
@@ -272 +265 @@
       run-time cache file:</para>
 
-<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF" &amp;&amp;
+<screen role="root"><userinput>cat &gt;&gt; /etc/ld.so.conf &lt;&lt; "EOF"
 <literal># Begin Qt addition
 
@@ -289 +282 @@
 
 <screen role="root"><userinput>cat &gt; /etc/profile.d/qt.sh &lt;&lt; "EOF"
-# Begin /etc/profile.d/qt.sh
+<literal># Begin /etc/profile.d/qt.sh
 
 QTDIR=/opt/qt
@@ -298 +291 @@
 export QTDIR
 
-# End /etc/profile.d/qt.sh
+# End /etc/profile.d/qt.sh</literal>
 EOF</userinput></screen>
       
@@ -481 +474 @@
           <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>