From fb04cfdd0e1ce2a176b47f9d0881df41d040f73b Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Mon, 4 Apr 2016 17:04:59 +0000
Subject: [PATCH] Instruct Midori to depend on newer versions of WebKitGTK+

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17220 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  7 ++++++-
 xfce/apps/midori.xml               | 21 +++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7e374f39a2..4e872fd69f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,8 +45,13 @@
 -->
 
     <listitem>
-      <para>April 3rd, 2016</para>
+      <para>April 4th, 2016</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Change instructions so that Midori depend on newer
+          versions of WebKitGTK+. Fixes
+          <ulink url="&blfs-ticket-root;7611">#7611</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to inputproto-2.3.2. Fixes
           <ulink url="&blfs-ticket-root;7682">#7682</ulink>.</para>
diff --git a/xfce/apps/midori.xml b/xfce/apps/midori.xml
index 095e0bbe96..8c3ee6d5cf 100644
--- a/xfce/apps/midori.xml
+++ b/xfce/apps/midori.xml
@@ -79,7 +79,7 @@
       <xref linkend="cmake"/>,
       <xref linkend="gcr"/>,
       <xref linkend="libnotify"/>,
-      <xref linkend="webkitgtk2"/> (see "Command Explanations"), and
+      <xref linkend="webkitgtk"/> (see "Command Explanations"), and
       <xref linkend="vala"/>
     </para>
 
@@ -90,7 +90,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> and
+      <xref linkend="gtk-doc"/>,
+      <xref linkend="webkitgtk2"/>, and
       <ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink>
     </para>
 
@@ -122,6 +123,7 @@ cd    build &amp;&amp;
 cmake -DCMAKE_INSTALL_PREFIX=/usr \
       -DCMAKE_BUILD_TYPE=Release  \
       -DUSE_ZEITGEIST=OFF         \
+      -DHALF_BRO_INCOM_WEBKIT2=ON \
       -DUSE_GTK3=1                \
       -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
       ..  &amp;&amp;
@@ -150,10 +152,17 @@ make</userinput></screen>
     </para>
 
     <para>
-      <parameter>-DUSE_GTK3=1</parameter>: Use this switch chooses
-      <application>WebKitGTK+</application> built against
-      <application>GTK+ 3</application>, for <application>WebKit2</application>
-      layer support.
+      <parameter>-DHALF_BRO_INCOM_WEBKIT2=ON</parameter>: Links to <xref
+      linkend="webkitgtk"/> instead of <xref linkend="webkitgtk2"/>. Strictly
+      speaking, <xref linkend="webkitgtk"/> is not required and Midori could
+      be linked to <xref linkend="webkitgtk2"/>. The former is deemed <quote>
+      experimental</quote> by upstream, but seems to work well. The latter is
+      an older API and less secure.
+    </para>
+
+    <para>
+      <parameter>-DUSE_GTK3=1</parameter>: Using this switch allows linking to
+      WebkitGTK+ built against <application>GTK+ 3</application>.
     </para>
 
     <para>