Changeset fb04cfdd

Timestamp:

04/04/2016 05:04:59 PM (7 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, ken/inkscape-core-mods, lazarus, nosym, perl-modules, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

1b777da

Parents:

413a120e

Message:

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• xfce/apps/midori.xml (modified) (4 diffs)

introduction/welcome/changelog.xml

@@ -46 +46 @@
 
     <listitem>
-      <para>April 3rd, 2016</para>
-      <itemizedlist>
+      <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

xfce/apps/midori.xml

@@ -80 +80 @@
       <xref linkend="gcr"/>,
       <xref linkend="libnotify"/>,
-      <xref linkend="webkitgtk2"/> (see "Command Explanations"), and
+      <xref linkend="webkitgtk"/> (see "Command Explanations"), and
       <xref linkend="vala"/>
     </para>
@@ -91 +91 @@
     <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>
@@ -123 +124 @@
       -DCMAKE_BUILD_TYPE=Release  \
       -DUSE_ZEITGEIST=OFF         \
+      -DHALF_BRO_INCOM_WEBKIT2=ON \
       -DUSE_GTK3=1                \
       -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
@@ -151 +153 @@
 
     <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>