Changeset d356833 for x/lib/webkitgtk.xml

Timestamp:

09/26/2012 07:37:55 PM (12 years ago)

Author:

Krejzi <krejzi@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

35e84dce

Parents:

983fc68

Message:

GNOME 3.6 Part 6.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@10691 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

• x/lib/webkitgtk.xml (modified) (13 diffs)

x/lib/webkitgtk.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY webkitgtk-download-http "http://webkitgtk.org/releases/webkit-&webkitgtk-version;.tar.xz">
+  <!ENTITY webkitgtk-download-http "http://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "f7bd0bd4f323039f15e19c82a9a8313c">
-  <!ENTITY webkitgtk-size          "7.7 MB">
-  <!ENTITY webkitgtk-buildsize     "700 MB">
-  <!ENTITY webkitgtk-time          "30 SBU">
+  <!ENTITY webkitgtk-md5sum        "6da450ec7793c0a7873d8c8c2cae4eb8">
+  <!ENTITY webkitgtk-size          "8.2 MB">
+  <!ENTITY webkitgtk-buildsize     "800 MB">
+  <!ENTITY webkitgtk-time          "40 SBU">
 ]>
 
@@ -72 +72 @@
     </itemizedlist>
 
-    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing="compact">
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/webkit-&webkitgtk-version;-bison-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
-
     <bridgehead renderas="sect3">WebKitGTK+ Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="geoclue"/>,
       <xref linkend="gperf"/>,
+      <xref linkend="gst10-plugins-base"/> or
       <xref linkend="gst-plugins-base"/>,
-      <xref linkend="gtk3"/> or <xref linkend="gtk2"/>,
+      <xref linkend="gtk3"/> or
+      <xref linkend="gtk2"/>,
       <xref linkend="icu"/>,
       <xref linkend="libxslt"/>,
       <xref linkend="libsoup"/>,
+      <xref linkend="mesalib"/>,
+      <xref linkend="ruby"/>,
       <xref linkend="sqlite"/> and
       <xref linkend="which"/>
@@ -99 +92 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
+      <xref linkend="geoclue"/> and
       <xref linkend="gobject-introspection"/>
     </para>
@@ -118 +112 @@
     <title>Installation of WebKitGTK+</title>
 
-    <para>
-      If you have <application>pkg-config 0.23</application> or older installed
-      fix a bug in the configure script that will stop it detecting
-      <application>Gstreamer</application> correctly: 
-    </para>
-
-<screen><userinput>sed -i 's#=GST#=$GST#' configure</userinput></screen>
+    <warning>
+      <para>
+        If you are building <application>WebKitGTK+</application>
+        with <command>make</command> 3.82, make sure that you have built
+        it with the following
+        <ulink url="&patch-downloads;/make/make-3.82-upstream_fixes-3.patch">
+        patch</ulink> applied or <application>WebKitGTK+</application>
+        build will fail.
+      </para>
+    </warning>
 
     <para>
@@ -134 +131 @@
 
     <para>
-      <application>WebKitGTK+</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>
-      If you want to run make with just one core, install
-      <application>WebKitGTK+</application> by running the following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-bison-1.patch &amp;&amp;
-./configure --prefix=/usr \
-            --libexecdir=/usr/lib/WebKit \
+      Install <application>WebKitGTK+</application> by running the
+      following commands:
+    </para>
+
+<screen><userinput>./configure --prefix=/usr \
+            --libexecdir=/usr/lib/WebKitGTK \
+            --with-gstreamer=1.0 \
             --enable-introspection &amp;&amp;
 make</userinput></screen>
 
     <para>
-      If you have a multicore CPU and want to run make with multiple jobs
-      running in parallel, install <application>WebKitGTK+</application> with the
-      following commands:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../webkitgtk-&webkitgtk-version;-bison-1.patch &amp;&amp;
-./configure --prefix=/usr \
-            --libexecdir=/usr/lib/WebKit \
-            --enable-introspection &amp;&amp;
-error_count=0
-until make -j$(getconf _NPROCESSORS_ONLN)
-do
-  if (( $((error_count++)) &gt; 4 ))
-  then
-    echo Too Many Errors
-    break
-  fi
-done
-unset error_count</userinput></screen>
-
-    <para>
       This package does not have a working testsuite.
     </para>
