Changeset f889089

Timestamp:

02/16/2012 08:21:40 PM (12 years ago)

Author:

Ken Moffat <ken@…>

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:

9ba96bb

Parents:

d073532

Message:

Update to yelp-3.2.1 and remove some accumulated crud from it, particularly re gecko.

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

Files:

• general.ent (modified) (1 diff)
• gnome/core/yelp.xml (modified) (6 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -741 +741 @@
 <!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 -->

gnome/core/yelp.xml

@@ -5 +5 @@
   %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">
 ]>
@@ -33 +33 @@
     browser. This is useful for viewing help files.</para>
 
-    &lfs65_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -62 +62 @@
     <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>
@@ -74 +75 @@
       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>
 
@@ -91 +89 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=$(pkg-config --variable=prefix ORBit-2.0) \
-            --sysconfdir=&gnome-etc-dir; \
-            --localstatedir=/var/lib \
-            --enable-cpp-rtti &amp;&amp;
+<screen><userinput>./configure --prefix=$GNOME_PREFIX &amp;&amp;
 make</userinput></screen>
 
@@ -105 +100 @@
   </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>

introduction/welcome/changelog.xml

@@ -75 +75 @@
           <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>