Changeset 6ed1066

Timestamp:

12/02/2014 09:46:14 PM (9 years ago)

Author:

Christopher Gregory <cjg@…>

Branches:

systemd-13485

Children:

7d245c2

Parents:

17a61a18

Message:

Redo midori merge as it did not do it correctly.

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

File:

• xfce/apps/midori.xml (modified) (3 diffs)

xfce/apps/midori.xml

@@ -78 +78 @@
       <xref linkend="cmake"/>,
       <xref linkend="libnotify"/>,
-      <xref linkend="webkitgtk2"/> (Compiled against either GTK+ 2 or GTK+ 3 - see "Command Explanations"), and
+      <xref linkend="webkitgtk2"/> (see "Command Explanations"), and
       <xref linkend="vala"/>
     </para>
@@ -92 +92 @@
       <xref linkend="gtk-doc"/> and
       <xref linkend="libzeitgeist"/>
-<!--      <xref linkend="libunique"/> or
-      <ulink url="&gnome-download-http;/libunique/">libunique (3.x)</ulink>-->
     </para>
 
@@ -137 +135 @@
 
     <para><parameter>-DCMAKE_BUILD_TYPE=Release</parameter>: This switch is
-    used to force building with Qt4 even if Qt5 is found.</para>
-
-    <para>
-      <option>--enable-gtk3</option>: Use this switch if you want
-      to build <application>Midori</application> using
-      <application>WebKitGTK+</application> built against
-      <application>GTK+ 3</application>.
-      <command>configure</command> defaults to
-      <application>GTK+ 2</application> version of
-      <application>WebKitGTK+</application>.
-    </para>
-
-    <para>
-      <option>--enable-apidocs</option>: Use this switch if
+    used to apply a higher level of compiler optimizations.</para>
+
+    <para>
+      <parameter>-DUSE_ZEITGEIST=OFF</parameter>: Remove this switch if
+      <xref linkend="libzeitgeist"/> is installed. 
+    </para>
+
+    <para>
+      <option>-DUSE_GTK3=1</option>: Use this switch if you want to build
+      <application>Midori</application> with
+      <application>WebKitGTK+</application> built against <application>GTK+
+      3</application>, because by default it chooses
+      <application>WebKitGTK+</application> built against <application>GTK+
+      2</application>.
+    </para>
+
+    <para>
+      <option>-DUSE_APIDOCS=1</option>: Use this switch if
       <application>GTK-Doc</application> is installed and you
       wish to build and install the API documentation. 
-    </para>
-
-    <para>
-      <command>export NOCOLOR=1</command>: This prevents the build
-      process outputting colored text. Colored text is fine if
-      you're running the commands in a terminal, but if you compile
-      it with a script and pipe the output to a log file the control
-      characters that color the text can makehe log file difficult
-      to read with a text editor.
     </para>