@@ -186 +156 @@
 
     <para>
-      <option>--enable-introspection</option>: This option enables support for
-      <application>GObject Introspection</application> and is required for a
-      <application>GNOME</application> Desktop. If you don't have
-      <application>Gobject Introspection</application> installed and don't want
-      to install <application>GNOME</application> remove this option.
-    </para>
-
-    <para>
-      <command>error_count=0; until make ...</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 problem by using <command>until</command> to keep running
-      <command>make</command> until it succeeds. The variable
-      <envar>error_count</envar> is incremented each time an error occurs and is
-      checked to ensure that no more than 5 errors occur. This is so that if an
-      error occurs that is <emphasis>not</emphasis> due to a race condition then
-      it will not keep repeating <command>make</command> forever.
-      <command>$(getconf _NPROCESSORS_ONLN)</command> prints the number of cores
-      your computer seems to have. If you would prefer, you can use any positive
-      integer such as 4.
-    </para>
-
-    <para>
-      <option>--enable-webkit2</option>: This switch enables building of
-      <application>WebKit2</application> libraries which some applications
-      like <application>DevHelp</application> can use and which will probably
-      be used in future releases of <application>GNOME</application> Desktop.
-    </para>
-
-    <para>
-      <parameter>--with-gtk=2.0</parameter>: This option forces
-      <application>WebKitGTK+</application> to compile against
+      <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>.
+    </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
@@ -246 +208 @@
         <seg>
           libjavascriptcoregtk-1.0.so and libwebkit-1.0.so or
-          libjavascriptcoregtk-3.0.so and libwebkit-3.0.so and
-          optionaly libwebkit2gtk-3.0.so
+          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 and /usr/share/webkit-3.0 and
-          optionaly /usr/lib/WebKit
+          /usr/include/webkit-3.0, /usr/lib/WebKit and
+          /usr/share/webkit-3.0
         </seg>
       </seglistitem>
@@ -275 +237 @@
       </varlistentry>
 
-      <varlistentry id="libjavascriptcoregtk-1.0">
+      <varlistentry id="libjavascriptcoregtk-1">
         <term><filename
         class="libraryfile">libjavascriptcoregtk-1.0.so</filename></term>
@@ -283 +245 @@
             and <filename class="libraryfile">libwebkitgtk-1.0.so</filename>.
           </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-1.0">
-            <primary sortas="c-libjavascriptcoregtk-1.0">libjavascriptcoregtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-1.0">
+          <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>
@@ -296 +258 @@
             <application>GTK+ 2</application>.
           </para>
-          <indexterm zone="webkitgtk libwebkitgtk-1.0">
-            <primary sortas="c-libwebkitgtk-1.0">libwebkitgtk-1.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libjavascriptcoregtk-3.0">
+          <indexterm zone="webkitgtk libwebkitgtk-1">
+            <primary sortas="c-libwebkitgtk-1">libwebkitgtk-1.0.so</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry id="libjavascriptcoregtk-3">
         <term><filename
         class="libraryfile">libjavascriptcoregtk-3.0.so</filename></term>
@@ -310 +272 @@
             and <filename class="libraryfile">libwebkitgtk-3.0.so</filename>.
           </para>
-          <indexterm zone="webkitgtk libjavascriptcoregtk-3.0">
-            <primary sortas="c-libjavascriptcoregtk-3.0">libjavascriptcoregtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkitgtk-3.0">
+          <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>
@@ -323 +285 @@
             <application>GTK+ 3</application>.
           </para>
-          <indexterm zone="webkitgtk libwebkitgtk-3.0">
-            <primary sortas="c-libwebkitgtk-3.0">libwebkitgtk-3.0.so</primary>
-          </indexterm>
-        </listitem>
-      </varlistentry>
-
-      <varlistentry id="libwebkit2gtk-3.0">
+          <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>
@@ -335 +297 @@
             contains the <application>WebKit2</application> API functions.
           </para>
-          <indexterm zone="webkitgtk libwebkit2gtk-3.0">
-            <primary sortas="c-libwebkit2gtk-3.0">libwebkit2gtk-3.0.so</primary>
+          <indexterm zone="webkitgtk libwebkit2gtk-3">
+            <primary sortas="c-libwebkit2gtk-3">libwebkit2gtk-3.0.so</primary>
           </indexterm>
         </listitem>