Changeset fb04cfdd


Ignore:
Timestamp:
04/04/2016 05:04:59 PM (5 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
10.0, 10.1, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, nosym, perl-modules, qt5new, trunk, xry111/git-date, xry111/git-date-for-trunk, xry111/git-date-test
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:
2 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    r413a120e rfb04cfdd  
    4646
    4747    <listitem>
    48       <para>April 3rd, 2016</para>
    49       <itemizedlist>
     48      <para>April 4th, 2016</para>
     49      <itemizedlist>
     50        <listitem>
     51          <para>[pierre] - Change instructions so that Midori depend on newer
     52          versions of WebKitGTK+. Fixes
     53          <ulink url="&blfs-ticket-root;7611">#7611</ulink>.</para>
     54        </listitem>
    5055        <listitem>
    5156          <para>[bdubbs] - Update to inputproto-2.3.2. Fixes
  • xfce/apps/midori.xml

    r413a120e rfb04cfdd  
    8080      <xref linkend="gcr"/>,
    8181      <xref linkend="libnotify"/>,
    82       <xref linkend="webkitgtk2"/> (see "Command Explanations"), and
     82      <xref linkend="webkitgtk"/> (see "Command Explanations"), and
    8383      <xref linkend="vala"/>
    8484    </para>
     
    9191    <bridgehead renderas="sect4">Optional</bridgehead>
    9292    <para role="optional">
    93       <xref linkend="gtk-doc"/> and
     93      <xref linkend="gtk-doc"/>,
     94      <xref linkend="webkitgtk2"/>, and
    9495      <ulink url="https://launchpad.net/zeitgeist/0.9/">Zeitgeist</ulink>
    9596    </para>
     
    123124      -DCMAKE_BUILD_TYPE=Release  \
    124125      -DUSE_ZEITGEIST=OFF         \
     126      -DHALF_BRO_INCOM_WEBKIT2=ON \
    125127      -DUSE_GTK3=1                \
    126128      -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/midori-&midori-version; \
     
    151153
    152154    <para>
    153       <parameter>-DUSE_GTK3=1</parameter>: Use this switch chooses
    154       <application>WebKitGTK+</application> built against
    155       <application>GTK+ 3</application>, for <application>WebKit2</application>
    156       layer support.
     155      <parameter>-DHALF_BRO_INCOM_WEBKIT2=ON</parameter>: Links to <xref
     156      linkend="webkitgtk"/> instead of <xref linkend="webkitgtk2"/>. Strictly
     157      speaking, <xref linkend="webkitgtk"/> is not required and Midori could
     158      be linked to <xref linkend="webkitgtk2"/>. The former is deemed <quote>
     159      experimental</quote> by upstream, but seems to work well. The latter is
     160      an older API and less secure.
     161    </para>
     162
     163    <para>
     164      <parameter>-DUSE_GTK3=1</parameter>: Using this switch allows linking to
     165      WebkitGTK+ built against <application>GTK+ 3</application>.
    157166    </para>
    158167
Note: See TracChangeset for help on using the changeset viewer.