Author: fernando
Date: Fri May 29 15:57:31 2015
New Revision: 16050
Log:
Update to qt-4.8.7.
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
trunk/BOOK/x/lib/qt4.xml
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Fri May 29 15:47:33
2015 (r16049)
+++ trunk/BOOK/introduction/welcome/changelog.xml Fri May 29 15:57:31
2015 (r16050)
@@ -48,6 +48,10 @@
<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
<ulink url="&blfs-ticket-root;6546">#6546</ulink>.</para>
</listitem>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Fri May 29 15:47:33 2015 (r16049)
+++ trunk/BOOK/packages.ent Fri May 29 15:57:31 2015 (r16050)
@@ -480,7 +480,7 @@
<!ENTITY libxklavier-version "5.4">
<!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">
<!ENTITY startup-notification-version "0.12">
Modified: trunk/BOOK/x/lib/qt4.xml
==============================================================================
--- trunk/BOOK/x/lib/qt4.xml Fri May 29 15:47:33 2015 (r16049)
+++ trunk/BOOK/x/lib/qt4.xml Fri May 29 15:57:31 2015 (r16050)
@@ -7,10 +7,10 @@
<!ENTITY qt4-download-http
"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=">
]>
<sect1 id="qt4" xreflabel="Qt-&qt4-version;">
@@ -75,16 +75,6 @@
</listitem>
</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>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -157,20 +147,6 @@
</para>
</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,12 +158,6 @@
<screen><userinput>export QT4LINK=/usr
-sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
- config.tests/unix/libmng/libmng.cpp &&
-
-sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
- src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &&
-
./configure -prefix /usr \
-bindir /usr/bin \
-plugindir /usr/lib/qt4/plugins \
@@ -259,12 +229,6 @@
<screen><userinput>export QT4DIR=/opt/qt-&qt4-version; &&
export QT4LINK=/opt/qt4 &&
-sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
- config.tests/unix/libmng/libmng.cpp &&
-
-sed -i '/CONFIG -/ a\isEmpty(OUTPUT_DIR): OUTPUT_DIR = ../..' \
- src/3rdparty/webkit/Source/WebKit2/DerivedSources.pro &&
-
./configure -prefix $QT4DIR \
-sysconfdir /etc/xdg \
-confirm-license \
@@ -403,12 +367,6 @@
<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>
<parameter>-confirm-license</parameter>: Accept license
without prompting user during configuration.
</para>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
