Author: ken
Date: 2012-02-16 13:21:40 -0700 (Thu, 16 Feb 2012)
New Revision: 9440
Modified:
trunk/BOOK/general.ent
trunk/BOOK/gnome/core/yelp.xml
trunk/BOOK/introduction/welcome/changelog.xml
Log:
Update to yelp-3.2.1 and remove some accumulated crud from it, particularly re
gecko.
Modified: trunk/BOOK/general.ent
===================================================================
--- trunk/BOOK/general.ent 2012-02-16 19:45:44 UTC (rev 9439)
+++ trunk/BOOK/general.ent 2012-02-16 20:21:40 UTC (rev 9440)
@@ -740,7 +740,7 @@
<!ENTITY gucharmap-version "3.2.2">
<!ENTITY nautilus-version "3.2.1">
<!ENTITY sushi-version "0.2.1">
-<!ENTITY yelp-version "2.30.1">
+<!ENTITY yelp-version "3.2.1">
<!-- Shell Fallback -->
<!ENTITY gnome-panel-version "3.2.1">
Modified: trunk/BOOK/gnome/core/yelp.xml
===================================================================
--- trunk/BOOK/gnome/core/yelp.xml 2012-02-16 19:45:44 UTC (rev 9439)
+++ trunk/BOOK/gnome/core/yelp.xml 2012-02-16 20:21:40 UTC (rev 9440)
@@ -4,11 +4,11 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY yelp-download-http
"&gnome-download-http;/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
- <!ENTITY yelp-download-ftp
"&gnome-download-ftp;/yelp/&gnome-version;/yelp-&yelp-version;.tar.bz2">
- <!ENTITY yelp-md5sum "afd638cdaea1fcb9821ece88b819a022">
- <!ENTITY yelp-size "1.1 MB">
- <!ENTITY yelp-buildsize "21 MB">
+ <!ENTITY yelp-download-http
"&gnome-download-http;/yelp/&gnome-version;/yelp-&yelp-version;.tar.xz">
+ <!ENTITY yelp-download-ftp
"&gnome-download-ftp;/yelp/&gnome-version;/yelp-&yelp-version;.tar.xz">
+ <!ENTITY yelp-md5sum "0c58fefce818ed3f2c2cdcf0d636b892">
+ <!ENTITY yelp-size "836 KB">
+ <!ENTITY yelp-buildsize "24 MB">
<!ENTITY yelp-time "0.3 SBU">
]>
@@ -32,7 +32,7 @@
<para>The <application>Yelp</application> package contains the help
browser. This is useful for viewing help files.</para>
- &lfs65_checked;
+ &lfs70_checked;
<bridgehead renderas="sect3">Package Information</bridgehead>
<itemizedlist spacing="compact">
@@ -61,8 +61,9 @@
<bridgehead renderas="sect4">Required</bridgehead>
<para role="required"><xref linkend="GConf"/>,
<xref linkend="gnome-doc-utils"/>,
- <xref linkend="startup-notification"/>, and
- <xref linkend="xulrunner"/></para>
+ <xref linkend="startup-notification"/>,
+ <xref linkend="webkitgtk"/>, and
+ <xref linkend="yelp-xsl"/></para>
<bridgehead renderas="sect4">Optional</bridgehead>
<para role="optional"><xref linkend="rarian"/>, and
@@ -73,10 +74,7 @@
functional <application>GNOME</application> desktop. Note, however, that
without <application>Yelp</application> you will not be able to view the
built-in Help provided by core <application>GNOME</application> and many
- of the support applications. This is mentioned here because you may not
- wish to install a Gecko layout engine. Without a Gecko layout engine you
- will have no graphical browser capability as the default GNOME browser,
- <xref linkend="epiphany"/>, also requires a Gecko layout engine.</para>
+ of the support applications.</para>
</note>
<para condition="html" role="usernotes">User Notes:
@@ -90,10 +88,7 @@
<para>Install <application>Yelp</application> by running the following
commands:</para>
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix
ORBit-2.0) \
- --sysconfdir=&gnome-etc-dir; \
- --localstatedir=/var/lib \
- --enable-cpp-rtti &&
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &&
make</userinput></screen>
<para>This package does not come with a test suite.</para>
@@ -104,30 +99,16 @@
</sect2>
- <sect2 role="commands">
- <title>Command Explanations</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/gnome-prefix.xml"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/gnome-sysconfdir.xml"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude";
- href="../../xincludes/scrollkeeper-dir.xml"/>
-
- </sect2>
-
<sect2 role="content">
<title>Contents</title>
<segmentedlist>
- <segtitle>Installed Program</segtitle>
+ <segtitle>Installed Programs</segtitle>
<segtitle>Installed Libraries</segtitle>
<segtitle>Installed Directory</segtitle>
<seglistitem>
- <seg>yelp</seg>
+ <seg>gnome-help (a symlink to yelp) and yelp</seg>
<seg>None</seg>
<seg><envar>$GNOME_PREFIX</envar>/share/yelp{icons,ui,xslt}</seg>
</seglistitem>
Modified: trunk/BOOK/introduction/welcome/changelog.xml
===================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml 2012-02-16 19:45:44 UTC
(rev 9439)
+++ trunk/BOOK/introduction/welcome/changelog.xml 2012-02-16 20:21:40 UTC
(rev 9440)
@@ -74,6 +74,9 @@
<listitem>
<para>[ken] - add yelp-xsl-3.2.1 from Wayne.</para>
</listitem>
+ <listitem>
+ <para>[ken] - merge yelp-3.2.1 from Wayne.</para>
+ </listitem>
</itemizedlist>
</listitem>
--
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
