[blfs-book] r11279 - in trunk/BOOK: . general/graphlib gnome/platform x/lib xfce/apps xsoft/office xsoft/other

krejzi at higgs.linuxfromscratch.org krejzi at higgs.linuxfromscratch.org
Thu Jun 6 08:31:50 PDT 2013


Author: krejzi
Date: Thu Jun  6 08:31:50 2013
New Revision: 11279

Log:
http://cgit.freedesktop.org/cairo/tree/configure.ac#n702 - Next time please ask before removing required dependencies from some package - they might not be strictly required by the package but they definitely are required for our setup. You just screwed up Pango dependencies since we use dependency chain.

Added:
   trunk/BOOK/general/graphlib/libwebp.xml   (contents, props changed)
   trunk/BOOK/x/lib/webkitgtk2.xml
      - copied, changed from r11266, trunk/BOOK/x/lib/webkitgtk.xml
Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/general/graphlib/graphlib.xml
   trunk/BOOK/gnome/platform/yelp.xml
   trunk/BOOK/x/lib/cairo.xml
   trunk/BOOK/x/lib/lib.xml
   trunk/BOOK/x/lib/webkitgtk.xml
   trunk/BOOK/xfce/apps/midori.xml
   trunk/BOOK/xsoft/office/gnucash.xml
   trunk/BOOK/xsoft/other/gimp.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Thu Jun  6 08:17:59 2013	(r11278)
+++ trunk/BOOK/general.ent	Thu Jun  6 08:31:50 2013	(r11279)
@@ -292,6 +292,7 @@
 <!ENTITY libpng-version               "1.6.2">
 <!ENTITY librsvg-version              "2.36.4">
 <!ENTITY libtiff-version              "4.0.3">
+<!ENTITY libwebp-version              "0.3.0">
 <!ENTITY openjpeg-version             "1.5.1">
 <!ENTITY pixman-version               "0.30.0">
 <!ENTITY poppler-version              "0.22.4">
@@ -566,6 +567,7 @@
 <!ENTITY shared-mime-info-version     "1.1">
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.10.2">
+<!ENTITY webkitgtk2-version           "2.0.2">
 <!ENTITY xulrunner-version            "21.0">
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">

Modified: trunk/BOOK/general/graphlib/graphlib.xml
==============================================================================
--- trunk/BOOK/general/graphlib/graphlib.xml	Thu Jun  6 08:17:59 2013	(r11278)
+++ trunk/BOOK/general/graphlib/graphlib.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -41,6 +41,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpng.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="librsvg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libtiff.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libwebp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="openjpeg.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pixman.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="poppler.xml"/>

