Author: andy
Date: 2011-12-12 06:12:28 -0700 (Mon, 12 Dec 2011)
New Revision: 9101

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/webkitgtk.xml
Log:
webkit-1.6.1

Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent      2011-12-12 05:30:20 UTC (rev 9100)
+++ trunk/BOOK/general.ent      2011-12-12 13:12:28 UTC (rev 9101)
@@ -3,13 +3,13 @@
 $Date$
 -->
 
-<!ENTITY day          "11">                   <!-- Always 2 digits -->
+<!ENTITY day          "12">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2011">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "December 11th, &year;">
+<!ENTITY releasedate  "December 12th, &year;">
 <!-- <!ENTITY releasedate  "November &day;st, &year;"> -->
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
@@ -207,7 +207,7 @@
 <!ENTITY libdaemon-version            "0.14">
 <!ENTITY ptlib-version                "2.6.7">
 <!ENTITY libatasmart-version          "0.17">
-<!ENTITY talloc-version               "2.0.7">
+<!ENTITY talloc-version               "2.0.1">
 <!ENTITY telepathy-glib-version       "0.9.2">
 <!ENTITY wv-version                   "1.2.9">
 <!ENTITY clucene-version              "0.9.21b">
@@ -228,11 +228,11 @@
 <!-- Chapter 9 -->
 <!ENTITY libjpeg-version              "8c">
 <!ENTITY libpng-version               "1.5.5">
-<!ENTITY libtiff-version              "3.9.5">
+<!ENTITY libtiff-version              "3.9.4">
 <!ENTITY giflib-version               "4.1.6">
 <!ENTITY lcms-version                 "1.19">
 <!ENTITY libmng-version               "1.0.10">
-<!ENTITY freetype2-version            "2.4.8">
+<!ENTITY freetype2-version            "2.4.4">
 <!ENTITY fontconfig-version           "2.8.0">
 <!ENTITY libart_lgpl-version          "2.3.21">
 <!ENTITY librsvg-version              "2.26.3">
@@ -243,11 +243,11 @@
 <!ENTITY fribidi-version              "0.10.9">
 <!ENTITY poppler-version              "0.14.4">
 <!ENTITY jasper-version               "1.900.1">
-<!ENTITY pixman-version               "0.24.0">
+<!ENTITY pixman-version               "0.15.20">
 <!ENTITY clutter-version              "1.2.10">
 <!ENTITY clutter-gtk-version          "0.10.4">
-<!ENTITY babl-version                 "0.1.6">
-<!ENTITY gegl-version                 "0.1.8">
+<!ENTITY babl-version                 "0.1.2">
+<!ENTITY gegl-version                 "0.1.2">
 
 <!-- Obsolete
 <!ENTITY libungif-version             "4.1.3">
@@ -256,14 +256,14 @@
 
 <!-- Chapter 10 -->
 <!ENTITY bc-version                   "1.06.95">
-<!ENTITY rep-gtk-version              "0.90.2">
+<!ENTITY rep-gtk-version              "0.18">
 <!ENTITY sharutils-version            "4.11.1">
 <!ENTITY compface-version             "1.5.2">
 <!ENTITY imagemagick-version          "6.7.3">
 <!ENTITY hd2u-version                 "1.0.1">
 <!ENTITY gtk-doc-version              "1.14">
 <!ENTITY scrollkeeper-version         "0.3.14">
-<!ENTITY intltool-version             "0.50.0">
+<!ENTITY intltool-version             "0.41.1">
 <!ENTITY screen-version               "4.0.3">
 <!ENTITY tidy-version                 "cvs_20101110">
 <!ENTITY desktop-file-utils-version   "0.17">
@@ -330,8 +330,7 @@
 <!ENTITY icedtea6-version             "1.9.7">
 <!ENTITY jdk-version                  "6 Update 18">
 <!ENTITY junit-version                "4.8.1">
-<!ENTITY librep-version               "0.90.5">
-<!ENTITY llvm-version                 "3.0">
+<!ENTITY librep-version               "0.17">
 <!ENTITY NASM-version                 "2.09.10">
 <!ENTITY yasm-version                 "1.2.0">
 <!ENTITY pdl-version                  "2.4.2">
@@ -572,7 +571,7 @@
 <!ENTITY goffice-version              "0.8.10">
 <!ENTITY mesalib-version              "7.9">
 <!ENTITY xulrunner-version            "8.0.1">
-<!ENTITY webkitgtk-version            "1.2.5">
+<!ENTITY webkitgtk-version            "1.6.1">
 <!ENTITY libsexy-version              "0.1.11">
 <!ENTITY libnotify-version            "0.4.5">
 <!ENTITY notification-daemon-version  "0.4.0">
