Changeset 37191af for xfce

Timestamp:

05/07/2016 04:37:10 AM (8 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

systemd-13485

Children:

d7bee48

Parents:

54aaa89

Message:

Sync to trunk r17270. Last round for the night.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/systemd@17330 af4574ff-66df-0310-9fd7-8a98e5e911e0

Location:

xfce

Files:

• apps/midori.xml (modified) (4 diffs)
• core/tumbler.xml (modified) (2 diffs)

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
       <xref linkend="libzeitgeist"/>
     </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; \
@@ -148 +150 @@
       <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
       Zeitgeist is installed.
+    </para>
+
+    <para>
+      <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>
 

xfce/core/tumbler.xml

@@ -84 +84 @@
     <para role="optional">
       <xref linkend="curl"/>,
-      <ulink url="http://code.google.com/p/ffmpegthumbnailer/">FFmpegThumbnailer</ulink>,
       <xref linkend="freetype2"/>,
       <xref linkend="gdk-pixbuf"/>,
@@ -91 +90 @@
       <xref linkend="libjpeg"/>,
       <xref linkend="libgsf"/>,
-      <ulink url="http://libopenraw.freedesktop.org/">libopewnraw</ulink>,
-      <xref linkend="libpng"/> and
-      <xref linkend="poppler"/>
+      <xref linkend="libpng"/>,
+      <xref linkend="poppler"/>,
+      <ulink url="http://code.google.com/p/ffmpegthumbnailer/">FFmpegThumbnailer</ulink>, and
+      <ulink url="http://libopenraw.freedesktop.org/">libopenraw</ulink>
     </para>