Added: trunk/BOOK/general/graphlib/libwebp.xml
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ trunk/BOOK/general/graphlib/libwebp.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+  <!ENTITY % general-entities SYSTEM "../../general.ent">
+  %general-entities;
+
+  <!ENTITY libwebp-download-http "https://webp.googlecode.com/files/libwebp-&libwebp-version;.tar.gz">
+  <!ENTITY libwebp-download-ftp  " ">
+  <!ENTITY libwebp-md5sum        "4183f4f51ada98976f14e7bd51f30938">
+  <!ENTITY libwebp-size          "784 KB">
+  <!ENTITY libwebp-buildsize     "12 MB">
+  <!ENTITY libwebp-time          "0.3 SBU">
+]>
+
+<sect1 id="libwebp" xreflabel="libwebp-&libwebp-version;">
+  <?dbhtml filename="libwebp.html"?>
+
+  <sect1info>
+    <othername>$LastChangedBy$</othername>
+    <date>$Date$</date>
+  </sect1info>
+
+  <title>libwebp-&libwebp-version;</title>
+
+  <indexterm zone="libwebp">
+    <primary sortas="a-libwebp">libwebp</primary>
+  </indexterm>
+
+  <sect2 role="package">
+    <title>Introduction to libwebp</title>
+
+    <para>
+      The <application>libwebp</application> package contains a library
+      and support programs to encode and decode images in WebP format.
+    </para>
+
+    &lfs73_checked;
+
+    <bridgehead renderas="sect3">Package Information</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Download (HTTP): <ulink url="&libwebp-download-http;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download (FTP): <ulink url="&libwebp-download-ftp;"/>
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download MD5 sum: &libwebp-md5sum;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Download size: &libwebp-size;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated disk space required: &libwebp-buildsize;
+        </para>
+      </listitem>
+      <listitem>
+        <para>
+          Estimated build time: &libwebp-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">libwebp Dependencies</bridgehead>
+
+    <bridgehead renderas="sect4">Recommended</bridgehead>
+    <para role="recommended">
+      <xref linkend="libjpeg"/>,
+      <xref linkend="libpng"/> and
+      <xref linkend="libtiff"/>
+    </para>
+
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+      <xref linkend="giflib"/>
+    </para>
+
+    <para condition="html" role="usernotes">
+      User Notes: <ulink url="&blfs-wiki;/libwebp"/>
+    </para>
+  </sect2>
+
+  <sect2 role="installation">
+    <title>Installation of libwebp</title>
+
+    <para>
+      Install <application>libwebp</application> by running the following
+      commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr --disable-static &&
+make</userinput></screen>
+
+    <para>
+      This package does not come with a test suite.
+    </para>
+
+    <para>
+      Now, as the <systemitem class="username">root</systemitem> user:
+    </para>
+
+<screen role="root"><userinput>make install</userinput></screen>
+
+  </sect2>
+
+  <sect2 role="commands">
+    <title>Command Explanations</title>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/static-libraries.xml"/>
+
+  </sect2>
+
+  <sect2 role="content">
+    <title>Contents</title>
+
+    <segmentedlist>
+      <segtitle>Installed Programs</segtitle>
+      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Directory</segtitle>
+
+      <seglistitem>
+        <seg>
+          cwebp and dwebp
+        </seg>
+        <seg>
+          libwebp.so
+        </seg>
+        <seg>
+          /usr/include/webp
+        </seg>
+      </seglistitem>
+    </segmentedlist>
+
+    <variablelist>
+      <bridgehead renderas="sect3">Short Descriptions</bridgehead>
+      <?dbfo list-presentation="list"?>
+      <?dbhtml list-presentation="table"?>
+
+      <varlistentry id="cwebp">
+        <term><command>cwebp</command></term>
+        <listitem>
+          <para>
+            compresses an image using the WebP format.
+          </para>
+          <indexterm zone="libwebp cwebp">
+            <primary sortas="b-cwebp">cwebp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="dwebp">
+        <term><command>dwebp</command></term>
+        <listitem>
+          <para>
+            decompresses WebP files into PNG, PAM, PPM or PGM images.
+          </para>
+          <indexterm zone="libwebp dwebp">
+            <primary sortas="b-dwebp">dwebp</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libwebp-lib">
+        <term><filename class="libraryfile">libwebp.so</filename></term>
+        <listitem>
+          <para>
+            contains the API functions for WebP encoding and decoding.
+          </para>
+          <indexterm zone="libwebp libwebp-lib">
+            <primary sortas="c-libwebp">libwebp.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+    </variablelist>
+
+  </sect2>
+
+</sect1>

Modified: trunk/BOOK/gnome/platform/yelp.xml
==============================================================================
--- trunk/BOOK/gnome/platform/yelp.xml	Thu Jun  6 08:17:59 2013	(r11278)
+++ trunk/BOOK/gnome/platform/yelp.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -74,7 +74,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="webkitgtk"/> and
+      <xref linkend="webkitgtk2"/> and
       <xref linkend="yelp-xsl"/>
     </para>
 

Modified: trunk/BOOK/x/lib/cairo.xml
==============================================================================
--- trunk/BOOK/x/lib/cairo.xml	Thu Jun  6 08:17:59 2013	(r11278)
+++ trunk/BOOK/x/lib/cairo.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -87,7 +87,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="libpng"/> and
+      <xref linkend="libpng"/>,
+      <xref linkend="glib2"/> and
       <xref linkend="pixman"/>
     </para>
 

