Changeset 1eac9eb

Timestamp:

04/20/2019 06:59:41 PM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 9.0, 9.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

119bb45

Parents:

d38dc9a

Message:

Archive w3m and allow linux-pam doc to be built with lynx

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

Files:

• archive/w3m.xml (moved) (moved from networking/textweb/w3m.xml ) (1 diff)
• general.ent (modified) (1 diff)
• general/graphlib/gegl.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/mailnews/mutt.xml (modified) (1 diff)
• networking/textweb/textweb.xml (modified) (1 diff)
• postlfs/security/linux-pam.xml (modified) (4 diffs)
• pst/sgml/docbook-utils.xml (modified) (1 diff)
• pst/xml/xmlto.xml (modified) (1 diff)
• x/installing/x7lib.xml (modified) (1 diff)
• xsoft/other/xdg-utils.xml (modified) (1 diff)

archive/w3m.xml

@@ -17 +17 @@
 
   <sect1info>
-    <othername>$LastChangedBy$</othername>
-    <date>$Date$</date>
+    <othername>$LastChangedBy: pierre $</othername>
+    <date>$Date: 2019-02-15 22:01:29 +0100 (ven. 15 févr. 2019) $</date>
   </sect1info>
 

general.ent

@@ -64 +64 @@
 <!ENTITY appstream-glib-url   "http://people.freedesktop.org/~hughsient/appstream-glib/releases">
 <!ENTITY elinks-url           "http://elinks.or.cz">
+<!ENTITY w3m-url              "http://w3m.sourceforge.net/">
 
 <!-- These entities are used to identify versions of LFS

general/graphlib/gegl.xml

@@ -101 +101 @@
       <xref linkend="gobject-introspection"/>,
       <xref linkend="vala"/>,
-      <xref linkend="w3m"/>,
       <xref linkend="gexiv2"/>,
       <ulink url="http://lensfun.sourceforge.net/">lensfun</ulink>,
@@ -109 +108 @@
       <ulink url="http://luajit.org/luajit.html">LuaJIT</ulink>,
       <ulink url="https://github.com/hodefoting/mrg/releases">MRG</ulink>,
-      <ulink url="https://www.khronos.org/opencl/">OpenCL</ulink> (for tests), and
-      <ulink url="http://www.openexr.org">OpenEXR</ulink>
+      <ulink url="https://www.khronos.org/opencl/">OpenCL</ulink> (for tests),
+      <ulink url="http://www.openexr.org">OpenEXR</ulink>, and
+      <ulink url="&w3m-url;">W3m</ulink>
     </para>
 

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
     -->
+    <listitem>
+      <para>April 20th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Archive W3m and allow Linux-pam documentation to
+          be generated with lynx.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>April 19th, 2019</para>

networking/mailnews/mutt.xml

@@ -93 +93 @@
       <xref linkend="libxslt"/> and either
       <xref linkend="lynx"/>,
-      <xref linkend="w3m"/>, or
+      <ulink url="&w3m-url;">W3m</ulink>, or
       <ulink url="&elinks-url;">ELinks</ulink>
     </para>

networking/textweb/textweb.xml

@@ -32 +32 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="links.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lynx.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="w3m.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="w3m.xml"/>-->
 
 </chapter>

postlfs/security/linux-pam.xml

@@ -114 +114 @@
       <xref linkend="fop"/>,
       <xref linkend="libxslt"/> and either
-      <xref linkend="w3m"/> or
-      <ulink url="&elinks-url;">elinks</ulink> (but with a link calling it
-      '<application>links</application>') and remove the documentation switch.
+      <xref linkend="lynx"/> or
+      <ulink url="&w3m-url;">W3m</ulink>
     </para>
 
@@ -133 +132 @@
 
 <screen><userinput>tar -xf ../Linux-PAM-&linux-pam-docs-version;-docs.tar.bz2 --strip-components=1</userinput></screen>
+
+    <para>
+      If you instead want to regenerate the documentation, fix the
+      <command>configure</command> script so that it detects lynx if installed:
+    </para>
+
+<screen><userinput>sed -e 's/dummy links/dummy lynx/'                                     \
+    -e 's/-no-numbering -no-references/-force-html -nonumbers -stdin/' \
+    -i configure</userinput></screen>
 
     <para>
@@ -142 +150 @@
             --sysconfdir=/etc                \
             --libdir=/usr/lib                \
-            --disable-regenerate-docu        \
             --enable-securedir=/lib/security \
             --docdir=/usr/share/doc/Linux-PAM-&linux-pam-version; &amp;&amp;
@@ -228 +235 @@
 
     <para>
-      <parameter>--disable-regenerate-docu</parameter> : This switch prevents
-     this version of the package trying to build its documentation, and failing,
-     if the required dependencies <emphasis>except</emphasis>
-     <xref linkend="w3m"/> are present, but <xref linkend="Links"/> is present.
-     Remove this switch if you have installed w3m (or elinks, with a link so it
-     can be invoked as 'links').
+      <option>--disable-regenerate-docu</option> : If the needed dependencies
+      (<xref linkend="DocBook"/>, <xref linkend="docbook-xsl"/>, <xref
+      linkend="libxslt"/>, and <xref linkend="lynx"/> or <ulink
+      url="&w3m-url;">W3m</ulink>) are installed, the manual pages, and the
+      html and text documentations are (re)generated and installed.
+      Furthermore, if <xref linkend="fop"/> is installed, the PDF
+      documentation is generated and installed. Use this switch if you do not
+      want to rebuild the documentation.
     </para>
 

pst/sgml/docbook-utils.xml

@@ -85 +85 @@
       <xref role="runtime" linkend="lynx"/> or
       <xref role="runtime" linkend="Links"/> or
-      <xref role="runtime" linkend="w3m"/> (for conversion to ASCII text)
+      <ulink role="runtime" url="&w3m-url;">W3m</ulink>
+      (for conversion to ASCII text)
     </para>
 

pst/xml/xmlto.xml

@@ -84 +84 @@
       <xref role="runtime" linkend="Links"/>,
       <xref role="runtime" linkend="lynx"/>,
-      <xref role="runtime" linkend="w3m"/>, or
+      <ulink url="&w3m-url;">W3m</ulink>, or
       <ulink url="&elinks-url;">ELinks</ulink>
     </para>

x/installing/x7lib.xml

@@ -162 +162 @@
     <xref linkend="Links"/>,
     <xref linkend="lynx"/>,
-    and <xref linkend="w3m"/> (to generate additional PDF or text
+    and <ulink url="&w3m-url;">W3m</ulink> (to generate additional PDF or text
     documentation for the libXfont package).</para>
 

xsoft/other/xdg-utils.xml

@@ -79 +79 @@
       <xref linkend="xmlto"/> with one of
       <xref linkend="lynx"/>,
-      <xref linkend="w3m"/>, or
-      <xref linkend="Links"/>
+      <xref linkend="Links"/>, or
+      <ulink url="&w3m-url;">W3m</ulink>
     </para>