@@ -775,7 +774,7 @@
 <!ENTITY AbiWord-version              "2.8.6">
 <!ENTITY gnumeric-version             "1.10.11">
 <!ENTITY gnucash-version              "2.2.4">
-<!ENTITY gimp-version                 "2.6.11">
+<!ENTITY gimp-version                 "2.6.8">
 <!ENTITY evolution-version            "2.30.2">
 <!ENTITY icedtea-web-version          "1.0.1">
 

Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       2011-12-12 05:30:20 UTC 
(rev 9100)
+++ trunk/BOOK/introduction/welcome/changelog.xml       2011-12-12 13:12:28 UTC 
(rev 9101)
@@ -42,6 +42,15 @@
 
 -->
     <listitem>
+      <para>December 12th, 2011</para>
+      <itemizedlist>
+        <listitem>
+          <para>[abenton] - Updated Webkitgtk to 1.6.1.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>December 11th, 2011</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/lib/webkitgtk.xml
===================================================================
--- trunk/BOOK/x/lib/webkitgtk.xml      2011-12-12 05:30:20 UTC (rev 9100)
+++ trunk/BOOK/x/lib/webkitgtk.xml      2011-12-12 13:12:28 UTC (rev 9101)
@@ -6,10 +6,10 @@
 
   <!ENTITY webkitgtk-download-http 
"http://webkitgtk.org/webkit-&webkitgtk-version;.tar.gz";>
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "09f04985665b9abf6f0d9956f86a6a31">
-  <!ENTITY webkitgtk-size          "6.5 MB">
-  <!ENTITY webkitgtk-buildsize     "300 MB">
-  <!ENTITY webkitgtk-time          "18 SBU">
+  <!ENTITY webkitgtk-md5sum        "c11743694b1b71dad287b2e7a9e73b05">
+  <!ENTITY webkitgtk-size          "9.7 MB">
+  <!ENTITY webkitgtk-buildsize     "500 MB (38 MB installed)">
+  <!ENTITY webkitgtk-time          "28 SBU">
 ]>
 
 <sect1 id="webkitgtk" xreflabel="WebKitGTK+-&webkitgtk-version;">
@@ -33,7 +33,7 @@
     portable web rendering engine <application>WebKit</application> to the
     <application>GTK+</application> platform.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -60,29 +60,20 @@
     <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
-    <para role="required"><xref linkend="enchant"/>,
-    <xref linkend="gperf"/>,
-    <xref linkend="gst-plugins-base"/>,
-    <xref linkend="gtk2"/>,
-    <xref linkend="icu"/>,
-    <xref linkend="libjpeg"/>,
-    <xref linkend="libsoup"/>,
-    <xref linkend="libxslt"/>,
-    <xref linkend="pcre"/>,
-    <xref linkend="sqlite"/>, and
-    <xref linkend="which"/></para>
+    <para role="required"><xref linkend="gperf"/>, <xref linkend="libjpeg"/>,
+    <xref linkend="libpng"/>, <xref linkend="icu"/>, <xref linkend="libxslt"/>,
+    <xref linkend="gtk2"/> or <xref linkend="gtk3"/> (if both are installed
+    configure defaults to using gtk+-3), <xref linkend="libsoup"/>,
+    <xref linkend="gst-plugins-base"/>, <xref linkend="which"/>
+    and <xref linkend="sqlite"/></para>
 
-    <bridgehead renderas="sect4">Recommended</bridgehead>
-    <para role="recommended"><xref linkend="gobject-introspection"/> (Required
-    if building <application>epiphany</application>)</para>
-
-
-
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><xref linkend="curl"/>,
-    <ulink 
url="http://www.freedesktop.org/wiki/Software/GeoClue";>GeoClue</ulink>,
-    <ulink url="http://xsltml.sourceforge.net/";>MathML</ulink>, and
-    <xref linkend="gtk-doc"/></para>
+    <para role="optional"><xref linkend="curl"/>, <xref linkend="enchant"/>,
+    <ulink
+    url="http://www.freedesktop.org/wiki/Software/GeoClue";>GeoClue</ulink>,
+    <xref linkend="gobject-introspection"/> (required if building
+    <application>epiphany</application>), <xref linkend="gtk-doc"/> and
+    <ulink url="http://xsltml.sourceforge.net/";>MathML</ulink>.</para>
 
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/webkitgtk"/></para>
@@ -92,16 +83,17 @@
   <sect2 role="installation">
     <title>Installation of WebKitGTK+</title>
 
