Changeset ec47993

Timestamp:

05/29/2015 10:57:31 PM (9 years ago)

Author:

Fernando de Oliveira <fernando@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

ca8cc947

Parents:

01306a0b

Message:

Update to qt-4.8.7.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• x/lib/qt4.xml (modified) (6 diffs)

introduction/welcome/changelog.xml

@@ -48 +48 @@
       <para>May 29th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to qt-4.8.7. Fixes
+          <ulink url="&blfs-ticket-root;6548">#6548</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to samba-4.2.2. Fixes

packages.ent

@@ -481 +481 @@
 <!ENTITY pango-version                "1.36.8">
 <!ENTITY pangomm-version              "2.36.0">
-<!ENTITY qt4-version                  "4.8.6">
+<!ENTITY qt4-version                  "4.8.7">
 <!ENTITY qt5-version                  "5.4.1">
 <!ENTITY shared-mime-info-version     "1.4">

x/lib/qt4.xml

@@ -8 +8 @@
            "http://download.qt-project.org/official_releases/qt/4.8/&qt4-version;/qt-everywhere-opensource-src-&qt4-version;.tar.gz">
   <!ENTITY qt4-download-ftp  " ">
-  <!ENTITY qt4-md5sum        "2edbe4d6c2eff33ef91732602f3518eb">
-  <!ENTITY qt4-size          "231 MB">
-  <!ENTITY qt4-buildsize     "2.0 GB">
-  <!ENTITY qt4-time          "37 SBU">
+  <!ENTITY qt4-md5sum        "d990ee66bf7ab0c785589776f35ba6ad">
+  <!ENTITY qt4-size          "230 MB">
+  <!ENTITY qt4-buildsize     "2.3 GB">
+  <!ENTITY qt4-time          "12 SBU, using parallelism=">
 ]>
 
@@ -76 +76 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch (if you are using gcc-5):
-          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt4-version;-gcc5_fixes-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">Qt Dependencies</bridgehead>
 
@@ -158 +148 @@
     </note>
 
-    <para>
-      Fix DoS vulnerability in the GIF image handler:
-    </para>
-
-<screen><userinput>sed -i -e '631a if (image->isNull()) { state = Error; return -1; }' \
-    src/gui/image/qgifhandler.cpp</userinput></screen>
-
-    <para>
-      If you are using gcc-5, apply the required patch by running
-      the following command:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../qt-everywhere-opensource-src-&qt4-version;-gcc5_fixes-1.patch</userinput></screen>
-
 <!-- ==== Method 1 ====== -->
     <bridgehead renderas="sect3">Method 1: Installing in /usr</bridgehead>
@@ -182 +158 @@
 
 <screen><userinput>export QT4LINK=/usr
-
-sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
-     config.tests/unix/libmng/libmng.cpp &amp;&amp;
-
-sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
-     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
 
 ./configure -prefix         /usr                 \
@@ -260 +230 @@
 export QT4LINK=/opt/qt4 &amp;&amp;
 
-sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
-     config.tests/unix/libmng/libmng.cpp &amp;&amp;
-
-sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
-     src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &amp;&amp;
-
 ./configure -prefix     $QT4DIR  \
             -sysconfdir /etc/xdg \
@@ -402 +366 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
-
-    <para>
-      <command>sed -i ...</command>: First command fixes detection of
-      <application>libmng</application> 2.0 and second one prevents configure
-      script from writing to the root directory if building as privileged user.
-    </para>
 
     <para>