Modified: trunk/BOOK/x/lib/lib.xml
==============================================================================
--- trunk/BOOK/x/lib/lib.xml	Thu Jun  6 08:17:59 2013	(r11278)
+++ trunk/BOOK/x/lib/lib.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -53,6 +53,7 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="shared-mime-info.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="startup-notification.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="webkitgtk2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="xulrunner.xml"/>
 
 </chapter>

Modified: trunk/BOOK/x/lib/webkitgtk.xml
==============================================================================
--- trunk/BOOK/x/lib/webkitgtk.xml	Thu Jun  6 08:17:59 2013	(r11278)
+++ trunk/BOOK/x/lib/webkitgtk.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -8,7 +8,7 @@
   <!ENTITY webkitgtk-download-ftp  " ">
   <!ENTITY webkitgtk-md5sum        "7b1a652af1eb11bee5bf7209e9ff67e6">
   <!ENTITY webkitgtk-size          "8.3 MB">
-  <!ENTITY webkitgtk-buildsize     "800 MB (650 MB for GTK+2 version)">
+  <!ENTITY webkitgtk-buildsize     "650 MB">
   <!ENTITY webkitgtk-time          "55 SBU">
 ]>
 
@@ -30,9 +30,9 @@
     <title>Introduction to WebKitGTK+</title>
 
     <para>
-      The <application>WebKitGTK+</application> package is the port of the
-      portable web rendering engine <application>WebKit</application> to the
-      <application>GTK+</application> platform.
+      The <application>WebKitGTK+</application> is the port of the portable
+      web rendering engine <application>WebKit</application> to the
+      <application>GTK+ 2</application> platform.
     </para>
 
     &lfs73_checked;
@@ -83,16 +83,12 @@
 
     <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
 
-    <!-- webkitgtk 2.0.2 requires libwebp -->
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="gperf"/>,
-      <xref linkend="gst10-plugins-base"/> or
       <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gtk3"/> or
       <xref linkend="gtk2"/>,
       <xref linkend="icu"/>,
-      <xref linkend="libxslt"/>,
       <xref linkend="libsoup"/>,
       <xref linkend="mesalib"/>,
       <xref linkend="ruby"/>,
@@ -102,14 +98,14 @@
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="geoclue"/> and
-      <xref linkend="gobject-introspection"/>
+      <xref linkend="enchant"/> and
+      <xref linkend="geoclue"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
       <xref linkend="curl"/>,
-      <xref linkend="enchant"/>,
+      <xref linkend="gobject-introspection"/>,
       <xref linkend="gtk-doc"/> and
       <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
     </para>
@@ -147,9 +143,9 @@
 
 <screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &&
 ./configure --prefix=/usr \
-            --libexecdir=/usr/lib/WebKitGTK \
-            --with-gstreamer=1.0 \
-            --enable-introspection &&
+            --libexecdir=/usr/lib/webkitgtk2 \
+            --with-gtk=2.0 \
+            --disable-webkit2 &&
 make</userinput></screen>
 
     <para>
@@ -167,19 +163,10 @@
     <title>Command Explanations</title>
 
     <para>
-      <option>--enable-introspection</option>: This switch enables support for
-      <application>Gobject Introspection</application> and is required for a
-      <application>GNOME</application> Desktop. Remove if you don't have
-      <application>Gobject Introspection</application> installed or you don't
-      want to install <application>GNOME</application>.
-    </para>
-
-    <para>
-      <parameter>--with-gstreamer=1.0</parameter>: This switch forces use of
-      <application>GStreamer</application> 1.0 series which
-      <application>GNOME</application> 3.6 uses. Remove if you don't want
-      to install <application>GStreamer</application> 1.0 or you don't
-      want to install <application>GNOME</application>.
+      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
+      force <application>WebKitGTK+</application> to compile against
+      <application>GTK+ 2</application>, even if
+      <application>GTK+ 3</application> is also installed.
     </para>
 
     <para>
@@ -188,18 +175,6 @@
       fail.
     </para>
 
-    <para>
-      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
-      force <application>WebKitGTK+</application> to compile against
-      <application>GTK+ 2</application>, even if
-      <application>GTK+ 3</application> is also installed. With
-      <application>GTK+ 2</application>, everything
-      <application>WebKitGTK+</application> installs is suffixed with 1.0. When it
-      is compiled against <application>GTK+ 3</application> everything it
-      installs is suffixed with 3.0. Both versions can be installed alongside
-      one another with no namespace conflicts.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
 