-    <para>Install <application>WebKitGTK+</application> by running the 
following
-    commands:</para>
+    <para>Install <application>WebKitGTK+</application> by running the
+    following commands:</para>
 
-<screen><userinput>./configure --prefix=/usr --enable-introspection &amp;&amp;
+<screen><userinput>./configure --prefix=/usr --with-gtk=2.0 &amp;&amp;
 make</userinput></screen>
 
     <para>To test the results, issue: <command>make check</command> (you must 
be
     in an xterm or similar to do this, because it launches some 
windows).</para>
 
-    <para>Now, as the <systemitem class="username">root</systemitem> 
user:</para>
+    <para>Now, as the <systemitem class="username">root</systemitem>
+    user:</para>
 
 <screen role="root"><userinput>make install</userinput></screen>
 
@@ -110,24 +102,19 @@
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para><option>--with-gtk=2.0</option>: This option forces
+    <application>Webkit</application> to compile against
+    <application>Gtk+-2</application>, even if
+    <application>Gtk+-3</application> is also installed. With
+    <application>Gtk+-2</application>, everything
+    <application>Webkit</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>
+
     <para><option>--enable-introspection</option>: This option enables support
     for gobject-introspection.</para>
 
-    <para><option>--enable-3D-transforms</option>: This option enables support
-    for 3D transforms.</para>
-
-    <para><option>--enable-geolocation</option>: This option enables support 
for
-    geolocation.</para>
-
-    <para><option>--enable-mathml</option>: This option enables support for
-    MathML.</para>
-
-    <para><option>--enable-wml</option>: This option enables support for
-    WML.</para>
-
-    <para><option>--enable-web-sockets</option>: This option enables support 
for
-    Web Sockets.</para>
-
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
     href="../../xincludes/gtk-doc-rebuild.xml"/>
 
@@ -142,10 +129,14 @@
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>jsc</seg>
-        <seg>libwebkit-1.0.so</seg>
-        <seg>/usr/{include/webkit-1.0/{JavaScriptCore,webkit},
-        share/webkit-1.0/{images,resources,webinspector/Images}}</seg>
+        <seg>jsc-1 or jsc-3 (depending on whether you installed the gtk+-2 or
+        gtk+-3 version of webkit)</seg>
+        <seg>libwebkit-1.0.so and libjavascriptcoregtk-1.0.so or
+        libwebkit-3.0.so and libjavascriptcoregtk-3.0.so (depending on whether
+        you installed the gtk+-2 or gtk+-3 version of webkit)</seg>
+        <seg>/usr/include/webkit-1.0 and /usr/share/webkit-1.0 or
+        /usr/include/webkit-3.0 and /usr/share/webkit-3.0 (depending on whether
+        you installed the gtk+-2 or gtk+-3 version of webkit)</seg>
       </seglistitem>
     </segmentedlist>
 
@@ -155,7 +146,7 @@
       <?dbhtml list-presentation="table"?>
 
       <varlistentry id="jsc">
-        <term><command>jsc</command></term>
+        <term><command>jsc-1</command> or <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>
@@ -166,16 +157,52 @@
       </varlistentry>
 
       <varlistentry id="libwebkit-1.0">
-        <term><filename class='libraryfile'>libwebkit-1.0.so</filename></term>
+        <term><filename class="libraryfile">libwebkit-1.0.so</filename></term>
         <listitem>
           <para>contains the <application>WebKitGTK+</application> API
-          functions.</para>
+          functions for <application>gtk+-2</application>.</para>
           <indexterm zone="webkitgtk libwebkit-1.0">
             <primary sortas="c-libwebkit-1.0">libwebkit-1.0.so</primary>
           </indexterm>
         </listitem>
       </varlistentry>
 
+      <varlistentry id="libwebkit-3.0">
+        <term><filename class="libraryfile">libwebkit-3.0.so</filename></term>
+        <listitem>
+          <para>contains the <application>WebKitGTK+</application> API
+          functions for <application>gtk+-3</application>.</para>
+          <indexterm zone="webkitgtk libwebkit-3.0">
+            <primary sortas="c-libwebkit-3.0">libwebkit-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-1.0">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
+        <listitem>
+          <para>contains functions that are used by
+          <command>jsc-1</command></para>
+          <indexterm zone="webkitgtk libjavascriptcoregtk-1.0">
+            <primary
+            
sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-3.0">
+        <term><filename
+        class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
+        <listitem>
+          <para>contains functions that are used by
+          <command>jsc-3</command></para>
+          <indexterm zone="webkitgtk libjavascriptcoregtk-3.0">
+            <primary
+            
sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
     </variablelist>
 
   </sect2>

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to