Changeset 6b237ce

Timestamp:

03/20/2016 10:03:04 PM (8 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

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

341c964

Parents:

0a63d2e

Message:

Update to qt-5.6.0.
Add qt5webkit as a separate page.
+

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

Files:

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

introduction/welcome/changelog.xml

@@ -49 +49 @@
       <itemizedlist>
         <listitem>
+          <para>[bdubbs] - Update to qt-5.6.0. Fixes
+          <ulink url="&blfs-ticket-root;7598">#7598</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Add qt5webkit as a separate page.</para> 
+        </listitem>
+        <listitem>
           <para>[ken] - Update to postfix-3.1.0. Fixes
           <ulink url="&blfs-ticket-root;7514">#7514</ulink>.</para>
@@ -361 +368 @@
        <listitem>
           <para>[bdubbs] - Add a note that openssl does not support 
-          parallel tets. Fixes 
-          <ulink url="&blfs-ticket-root;7486">#7486</ulink>.</para>
+          parallel tests. Fixes 
+          <ulink url="&blfs-ticket-root;7491">#7491</ulink>.</para>
        </listitem>
        <listitem>

packages.ent

@@ -502 +502 @@
 <!ENTITY pangomm-version              "2.38.1">
 <!ENTITY qt4-version                  "4.8.7">
-<!ENTITY qt5-version                  "5.5.1">
+<!ENTITY qt5-version                  "5.6.0">
+<!ENTITY qtwebkit-version             "5.6.0">
 <!ENTITY shared-mime-info-version     "1.6">
 <!ENTITY startup-notification-version "0.12">

x/lib/lib.xml

@@ -57 +57 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt4.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>

x/lib/qt5.xml

@@ -10 +10 @@
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "c2a249e8795d45200d997d96860d0353">
-  <!ENTITY qt5-size          "306 MB">
-  <!ENTITY qt5-buildsize     "7.6 GB (187 MB installed)">
-  <!ENTITY qt5-time          "98 SBU">
+  <!ENTITY qt5-md5sum        "47763c168f58b1196271b231f03c8bae">
+  <!ENTITY qt5-size          "284 MB">
+  <!ENTITY qt5-buildsize     "7.2 GB (163 MB installed)">
+  <!ENTITY qt5-time          "19.7 SBU (using parallelism=4)">
 ]>
 
@@ -268 +268 @@
     </para>
 
-<screen role="root"><userinput>find $QT5PREFIX -name qt_lib_bootstrap_private.pri \
+<screen role="root"><userinput>find $QT5PREFIX/ -name qt_lib_bootstrap_private.pri \
    -exec sed -i -e "s:$PWD/qtbase:/$QT5PREFIX/lib/:g" {} \; &amp;&amp;
 
-find $QT5PREFIX -name \*.prl \
+find $QT5PREFIX/ -name \*.prl \
    -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>