@@ -210,22 +185,19 @@
 
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          jsc-1 or jsc-3
+          jsc-1
         </seg>
         <seg>
-          libjavascriptcoregtk-1.0.so and libwebkit-1.0.so or
-          libjavascriptcoregtk-3.0.so, libwebkit2gtk-3.0.so and
-          libwebkit-3.0.so
+          libjavascriptcoregtk-1.0.so and libwebkit-1.0.so
         </seg>
         <seg>
-          /usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
-          /usr/include/webkit-3.0, /usr/lib/WebKit and
-          /usr/share/webkit-3.0
+          /usr/include/webkit-1.0, /usr/share/webkit-1.0 and
+          /usr/lib/webkitgtk2
         </seg>
       </seglistitem>
     </segmentedlist>
@@ -235,15 +207,15 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="jsc">
-        <term><command>jsc-1</command> or <command>jsc-3</command></term>
+      <varlistentry id="jsc-1">
+        <term><command>jsc-1</command></term>
         <listitem>
           <para>
             is a command-line utility that allows you to run JavaScript programs
             outside of the context of a web browser.
           </para>
-          <indexterm zone="webkitgtk jsc">
-            <primary sortas="b-jsc">jsc</primary>
+          <indexterm zone="webkitgtk jsc-1">
+            <primary sortas="b-jsc-1">jsc-1</primary>
           </indexterm>
         </listitem>
       </varlistentry>
@@ -274,45 +246,6 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-3">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by <command>jsc-3</command>
-            and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-3">
-            <primary sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-3">
-        <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 3</application>.
-          </para>
-          <indexterm zone="webkitgtk libwebkitgtk-3">
-            <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkit2gtk-3">
-        <term><filename class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKit2</application> API functions.
-          </para>
-          <indexterm zone="webkitgtk libwebkit2gtk-3">
-            <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
 
     </variablelist>
 

Copied and modified: trunk/BOOK/x/lib/webkitgtk2.xml (from r11266, trunk/BOOK/x/lib/webkitgtk.xml)
==============================================================================
--- trunk/BOOK/x/lib/webkitgtk.xml	Wed Jun  5 02:57:06 2013	(r11266, copy source)
+++ trunk/BOOK/x/lib/webkitgtk2.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -4,25 +4,25 @@
   <!ENTITY % general-entities SYSTEM "../../general.ent">
   %general-entities;
 
-  <!ENTITY webkitgtk-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
-  <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "7b1a652af1eb11bee5bf7209e9ff67e6">
-  <!ENTITY webkitgtk-size          "8.3 MB">
-  <!ENTITY webkitgtk-buildsize     "800 MB (650 MB for GTK+2 version)">
-  <!ENTITY webkitgtk-time          "55 SBU">
+  <!ENTITY webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
+  <!ENTITY webkitgtk2-download-ftp  " ">
+  <!ENTITY webkitgtk2-md5sum        "a4024f4b33d829ec1034179e94f9cab6">
+  <!ENTITY webkitgtk2-size          "9.4 MB">
+  <!ENTITY webkitgtk2-buildsize     "900 MB">
+  <!ENTITY webkitgtk2-time          "60 SBU">
 ]>
 
-<sect1 id="webkitgtk" xreflabel="WebKitGTK+-&webkitgtk-version;">
-  <?dbhtml filename="webkitgtk.html"?>
+<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk-version;">
+  <?dbhtml filename="webkitgtk2.html"?>
 
   <sect1info>
     <othername>$LastChangedBy$</othername>
     <date>$Date$</date>
   </sect1info>
 
-  <title>WebKitGTK+-&webkitgtk-version;</title>
+  <title>WebKitGTK+-&webkitgtk2-version;</title>
 
-  <indexterm zone="webkitgtk">
+  <indexterm zone="webkitgtk2">
     <primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
   </indexterm>
 
@@ -30,9 +30,9 @@
     <title>Introduction to WebKitGTK+</title>
 
     <para>
