Author: krejzi
Date: Sat Apr  9 03:03:24 2016
New Revision: 17234

Log:
New QtWebKit tarball -> Update md5sum and remove syncqt instructions which 
aren't needed anymore. Update deps for Qt5 and QtWebKit.

Modified:
   trunk/BOOK/x/lib/qt5.xml
   trunk/BOOK/x/lib/qtwebkit5.xml

Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml    Fri Apr  8 02:36:38 2016        (r17233)
+++ trunk/BOOK/x/lib/qt5.xml    Sat Apr  9 03:03:24 2016        (r17234)
@@ -91,23 +91,24 @@
       <xref linkend="alsa-lib"/>,
       <xref linkend="cacerts"/>,
       <xref linkend="cups"/>,
-      <xref linkend="dbus"/> (required for QtWebKit),
       <xref linkend="glib2"/>,
-      <xref linkend="gst10-plugins-base"/> (QtWebKit HTML5 Video Support),
-      <xref linkend="icu"/> (required for QtWebKit),
+      <xref linkend="gst10-plugins-base"/> (QtMultimedia backend),
+      <xref linkend="icu"/>,
       <xref linkend="jasper"/>,
       <xref linkend="libjpeg"/>,
       <xref linkend="libmng"/>,
       <xref linkend="libpng"/>,
       <xref linkend="libtiff"/>,
-      <xref linkend="libwebp"/>,
       <xref linkend="libxkbcommon"/>,
       <xref linkend="mesa"/>,
       <xref linkend="mtdev"/>,
+      <xref linkend="nss"/> (required for QtWebEngine),
       <xref linkend="openssl"/>,
       <xref linkend="pcre"/>,
       <xref linkend="sqlite"/>,
-      <xref linkend="ruby"/> (required for QtWebKit),
+      <xref linkend="wayland"/> (<application>Mesa</application>
+      must be built with <application>Wayland</application> EGL
+      backend),
       <xref linkend="xcb-util-image"/>,
       <xref linkend="xcb-util-keysyms"/>,
       <xref linkend="xcb-util-renderutil"/>, and
@@ -116,15 +117,17 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="geoclue"/>,
-      <xref linkend="gtk2"/> (GTK+ Theme Support),
-      <xref linkend="harfbuzz"/>, <!-- Doesn't have all the features that the 
included one has. -->
-      <xref linkend="libinput"/>,
+      <xref linkend="bluez"/> (runtime, used by QtConnectivity module),
+      <!-- dropped from 5.5 <xref linkend="geoclue"/>, -->
+      <!-- dropped from 5.6 <xref linkend="gtk2"/> (GTK+ Theme Support), -->
+      <xref linkend="harfbuzz"/>, <!-- Doesn't have all the features that the 
included one has. # Armin, 2016-04-09: It does now -->
+      <xref linkend="libinput"/>, <!-- needs -libinput switch -->
       <xref linkend="mariadb"/> or <ulink 
url="http://www.mysql.com/";>MySQL</ulink>,
       <xref linkend="postgresql"/>,
       <xref linkend="pulseaudio"/>,
-      <xref linkend="unixodbc"/>, and
-      <ulink url="https://github.com/ibus/ibus/wiki";>ibus</ulink>
+      <xref linkend="unixodbc"/>,
+      <ulink url="http://www.firebirdsql.org/";>Firebird</ulink>, and
+      <ulink url="https://github.com/ibus/ibus/wiki";>IBus</ulink>
     </para>
 
     <para condition="html" role="usernotes">User Notes:

Modified: trunk/BOOK/x/lib/qtwebkit5.xml
==============================================================================
--- trunk/BOOK/x/lib/qtwebkit5.xml      Fri Apr  8 02:36:38 2016        (r17233)
+++ trunk/BOOK/x/lib/qtwebkit5.xml      Sat Apr  9 03:03:24 2016        (r17234)
@@ -9,7 +9,7 @@
 
   <!ENTITY qtwebkit-download-http 
"&qtwebkit-url;/qtwebkit-opensource-src-&qtwebkit-version;.tar.xz">
   <!ENTITY qtwebkit-download-ftp  " ">
-  <!ENTITY qtwebkit-md5sum        "eba1382587add1c9b1293a532e7dd161">
+  <!ENTITY qtwebkit-md5sum        "b68565d18db63ee4db998bb8e37608a5">
   <!ENTITY qtwebkit-size          "34 MB">
   <!ENTITY qtwebkit-buildsize     "741 MB (37 MB installed)">
   <!ENTITY qtwebkit-time          "15.7 SBU (using parallelism=4)">
@@ -76,12 +76,21 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="icu"/>,
       <xref linkend="libjpeg"/>,
       <xref linkend="libpng"/>,
-      <xref linkend="phonon"/> (built with <xref linkend='qt5'/>), and
+      <xref linkend="libwebp"/>,
+      <xref linkend="libxslt"/>,
+      <xref linkend="qt5"/>,
+      <xref linkend="ruby"/>, and
       <xref linkend="sqlite"/>
     </para>
 
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="gst10-plugins-base"/> (HTML5 Video Support)
+    </para>
+
     <para condition="html" role="usernotes">User Notes:
       <ulink url="&blfs-wiki;/qtwebkit"/>
     </para>
@@ -94,8 +103,8 @@
       Install <application>Qtwebkit</application> by running the following 
commands:
     </para>
 
-<screen><userinput>syncqt.pl -version 5.6.0 Source/sync.profile &amp;&amp;
-qmake &amp;&amp;
+<screen><userinput><!--syncqt.pl -version 5.6.0 Source/sync.profile &amp;&amp;
+-->qmake &amp;&amp;
 make</userinput></screen>
 
     <para>
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to