Author: andy
Date: 2012-03-29 05:35:14 -0600 (Thu, 29 Mar 2012)
New Revision: 9796
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/webkitgtk.xml
Log:
Webkitgtk+ 1.8.0
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-03-29 11:05:27 UTC (rev 9795)
+++ trunk/BOOK/general.ent 2012-03-29 11:35:14 UTC (rev 9796)
@@ -624,7 +624,7 @@
<!ENTITY goffice-version "0.8.17">
<!ENTITY mesalib-version "7.9">
<!ENTITY xulrunner-version "11.0">
-<!ENTITY webkitgtk-version "1.6.3">
+<!ENTITY webkitgtk-version "1.8.0">
<!ENTITY libsexy-version "0.1.11">
<!ENTITY libnotify-version "0.7.4">
<!ENTITY notification-daemon-version "0.7.3">
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-03-29 11:05:27 UTC
(rev 9795)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-03-29 11:35:14 UTC
(rev 9796)
@@ -41,7 +41,16 @@
</listitem>
-->
+ <listitem>
+ <para>March 29th, 2012</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abenton] - Webkitgtk+ 1.8.0.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
<listitem>
<para>March 28th, 2012</para>
<itemizedlist>
@@ -50,7 +59,7 @@
Add other minor bootscrpt cleanups.</para>
</listitem>
<listitem>
- <para>[abenton] - Webkitgtk 1.6.3.</para>
+ <para>[abenton] - Webkitgtk+ 1.6.3.</para>
</listitem>
</itemizedlist>
</listitem>
Modified: trunk/BOOK/x/lib/webkitgtk.xml
===================================================================
--- trunk/BOOK/x/lib/webkitgtk.xml 2012-03-29 11:05:27 UTC (rev 9795)
+++ trunk/BOOK/x/lib/webkitgtk.xml 2012-03-29 11:35:14 UTC (rev 9796)
@@ -72,16 +72,6 @@
</listitem>
</itemizedlist>
- <bridgehead renderas="sect3">Additional Downloads</bridgehead>
- <itemizedlist spacing="compact">
- <listitem>
- <para>
- Required patch if you're using <application>GCC-4.7</application>:
- <ulink
url="&patch-root;/webkitgtk-&webkitgtk-version;_gcc-4.7-1.patch"/>
- </para>
- </listitem>
- </itemizedlist>
-
<bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
<bridgehead renderas="sect4">Required</bridgehead>
@@ -91,10 +81,11 @@
<xref linkend="libpng"/>,
<xref linkend="icu"/>,
<xref linkend="libxslt"/>,
- <xref linkend="gtk2"/> or <xref linkend="gtk3"/> (configure defaults to
- using gtk+-3),
+ <xref linkend="gtk2"/> or <xref linkend="gtk3"/>
+ (<command>configure</command> defaults to using gtk+-3),
<xref linkend="libsoup"/>,
<xref linkend="gst-plugins-base"/>,
+ <ulink url="https://launchpad.net/geoclue/";>GeoClue</ulink>,
<xref linkend="which"/> and
<xref linkend="sqlite"/>.
</para>
@@ -103,7 +94,6 @@
<para role="optional">
<xref linkend="curl"/>,
<xref linkend="enchant"/>,
- <ulink url="https://launchpad.net/geoclue/";>GeoClue</ulink>,
<xref linkend="gobject-introspection"/> (required if building
<application>epiphany</application>),
<xref linkend="gtk-doc"/> and
@@ -119,25 +109,40 @@
<title>Installation of WebKitGTK+</title>
<para>
- These instructions assume you are installing
- <application>WebKitGTK+</application> to support a
- <application>GNOME</application> desktop - if not, please review the
- explanations for the various optional parameters.
+ <application>WebKit</application> takes a long time to compile, so if you
+ have a multicore CPU it can be useful to speed up the build by running
+ make with multiple jobs.
</para>
<para>
- Install <application>WebKitGTK+</application> by running the following
- commands:
+ If you want to run make with just one job, install
+ <application>WebKit</application> by running the following commands:
</para>
-<screen><userinput>patch -p1 <
../webkitgtk-&webkitgtk-version;_gcc-4.7-1.patch &&
-./configure --prefix=/usr --enable-introspection &&
+<screen><userinput>./configure --prefix=/usr --enable-introspection &&
make</userinput></screen>
<para>
+ If you have a multicore CPU and want to run make with multiple jobs,
+ install <application>WebKit</application> by running the following
+ commands:
+ </para>
+
+<screen><userinput>./configure --prefix=/usr --enable-introspection &&
+until make -j$(getconf _NPROCESSORS_ONLN)
+do echo "Let's try that again..."
+done</userinput></screen>
+
+ <para>
+ This package does not have a working testsuite.
+ </para>
+<!--
+ <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).
+ Requires <xref linkend="pygobject2"/>.
</para>
+-->
<para>
Now, as the <systemitem class="username">root</systemitem> user:
@@ -150,6 +155,21 @@
<title>Command Explanations</title>
<para>
+ <option>--enable-introspection</option>: This option enables support for
+ <application>Gobject-Introspection</application> and is required for a
+ <application>GNOME</application> desktop.
+ </para>
+
+ <para>
+ <command>until make -j$(getconf _NPROCESSORS_ONLN)</command>). Sadly
+ there are race conditions in the makefiles that will cause the build to
+ fail if you run make with multiple jobs. This simple hack works around
+ that, <command>until</command> will keep running <command>make</command>
+ until it succeeds. <command>$(getconf _NPROCESSORS_ONLN)</command> prints
+ the number of cores your computer seems to have.
+ </para>
+
+ <para>
<option>--with-gtk=2.0</option>: This option forces
<application>Webkit</application> to compile against
<application>Gtk+-2</application>, even if
@@ -161,12 +181,6 @@
one another with no namespace conflicts.
</para>
- <para>
- <option>--enable-introspection</option>: This option enables support for
- gobject-introspection and is required for a
- <application>GNOME</application> desktop.
- </para>
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="../../xincludes/gtk-doc-rebuild.xml"/>
</sect2>
@@ -181,18 +195,23 @@
<seglistitem>
<seg>
- jsc-1 or jsc-3 (depending on whether you installed the gtk+-2 or
- gtk+-3 version of webkit)
+ jsc-1 or jsc-3 (depending on whether you installed the
+ <application>Gtk+-2</application> or
<application>Gtk+-3</application>
+ version of <application>WebKit</application>).
</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)
+ the <application>Gtk+-2</application> or
+ <application>Gtk+-3</application> version of
+ <application>WebKit</application>).
</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)
+ whether you installed the <application>Gtk+-2</application> or
+ <application>Gtk+-3</application> version of
+ <application>WebKit</application>).
</seg>
</seglistitem>
</segmentedlist>
@@ -219,7 +238,7 @@
<term><filename class="libraryfile">libwebkit-1.0.so</filename></term>
<listitem>
<para>
- contains the <application>WebKitGTK+</application> API functions
for
+ contains the <application>WebKit</application> API functions for
<application>gtk+-2</application>.
</para>
<indexterm zone="webkitgtk libwebkit-1.0">
@@ -232,7 +251,7 @@
<term><filename class="libraryfile">libwebkit-3.0.so</filename></term>
<listitem>
<para>
- contains the <application>WebKitGTK+</application> API functions
for
+ contains the <application>WebKit</application> API functions for
<application>gtk+-3</application>.
</para>
<indexterm zone="webkitgtk libwebkit-3.0">
@@ -249,8 +268,7 @@
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>
+ <primary
sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
</indexterm>
</listitem>
</varlistentry>
@@ -263,8 +281,7 @@
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>
+ <primary
sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary>
</indexterm>
</listitem>
</varlistentry>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