-      The <application>WebKitGTK+</application> package is the port of the
-      portable web rendering engine <application>WebKit</application> to the
-      <application>GTK+</application> platform.
+      The <application>WebKitGTK+</application> is the port of the portable
+      web rendering engine <application>WebKit</application> to the
+      <application>GTK+ 3</application> platform.
     </para>
 
     &lfs73_checked;
@@ -41,75 +41,64 @@
     <itemizedlist spacing="compact">
       <listitem>
         <para>
-          Download (HTTP): <ulink url="&webkitgtk-download-http;"/>
+          Download (HTTP): <ulink url="&webkitgtk2-download-http;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download (FTP): <ulink url="&webkitgtk-download-ftp;"/>
+          Download (FTP): <ulink url="&webkitgtk2-download-ftp;"/>
         </para>
       </listitem>
       <listitem>
         <para>
-          Download MD5 sum: &webkitgtk-md5sum;
+          Download MD5 sum: &webkitgtk2-md5sum;
         </para>
       </listitem>
       <listitem>
         <para>
-          Download size: &webkitgtk-size;
+          Download size: &webkitgtk2-size;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated disk space required: &webkitgtk-buildsize;
+          Estimated disk space required: &webkitgtk2-buildsize;
         </para>
       </listitem>
       <listitem>
         <para>
-          Estimated build time: &webkitgtk-time;
-        </para>
-      </listitem>
-    </itemizedlist>
-
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch"/>
+          Estimated build time: &webkitgtk2-time;
         </para>
       </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
 
-    <!-- webkitgtk 2.0.2 requires libwebp -->
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
       <xref linkend="gperf"/>,
-      <xref linkend="gst10-plugins-base"/> or
-      <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gtk3"/> or
-      <xref linkend="gtk2"/>,
+      <xref linkend="gst10-plugins-base"/>,
+      <xref linkend="gtk3"/>,
       <xref linkend="icu"/>,
-      <xref linkend="libxslt"/>,
+      <xref linkend="libsecret"/>,
       <xref linkend="libsoup"/>,
+      <xref linkend="libwebp"/>,
       <xref linkend="mesalib"/>,
       <xref linkend="ruby"/>,
-      <xref linkend="sqlite"/> and
+      <xref linkend="sqlite"/>,
+      <xref linkend="udev"/> or
+      <xref linkend="udev-extras"/> (for GUdev) and
       <xref linkend="which"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="enchant"/>,
       <xref linkend="geoclue"/> and
       <xref linkend="gobject-introspection"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="curl"/>,
-      <xref linkend="enchant"/>,
       <xref linkend="gtk-doc"/> and
       <ulink url="http://xsltml.sourceforge.net/">MathML</ulink>
     </para>
@@ -145,10 +134,8 @@
       following commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-fix_librt_linking-1.patch &&
-./configure --prefix=/usr \
-            --libexecdir=/usr/lib/WebKitGTK \
-            --with-gstreamer=1.0 \
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/webkitgtk3 \
             --enable-introspection &&
 make</userinput></screen>
 
@@ -175,31 +162,11 @@
     </para>
 
     <para>
-      <parameter>--with-gstreamer=1.0</parameter>: This switch forces use of
-      <application>GStreamer</application> 1.0 series which
-      <application>GNOME</application> 3.6 uses. Remove if you don't want
-      to install <application>GStreamer</application> 1.0 or you don't
-      want to install <application>GNOME</application>.
-    </para>
-
-    <para>
       <option>--disable-geolocation</option>: Use this option if you did not
       install <xref linkend="geoclue"/> or <command>configure</command> will
       fail.
     </para>
 
-    <para>
-      <parameter>--with-gtk=2.0 --disable-webkit2</parameter>: These parameters
-      force <application>WebKitGTK+</application> to compile against
-      <application>GTK+ 2</application>, even if
-      <application>GTK+ 3</application> is also installed. With
-      <application>GTK+ 2</application>, everything
-      <application>WebKitGTK+</application> installs is suffixed with 1.0. When it
-      is compiled against <application>GTK+ 3</application> everything it
-      installs is suffixed with 3.0. Both versions can be installed alongside
-      one another with no namespace conflicts.
-    </para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
       href="../../xincludes/gtk-doc-rebuild.xml"/>
 
