Changeset 98c79da

Timestamp:

06/03/2015 07:38:22 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, 12.2, 7.10, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gimp3, 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/for-12.3, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/spidermonkey128, xry111/test-20220226, xry111/xf86-video-removal

Children:

59e61f7

Parents:

6e0a8a7

Message:

Update to qt-5.4.2.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• x/lib/qt5.xml (modified) (7 diffs)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "02">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "06">                   <!-- Always 2 digits -->
 <!ENTITY year         "2015">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "June 2nd &year;">
+<!ENTITY releasedate  "June 3rd &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -44 +44 @@
 
 -->
+
+    <listitem>
+      <para>June 3rd, 2015</para>
+      <itemizedlist>
+        <listitem>
+          <para>[fernando] - Update to qt-5.4.2. Fixes
+          <ulink url="&blfs-ticket-root;6564">#6564</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

packages.ent

@@ -481 +481 @@
 <!ENTITY pangomm-version              "2.36.0">
 <!ENTITY qt4-version                  "4.8.7">
-<!ENTITY qt5-version                  "5.4.1">
+<!ENTITY qt5-version                  "5.4.2">
 <!ENTITY shared-mime-info-version     "1.4">
 <!ENTITY startup-notification-version "0.12">

x/lib/qt5.xml

@@ -12 +12 @@
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "7afb5f9235d8d42b5b6e832442a32a5d">
-  <!ENTITY qt5-size          "278 MB">
-  <!ENTITY qt5-buildsize     "6.6 GB (172 MB installed)">
-  <!ENTITY qt5-time          "69 SBU">
+  <!ENTITY qt5-md5sum        "c23bd0f14d66e7901d24906a1edce9b0">
+  <!ENTITY qt5-size          "269 MB">
+  <!ENTITY qt5-buildsize     "6.9 GB (172 MB installed)">
+  <!ENTITY qt5-time          "24 SBU, using parallelism=4">
 ]>
 
@@ -120 +120 @@
       <xref linkend="gtk2"/> (GTK+ Theme Support),
       <xref linkend="harfbuzz"/>, <!-- Doesn't have all the features that the included one has. -->
-      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>,
-      <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>,
       <xref linkend="mariadb"/> or <ulink url="http://www.mysql.com/">MySQL</ulink>,
       <xref linkend="postgresql"/>,
-      <xref linkend="pulseaudio"/>, and 
-      <xref linkend="unixodbc"/>
+      <xref linkend="pulseaudio"/>,
+      <xref linkend="unixodbc"/>,
+      <ulink url="https://code.google.com/p/ibus/">IBus</ulink>, and 
+      <ulink url="http://xkbcommon.org/">libxkbcommon</ulink>
     </para>
 
@@ -157 +157 @@
       </para>
     </warning>
-
-    <para>
-     If you wish to build the Qt Web Kit against glib-2.43 or newer, removing
-     the <command>configure</command> switch line <quote>-skip qtwebengine
-     ...</quote> below, both Methods need a fix:
-    </para>
-
-<screen role="root"><userinput>sed -i 's/GMutexLocker locker/WebCore::&amp;/' \
-       qtwebkit/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp</userinput></screen>
 
 <!-- ==== Method 1 ====== -->
@@ -206 +197 @@
             -skip qtwebengine  \
             -nomake examples   \
+            -nomake tests      \
             -optimized-qmake   &amp;&amp;
 make</userinput></screen>
@@ -261 +253 @@
             -no-nis              \
             -nomake examples     \
+            -nomake tests        \
             -skip qtwebengine    \
             -optimized-qmake     &amp;&amp;
@@ -400 +393 @@
       <parameter>-nomake examples</parameter>: This switch
       disables building of the example programs included
+      in the source tarball. Remove it if you want to build
+      them.
+    </para>
+
+    <para>
+      <parameter>-nomake tests</parameter>: This switch
+      disables building of the test programs included
       in the source tarball. Remove it if you want to build
       them.
@@ -547 +547 @@
           libQt5PlatformSupport.a, libQt5Positioning.so, libQt5PrintSupport.so,
           libQt5QmlDevTools.a, libQt5Qml.so, libQt5QuickParticles.so,
-          libQt5QuickWidgets.so, libQt5Quick.so, libQt5QuickTest.so,
+          libQt5Quick.so, libQt5QuickTest.so, libQt5QuickWidgets.so,
           libQt5Script.so, libQt5ScriptTools.so, libQt5Sensors.so,
           libQt5SerialPort.so, libQt5Sql.so, libQt5Svg.so, libQt5Test.so,
-          libQt5UiTools.a, libQt5WebChannel.so, libQt5WebKit.so,
+          libQt5UiTools.a, libQt5WebChannel.so, libQt5WebEngineCore.so,
+          libQt5WebEngine.so, libQt5WebEngineWidgets.so, libQt5WebKit.so,
           libQt5WebKitWidgets.so, libQt5WebSockets.so, libQt5Widgets.so,
-          libQt5X11Extras.so, libQt5XmlPatterns.so, libQt5Xml.so, and
-          several plugins under /opt/qt5/{imports,plugins,qml}
+          libQt5X11Extras.so, libQt5XmlPatterns.so, libQt5Xml.so, and several
+          plugins under /opt/qt5/{imports,plugins,qml}
         </seg>
         <seg>