Author: fernando
Date: Tue Sep 30 06:23:31 2014
New Revision: 14434
Log:
Add new page webkitgtk-2.6.0 separated from 2.4 series. Thanks Armin and
Christopher for discussions and suggestions.
Added:
trunk/BOOK/x/lib/webkitgtk26.xml
- copied, changed from r14432, trunk/BOOK/x/lib/webkitgtk2.xml
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
trunk/BOOK/x/lib/lib.xml
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Tue Sep 30 05:38:57
2014 (r14433)
+++ trunk/BOOK/introduction/welcome/changelog.xml Tue Sep 30 06:23:31
2014 (r14434)
@@ -48,6 +48,11 @@
<para>September 30th, 2014</para>
<itemizedlist>
<listitem>
+ <para>[fernando] - Add new page webkitgtk-2.6.0 separated from 2.4
+ series. Fixes
+ <ulink url="&blfs-ticket-root;5575">#5575</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[igor] - Update to mesa-10.3.0. Fixes
<ulink url="&blfs-ticket-root;5537">#5537</ulink>.</para>
</listitem>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Tue Sep 30 05:38:57 2014 (r14433)
+++ trunk/BOOK/packages.ent Tue Sep 30 06:23:31 2014 (r14434)
@@ -477,6 +477,7 @@
<!ENTITY shared-mime-info-version "1.3">
<!ENTITY startup-notification-version "0.12">
<!ENTITY webkitgtk2-version "2.4.5"> <!-- Even minors only -->
+<!ENTITY webkitgtk26-version "2.6.0"> <!-- Even minors only -->
<!ENTITY gtk2-libdir "2.0/2.10.0">
<!ENTITY qt4-dir "$QT4DIR">
Modified: trunk/BOOK/x/lib/lib.xml
==============================================================================
--- trunk/BOOK/x/lib/lib.xml Tue Sep 30 05:38:57 2014 (r14433)
+++ trunk/BOOK/x/lib/lib.xml Tue Sep 30 06:23:31 2014 (r14434)
@@ -57,5 +57,6 @@
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude"; href="qt5.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="webkitgtk2.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
href="webkitgtk26.xml"/>
</chapter>
Copied and modified: trunk/BOOK/x/lib/webkitgtk26.xml (from r14432,
trunk/BOOK/x/lib/webkitgtk2.xml)
==============================================================================
--- trunk/BOOK/x/lib/webkitgtk2.xml Tue Sep 30 05:02:16 2014
(r14432, copy source)
+++ trunk/BOOK/x/lib/webkitgtk26.xml Tue Sep 30 06:23:31 2014 (r14434)
@@ -4,25 +4,25 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY webkitgtk2-download-http
"http://webkitgtk.org/releases/webkitgtk-&webkitgtk2-version;.tar.xz";>
- <!ENTITY webkitgtk2-download-ftp " ">
- <!ENTITY webkitgtk2-md5sum "c2e1687bb0314a0948fbf78e2d1e931f">
- <!ENTITY webkitgtk2-size "9.4 MB">
- <!ENTITY webkitgtk2-buildsize "1.5 GB (both built)">
- <!ENTITY webkitgtk2-time "138 SBU (both built, webkitgtk-3.0 takes
a little longer than webkitgtk-1.0)">
+ <!ENTITY webkitgtk26-download-http
"http://webkitgtk.org/releases/webkitgtk-&webkitgtk26-version;.tar.xz";>
+ <!ENTITY webkitgtk26-download-ftp " ">
+ <!ENTITY webkitgtk26-md5sum "56fa5d14c91ef07e92f6a29469916a12">
+ <!ENTITY webkitgtk26-size "9.5 MB">
+ <!ENTITY webkitgtk26-buildsize "871 MB">
+ <!ENTITY webkitgtk26-time "92 SBU">
]>
-<sect1 id="webkitgtk2" xreflabel="WebKitGTK+-&webkitgtk2-version;">
- <?dbhtml filename="webkitgtk2.html"?>
+<sect1 id="webkitgtk26" xreflabel="WebKitGTK+-&webkitgtk26-version;">
+ <?dbhtml filename="webkitgtk26.html"?>
<sect1info>
<othername>$LastChangedBy$</othername>
<date>$Date$</date>
</sect1info>
- <title>WebKitGTK+-&webkitgtk2-version;</title>
+ <title>WebKitGTK+-&webkitgtk26-version;</title>
- <indexterm zone="webkitgtk2">
+ <indexterm zone="webkitgtk26">
<primary sortas="a-WebKitGTK+">WebKitGTK+</primary>
</indexterm>
@@ -32,8 +32,8 @@
<para>
The <application>WebKitGTK+</application> is the port of the portable web
rendering engine <application>WebKit</application> to the
- <application>GTK+ 3</application> and/or <application>GTK+
- 2</application> platforms.
+ <application>GTK+ 3</application> and <application>GTK+ 2</application>
+ platforms.
</para>
&lfs76_checked;
@@ -42,32 +42,32 @@
<itemizedlist spacing="compact">
<listitem>
<para>
- Download (HTTP): <ulink url="&webkitgtk2-download-http;"/>
+ Download (HTTP): <ulink url="&webkitgtk26-download-http;"/>
</para>
</listitem>
<listitem>
<para>
- Download (FTP): <ulink url="&webkitgtk2-download-ftp;"/>
+ Download (FTP): <ulink url="&webkitgtk26-download-ftp;"/>
</para>
</listitem>
<listitem>
<para>
- Download MD5 sum: &webkitgtk2-md5sum;
+ Download MD5 sum: &webkitgtk26-md5sum;
</para>
</listitem>
<listitem>
<para>
- Download size: &webkitgtk2-size;
+ Download size: &webkitgtk26-size;
</para>
</listitem>
<listitem>
<para>
- Estimated disk space required: &webkitgtk2-buildsize;
+ Estimated disk space required: &webkitgtk26-buildsize;
</para>
</listitem>
<listitem>
<para>
- Estimated build time: &webkitgtk2-time;
+ Estimated build time: &webkitgtk26-time;
</para>
</listitem>
</itemizedlist>
@@ -76,8 +76,9 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required">
+ <xref linkend="cmake"/>,
<xref linkend="gst10-plugins-base"/>,
- <xref linkend="gtk2"/> or
+ <xref linkend="gtk2"/>,
<xref linkend="gtk3"/>,
<xref linkend="icu"/>,
<xref linkend="libsecret"/>,
@@ -90,13 +91,6 @@
<xref linkend="which"/>
</para>
- <note><para>
- <application>WebKit2</application> links against<application>GTK+
- 2</application> (even if <application>GTK+ 3</application> is being
- used), in order to be able to use NPAPI plugins such as Adobe Flash.
- </para></note>
-
-
<bridgehead renderas="sect4">Recommended</bridgehead>
<para role="recommended">
<xref linkend="enchant"/>,
@@ -122,47 +116,32 @@
<sect2 role="installation">
<title>Installation of WebKitGTK+</title>
- <para>
- If you have not installed <xref linkend="gtk-doc"/>, fix a bug that will
- cause <command>make install</command> to fail:
- </para>
-
-<screen><userinput>sed -i '/generate-gtkdoc --rebase/s:^:# :' \
- GNUmakefile.in</userinput></screen>
-
- <para>
- Upstream standard now is to link this package against <application>GTK+
- 3</application>. However, for backward compatibility, manu users need
- also another instance, linked to <application>GTK+ 2</application>. Both
- can be installed in the same system, without problem. However, some
- packages can alternatively be linked to either one. Here, both build
- methods are presented and recommended to be built, but if you know which
- one you need, just jump to the respective part.
- </para>
-
-<!-- ==== WebKitGTK+ against GTK+ 3 ====== -->
- <bridgehead renderas="sect3">Build and install
- <application>WebKitGTK+</application> against <application>GTK+
- 3</application></bridgehead>
+ <bridgehead renderas="sect3">Installation of
+ <application>WebKitGTK+</application></bridgehead>
<para>
Install <application>WebKitGTK+</application> by running the
following commands:
</para>
-<screen><userinput>mkdir -vp build-3 &&
-cp -a Documentation build-3 &&
-cd build-3 &&
+<screen><userinput>sed -i 's/”/\"/g' Source/WebCore/xml/XMLViewer.{css,js}
&&
-../configure --prefix=/usr --enable-introspection &&
+mkdir -vp build &&
+cd build &&
+
+cmake -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DPORT=GTK \
+ -DLIB_INSTALL_DIR=/usr/lib .. &&
make</userinput></screen>
<para>
- This package does not have a working testsuite. However, there are two
+ This package does not have a working testsuite.<!-- However, there are
two
useable basic graphical web browsers in the build directory,
<application>Programs/GtkLauncher</application> and
<application>Programs/MiniBrowser</application>. If launching any one
- fails, there is a problem with the build.
+ fails, there is a problem with the build.-->
</para>
<note><para>
@@ -177,125 +156,64 @@
Now, as the <systemitem class="username">root</systemitem> user:
</para>
-<screen role="root"><userinput>make install</userinput></screen>
-
- <para>
- Finally, leave the buid directory:
- </para>
-
-<screen><userinput>cd ..</userinput></screen>
-
-<!-- ==== WebKitGTK+ against GTK+ 2 ====== -->
- <bridgehead renderas="sect3">Build and install
- <application>WebKitGTK+</application> against <application>GTK+
- 2</application></bridgehead>
-
- <para>
- Install <application>WebKitGTK+</application> by running the
- following commands:
- </para>
+<screen role="root"><userinput>make install &&
-<screen><userinput>mkdir -vp build-1</userinput></screen>
+install -vdm755 /usr/share/gtk-doc/html/webkit{2,dom}gtk-4.0, &&
+install -vm644 ../Documentation/webkit2gtk/html/* \
+ /usr/share/gtk-doc/html/webkit2gtk-4.0 &&
+install -vm644 ../Documentation/webkitdomgtk/html/* \
+ /usr/share/gtk-doc/html/webkitdomgtk-4.0</userinput></screen>
- <para>
- If you have built and installed the package against <application>GTK+
- 3</application>. skip the following command, because the previous
- docummentation also applies here:
- </para>
-
-<screen><userinput>cp -a Documentation build-1</userinput></screen>
-
- <para>
- Now, change into the build directory and effectively start the build and
- install:
- </para>
-
-<screen><userinput>cd build-1 &&
-
-
-../configure --prefix=/usr --with-gtk=2.0 --disable-webkit2 &&
-make</userinput></screen>
-
- <para>
- This package does not have a working testsuite. However, there is one
- useable basic graphical web browser in the build directory,
- <application>Programs/GtkLauncher</application>. If launching it
- fails, there is a problem with the build.
- </para>
+ </sect2>
- <note><para>
- When installing, the Makefile does some additional compiling and linking.
- If you do not have Xorg in /usr, the LIBRARY_PATH and PKG_CONFIG_PATH
- variables need to be defined for the root user. If using sudo to assume
- root, use the -E option to pass your current environment variables for
the
- install process.
- </para></note>
+ <sect2 role="commands">
+ <title>Command Explanations</title>
<para>
- Now, as the <systemitem class="username">root</systemitem> user:
+ <command>sed -i ...</command>: Fixes typos in two source code files.
</para>
-<screen role="root"><userinput>make install</userinput></screen>
-
<para>
- Finally, leave the buid directory:
+ <option>-DUSE_SYSTEM_MALLOC=ON</option>: This switch enables building
+ against the system installed <application>malloc</application>.
</para>
-<screen><userinput>cd ..</userinput></screen>
-
- </sect2>
-
- <sect2 role="commands">
- <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>.
+ <option>-DENABLE_GEOLOCATION=OFF</option>: Use this switch if you don't
+ want to install <xref linkend="geoclue"/> or
+ <ulink url="http://gitorious.org/geoclue2/";>GeoClue2</ulink>.
</para>
<para>
- <option>--disable-geolocation</option>: Use this option if you did not
- install <xref linkend="geoclue"/> or <command>configure</command> will
- fail.
+ <option>-DENABLE_GTKDOC=ON</option>: Use this switch if <xref
+ linkend="gtk-doc"/> is installed and you wish to rebuild and install the
+ API documentation.
</para>
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/gtk-doc-rebuild.xml"/>
-
</sect2>
<sect2 role="content">
<title>Contents</title>
<segmentedlist>
- <segtitle>Installed Programs</segtitle>
+ <segtitle>Installed Program</segtitle>
<segtitle>Installed Libraries</segtitle>
<segtitle>Installed Directories</segtitle>
<seglistitem>
<seg>
- jsc-1, and jsc-3
+ jsc
</seg>
<seg>
- libjavascriptcoregtk-1.0.so,
- libjavascriptcoregtk-3.0.so,
- libwebkit2gtk-3.0.so,
- libwebkitgtk-1.0.so,
- libwebkitgtk-3.0.so, and
- webkit2gtk-3.0/injected-bundle/libwebkit2gtkinjectedbundle.so
+ libjavascriptcoregtk-4.0.so and
+ libwebkit2gtk-4.0.so
</seg>
<seg>
- /usr/include/webkitgtk-1.0,
- /usr/include/webkitgtk-3.0,
- /usr/lib/webkit2gtk-3.0,
- /usr/share/gtk-doc/html/webkit2gtk,
- /usr/share/gtk-doc/html/webkitdomgtk,
- /usr/share/gtk-doc/html/webkitgtk,
- /usr/share/webkitgtk-1.0, and
- /usr/share/webkitgtk-3.0
+ /usr/include/webkitgtk-4.0,
+ /usr/lib/webkit2gtk-4.0,
+ /usr/libexec/webkit2gtk-4.0,
+ /usr/share/gtk-doc/html/webkit2gtk-4.0, and
+ /usr/share/gtk-doc/html/webkitdomgtk-4.0
</seg>
</seglistitem>
</segmentedlist>
@@ -305,96 +223,42 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="jsc-1">
- <term><command>jsc-1</command></term>
+ <varlistentry id="jsc">
+ <term><command>jsc</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="webkitgtk2 jsc-1">
- <primary sortas="b-jsc-1">jsc-1</primary>
+ <indexterm zone="webkitgtk26 jsc">
+ <primary sortas="b-jsc">jsc</primary>
</indexterm>
</listitem>
</varlistentry>
- <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="webkitgtk2 jsc-3">
- <primary sortas="b-jsc-3">jsc-3</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libjavascriptcoregtk-1">
+ <varlistentry id="libjavascriptcoregtk-4.0">
<term><filename
- class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
+ class="libraryfile">libjavascriptcoregtk-4.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="webkitgtk2 libjavascriptcoregtk-1">
- <primary
sortas="c-libjavascriptcoregtk-1">libjavascriptcoregtk-1.0.so</primary>
- </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="webkitgtk2 libjavascriptcoregtk-3">
- <primary
sortas="c-libjavascriptcoregtk-3">libjavascriptcoregtk-3.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="webkitgtk2 libwebkitgtk-1">
- <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.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>.
+ <command>jsc</command> and <filename
+ class="libraryfile">libwebkit2gtk-4.0</filename>.
</para>
- <indexterm zone="webkitgtk2 libwebkitgtk-3">
- <primary sortas="c-libwebkitgtk-3">libwebkitgtk-3.0.so</primary>
+ <indexterm zone="webkitgtk26 libjavascriptcoregtk-4.0">
+ <primary
sortas="c-libjavascriptcoregtk-4.0">libjavascriptcoregtk-4.0.0.so</primary>
</indexterm>
</listitem>
</varlistentry>
- <varlistentry id="libwebkit2gtk-3">
- <term><filename
class="libraryfile">libwebkit2gtk-3.0.so</filename></term>
+ <varlistentry id="libwebkit2gtk-4">
+ <term><filename
class="libraryfile">libwebkit2gtk-4.0.so</filename></term>
<listitem>
<para>
contains the <application>WebKit2</application> API functions.
</para>
- <indexterm zone="webkitgtk2 libwebkit2gtk-3">
- <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
+ <indexterm zone="webkitgtk26 libwebkit2gtk-4">
+ <primary sortas="c-libwebkit2gtk-4">libwebkit2gtk-4.0.so</primary>
</indexterm>
</listitem>
</varlistentry>
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