@@ -210,21 +177,19 @@
 
     <segmentedlist>
       <segtitle>Installed Program</segtitle>
-      <segtitle>Installed Library</segtitle>
+      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>
-          jsc-1 or jsc-3
+          jsc-3
         </seg>
         <seg>
-          libjavascriptcoregtk-1.0.so and libwebkit-1.0.so or
           libjavascriptcoregtk-3.0.so, libwebkit2gtk-3.0.so and
           libwebkit-3.0.so
         </seg>
         <seg>
-          /usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
-          /usr/include/webkit-3.0, /usr/lib/WebKit and
+          /usr/include/webkit-3.0, /usr/lib/webkitgtk3 and
           /usr/share/webkit-3.0
         </seg>
       </seglistitem>
@@ -235,42 +200,15 @@
       <?dbfo list-presentation="list"?>
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="jsc">
-        <term><command>jsc-1</command> or <command>jsc-3</command></term>
+      <varlistentry id="jsc-3">
+        <term><command>jsc-3</command></term>
         <listitem>
           <para>
             is a command-line utility that allows you to run JavaScript programs
             outside of the context of a web browser.
           </para>
-          <indexterm zone="webkitgtk jsc">
-            <primary sortas="b-jsc">jsc</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-1">
-        <term><filename
-        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains core JavaScript API functions used by <command>jsc-1</command>
-            and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
-          </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-1">
-            <primary sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-1">
-        <term><filename class="libraryfile">libwebkitgtk-1.0.so</filename></term>
-        <listitem>
-          <para>
-            contains the <application>WebKitGTK+</application> API functions for
-            <application>GTK+ 2</application>.
-          </para>
-          <indexterm zone="webkitgtk libwebkitgtk-1">
-            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
+          <indexterm zone="webkitgtk2 jsc-3">
+            <primary sortas="b-jsc-3">jsc-3</primary>
           </indexterm>
         </listitem>
       </varlistentry>

Modified: trunk/BOOK/xfce/apps/midori.xml
==============================================================================
--- trunk/BOOK/xfce/apps/midori.xml	Thu Jun  6 08:17:59 2013	(r11278)
+++ trunk/BOOK/xfce/apps/midori.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -75,8 +75,8 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="webkitgtk"/> (configured --with-gtk=2.0) or
-      <xref linkend="webkitgtk"/> (configured --with-gtk=3.0) and
+      <xref linkend="webkitgtk"/> or
+      <xref linkend="webkitgtk2"/> and
       <xref linkend="vala"/>
     </para>
 

Modified: trunk/BOOK/xsoft/office/gnucash.xml
==============================================================================
--- trunk/BOOK/xsoft/office/gnucash.xml	Thu Jun  6 08:17:59 2013	(r11278)
+++ trunk/BOOK/xsoft/office/gnucash.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -121,7 +121,7 @@
       <xref linkend="gnome-vfs"/>,
       <xref linkend="slib"/>,
       <xref linkend="goffice"/> and
-      <xref linkend="webkitgtk"/> (configured <option>--with-gtk=2.0</option>).
+      <xref linkend="webkitgtk"/>
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>

Modified: trunk/BOOK/xsoft/other/gimp.xml
==============================================================================
--- trunk/BOOK/xsoft/other/gimp.xml	Thu Jun  6 08:17:59 2013	(r11278)
+++ trunk/BOOK/xsoft/other/gimp.xml	Thu Jun  6 08:31:50 2013	(r11279)
@@ -145,9 +145,7 @@
       an <xref linkend="server-mail"/> (that provides a
       <command>sendmail</command> program),
       <xref linkend="udev"/> or <xref linkend="udev-extras"/> (for GUdev),
-      <xref linkend="webkitgtk"/> (this must be compiled with the
-      <application>GTK+ 2</application> backend for the
-      <application>Gimp</application> to use it as its help browser) and
+      <xref linkend="webkitgtk"/> and
       <xref linkend="gtk-doc"/>
     </para>
 



More information about the blfs-book mailing list