Changeset 272858d

Timestamp:

04/09/2016 10:03:24 AM (8 years ago)

Author:

Krejzi <krejzi@…>

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:

5faaa9b5

Parents:

2b65035a

Message:

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

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

Location:

x/lib

Files:

• qt5.xml (modified) (3 diffs)
• qtwebkit5.xml (modified) (3 diffs)

x/lib/qt5.xml

@@ -92 +92 @@
       <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"/>,
@@ -101 +100 @@
       <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"/>,
@@ -117 +118 @@
     <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>
 

x/lib/qtwebkit5.xml

@@ -10 +10 @@
   <!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)">
@@ -77 +77 @@
     <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>
 
@@ -95 +104 @@
     </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>