[blfs-book] r12342 - in trunk/BOOK: . introduction/welcome x/lib

fernando at higgs.linuxfromscratch.org fernando at higgs.linuxfromscratch.org
Thu Dec 5 01:57:55 PST 2013


Author: fernando
Date: Thu Dec  5 01:57:55 2013
New Revision: 12342

Log:
Update to WebKitGTK+-2.2.3.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/webkitgtk2.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent	Thu Dec  5 00:17:45 2013	(r12341)
+++ trunk/BOOK/general.ent	Thu Dec  5 01:57:55 2013	(r12342)
@@ -565,7 +565,7 @@
 <!ENTITY shared-mime-info-version     "1.2">
 <!ENTITY startup-notification-version "0.12">
 <!ENTITY webkitgtk-version            "1.10.2">   <!-- Even minors only -->
-<!ENTITY webkitgtk2-version           "2.2.2">    <!-- Even minors only -->
+<!ENTITY webkitgtk2-version           "2.2.3">    <!-- Even minors only -->
 <!ENTITY xulrunner-version            "25.0.1">
 
 <!ENTITY gtk2-libdir                  "2.0/2.10.0">

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Thu Dec  5 00:17:45 2013	(r12341)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Thu Dec  5 01:57:55 2013	(r12342)
@@ -47,6 +47,10 @@
       <para>December 5th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Update to WebKitGTK+-2.2.3. Fixes
+          <ulink url="&blfs-ticket-root;4414">#4414</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[igor] - Update to libpcap-1.5.2. Fixes
           <ulink url="&blfs-ticket-root;4413">#4413</ulink>.</para>
         </listitem>

Modified: trunk/BOOK/x/lib/webkitgtk2.xml
==============================================================================
--- trunk/BOOK/x/lib/webkitgtk2.xml	Thu Dec  5 00:17:45 2013	(r12341)
+++ trunk/BOOK/x/lib/webkitgtk2.xml	Thu Dec  5 01:57:55 2013	(r12342)
@@ -6,10 +6,10 @@
 
   <!ENTITY webkitgtk2-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz">
   <!ENTITY webkitgtk2-download-ftp  " ">
-  <!ENTITY webkitgtk2-md5sum        "49cc8fd065de72603776a494e41c1977">
+  <!ENTITY webkitgtk2-md5sum        "613e81c460368ff4d6e02c7887206572">
   <!ENTITY webkitgtk2-size          "9.0 MB">
   <!ENTITY webkitgtk2-buildsize     "855 MB">
-  <!ENTITY webkitgtk2-time          "56 SBU">
+  <!ENTITY webkitgtk2-time          "57 SBU">
 ]>
 
 <sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;">
@@ -71,16 +71,6 @@
       </listitem>
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/webkitgtk-&webkitgtk2-version;-freetype-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -95,14 +85,14 @@
       <xref linkend="mesalib"/>,
       <xref linkend="ruby"/>,
       <xref linkend="sqlite"/>,
-      <xref linkend="udev-extras"/> (for GUdev), and
+      <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="geoclue"/> and
       <xref linkend="gobject-introspection"/>
     </para>
 
@@ -143,8 +133,7 @@
       following commands:
     </para>
 
-<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk2-version;-freetype-1.patch &&
-./configure --prefix=/usr                    \
+<screen><userinput>./configure --prefix=/usr                    \
             --libexecdir=/usr/lib/webkitgtk3 \
             --enable-introspection &&
 make</userinput></screen>
@@ -208,16 +197,16 @@
         </seg>
         <seg>
           libjavascriptcoregtk-3.0.so,
-          libwebkit2gtkinjectedbundle.so,
-          libwebkit2gtk-3.0.so, and
-          libwebkitgtk-3.0.so
+          libwebkit2gtk-3.0.so,
+          libwebkitgtk-3.0.so and
+          /usr/lib/webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
         </seg>
         <seg>
           /usr/include/webkitgtk-3.0, 
           /usr/lib/webkitgtk3,
           /usr/lib/webkit2gtk-3.0,
           /usr/share/gtk-doc/html/webkitgtk,
-          /usr/share/gtk-doc/html/webkit2gtk, and
+          /usr/share/gtk-doc/html/webkit2gtk and
           /usr/share/webkitgtk-3.0
         </seg>
       </seglistitem>
@@ -254,7 +243,7 @@
           </indexterm>
         </listitem>
       </varlistentry>
-
+<!--
       <varlistentry id="libwebkit2gtkinjectedbundle">
         <term><filename class="libraryfile">libwebkit2gtkinjectedbundle.so</filename></term>
         <listitem>
@@ -267,6 +256,7 @@
           </indexterm>
         </listitem>
       </varlistentry>
+-->
 
       <varlistentry id="libwebkitgtk-3">
         <term><filename class="libraryfile">libwebkitgtk-3.0.so</filename></term>



More information about the blfs-book mailing list