Author: pierre Date: Sat Apr 20 11:59:41 2019 New Revision: 21481 Log: Archive w3m and allow linux-pam doc to be built with lynx
Added: trunk/BOOK/archive/w3m.xml Deleted: trunk/BOOK/networking/textweb/w3m.xml Modified: trunk/BOOK/general.ent trunk/BOOK/general/graphlib/gegl.xml trunk/BOOK/introduction/welcome/changelog.xml trunk/BOOK/networking/mailnews/mutt.xml trunk/BOOK/networking/textweb/textweb.xml trunk/BOOK/postlfs/security/linux-pam.xml trunk/BOOK/pst/sgml/docbook-utils.xml trunk/BOOK/pst/xml/xmlto.xml trunk/BOOK/x/installing/x7lib.xml trunk/BOOK/xsoft/other/xdg-utils.xml Added: trunk/BOOK/archive/w3m.xml ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/BOOK/archive/w3m.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -0,0 +1,213 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" + "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"; [ + <!ENTITY % general-entities SYSTEM "../../general.ent"> + %general-entities; + + <!ENTITY w3m-download-http "&sourceforge-dl;/w3m/w3m-&w3m-version;.tar.gz"> + <!ENTITY w3m-download-ftp " "> + <!ENTITY w3m-md5sum "1b845a983a50b8dec0169ac48479eacc"> + <!ENTITY w3m-size "2.1 MB"> + <!ENTITY w3m-buildsize "26 MB"> + <!ENTITY w3m-time "0.3 SBU"> +]> + +<sect1 id="w3m" xreflabel="w3m-&w3m-version;"> + <?dbhtml filename="w3m.html"?> + + <sect1info> + <othername>$LastChangedBy: pierre $</othername> + <date>$Date: 2019-02-15 22:01:29 +0100 (ven. 15 févr. 2019) $</date> + </sect1info> + + <title>W3m-&w3m-version;</title> + + <indexterm zone="w3m"> + <primary sortas="a-W3m">W3m</primary> + </indexterm> + + <sect2 role="package"> + <title>Introduction to W3m</title> + + <para><application>w3m</application> is primarily a pager but it can + also be used as a text-mode WWW browser.</para> + + &lfs84_checked; + + <bridgehead renderas="sect3">Package Information</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para>Download (HTTP): <ulink url="&w3m-download-http;"/></para> + </listitem> + <listitem> + <para>Download (FTP): <ulink url="&w3m-download-ftp;"/></para> + </listitem> + <listitem> + <para>Download MD5 sum: &w3m-md5sum;</para> + </listitem> + <listitem> + <para>Download size: &w3m-size;</para> + </listitem> + <listitem> + <para>Estimated disk space required: &w3m-buildsize;</para> + </listitem> + <listitem> + <para>Estimated build time: &w3m-time;</para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">Additional Downloads</bridgehead> + <itemizedlist spacing="compact"> + <listitem> + <para> + Required patch: + <ulink url="&patch-root;/w3m-&w3m-version;-bdwgc72-2.patch"/> + </para> + </listitem> + </itemizedlist> + + <bridgehead renderas="sect3">W3m Dependencies</bridgehead> + + <bridgehead renderas="sect4">Required</bridgehead> + <para role="required"><xref linkend="gc"/></para> + + <bridgehead renderas="sect4">Optional</bridgehead> + <para role="optional"> + <xref linkend="gpm"/>, +<!-- <xref linkend="openssl10"/>,--> + <xref linkend="imlib2"/>, + <xref linkend="gtk2"/>, + <ulink url="http://ftp.gnome.org/pub/gnome/sources/imlib/1.9/";>Imlib</ulink> + (not recommended: obsolete, abandoned upstream, + <ulink url="http://bugs.debian.org/448360";>buggy</ulink>, and gives no + additional functionality as compared to other image loading libraries), + <xref linkend="gdk-pixbuf"/>, + <xref linkend="compface"/>, and + <ulink url="http://packages.debian.org/unstable/text/nkf";>nkf</ulink>, + a Mail User Agent, and + an External Browser + </para> + + <para condition="html" role="usernotes">User Notes: + <ulink url="&blfs-wiki;/W3M"/></para> + </sect2> + + <sect2 role="installation"> + <title>Installation of W3m</title> + + <para>Install <application>w3m</application> by running the following + commands:</para> + +<screen><userinput>patch -Np1 -i ../w3m-&w3m-version;-bdwgc72-2.patch && +sed -i 's/file_handle/file_foo/' istream.{c,h} && +sed -i 's#gdk-pixbuf-xlib-2.0#& x11#' configure && +sed -i '/USE_EGD/s/define/undef/' config.h.in && + + +./configure --prefix=/usr --sysconfdir=/etc && +make</userinput></screen> + + <para>This package does not come with a test suite.</para> + + <para>Now, as the <systemitem class="username">root</systemitem> user:</para> + +<screen role="root"><userinput>make install && +install -v -m644 -D doc/keymap.default /etc/w3m/keymap && +install -v -m644 doc/menu.default /etc/w3m/menu && +install -v -m755 -d /usr/share/doc/w3m-&w3m-version; && +install -v -m644 doc/{HISTORY,READ*,keymap.*,menu.*,*.html} \ + /usr/share/doc/w3m-&w3m-version;</userinput></screen> + </sect2> + + <sect2 role="commands"> + <title>Command Explanations</title> + + <para> + <command>patch -p1 < ../w3m-&w3m-version;-bdwgc72-2.patch</command>: + This patch fixes compiling w3m with GC-7.2 and above installed. + </para> + + <para><command>sed -i 's/file_handle/file_foo/' istream.{c,h}</command>: + This sed renames the file_handle function to avoid a clash with a glibc + function that has the same name, defined in + /usr/include/bits/fcntl.h.</para> + + <para><command>sed -i 's#gdk-pixbuf-xlib-2.0#& x11#' + configure</command>: This sed fixes compiling <application>w3m</application> + using <xref linkend="gtk2"/> as its image library. It has no impact if + <xref linkend="gtk2"/> is not installed.</para> + + <para> + <command>sed -i '/USE_EGD/s/define/undef/' config.h.in</command>: Allows + building against <application>openssl-1.1</application>. + </para> + + <para><parameter>--sysconfdir=/etc</parameter>: This option puts the + configuration files in /etc.</para> + </sect2> + + <sect2 role="configuration"> + <title>Configuring W3m</title> + + <sect3 id="w3m-config"> + <title>Config Files</title> + + <para><filename>/etc/w3m/*</filename> and + <filename>~/.w3m/*</filename></para> + + <indexterm zone="w3m w3m-config"> + <primary sortas="e-etc-w3m/*">/etc/w3m/*</primary> + </indexterm> + + <indexterm zone="w3m w3m-config"> + <primary sortas="e-AA.w3m/*">~/.w3m/*</primary> + </indexterm> + </sect3> + </sect2> + + <sect2 role="content"> + <title>Contents</title> + + <segmentedlist> + <segtitle>Installed Programs</segtitle> + <segtitle>Installed Libraries</segtitle> + <segtitle>Installed Directories</segtitle> + + <seglistitem> + <seg>w3m and w3mman</seg> + <seg>None</seg> + <seg>/usr/libexec/w3m, + /usr/share/w3m, and + /usr/share/doc/w3m-&w3m-version;</seg> + </seglistitem> + </segmentedlist> + + <variablelist> + <bridgehead renderas="sect3">Short Descriptions</bridgehead> + <?dbfo list-presentation="list"?> + <?dbhtml list-presentation="table"?> + + <varlistentry id="w3m-prog"> + <term><command>w3m</command></term> + <listitem> + <para>is a text based web browser and pager.</para> + <indexterm zone="w3m w3m-prog"> + <primary sortas="b-w3m">w3m</primary> + </indexterm> + </listitem> + </varlistentry> + + <varlistentry id="w3mman"> + <!-- Don't remove the extra space, it prevent a FOP warning. --> + <term><command>w3mman</command> </term> + <listitem> + <para>is an interface to the on-line reference manuals in + <command>w3m</command>.</para> + <indexterm zone="w3m w3mman"> + <primary sortas="b-w3mman">w3mman</primary> + </indexterm> + </listitem> + </varlistentry> + </variablelist> + </sect2> +</sect1> Modified: trunk/BOOK/general.ent ============================================================================== --- trunk/BOOK/general.ent Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/general.ent Sat Apr 20 11:59:41 2019 (r21481) @@ -63,6 +63,7 @@ <!ENTITY pypi "https://pypi.python.org/pypi";> <!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 packages referenced throughout the BLFS book. --> Modified: trunk/BOOK/general/graphlib/gegl.xml ============================================================================== --- trunk/BOOK/general/graphlib/gegl.xml Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/general/graphlib/gegl.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -100,7 +100,6 @@ <xref linkend="sdl"/>, <xref linkend="gobject-introspection"/>, <xref linkend="vala"/>, - <xref linkend="w3m"/>, <xref linkend="gexiv2"/>, <ulink url="http://lensfun.sourceforge.net/";>lensfun</ulink>, <ulink url="http://libopenraw.freedesktop.org/wiki/";>libopenraw</ulink>, @@ -108,8 +107,9 @@ <ulink url="http://faculty.cse.tamu.edu/davis/suitesparse.html";>libumfpack</ulink>, <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> <para condition="html" role="usernotes"> Modified: trunk/BOOK/introduction/welcome/changelog.xml ============================================================================== --- trunk/BOOK/introduction/welcome/changelog.xml Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/introduction/welcome/changelog.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -42,6 +42,16 @@ </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> <itemizedlist> <listitem> Modified: trunk/BOOK/networking/mailnews/mutt.xml ============================================================================== --- trunk/BOOK/networking/mailnews/mutt.xml Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/networking/mailnews/mutt.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -92,7 +92,7 @@ <para role="optional"> <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> Modified: trunk/BOOK/networking/textweb/textweb.xml ============================================================================== --- trunk/BOOK/networking/textweb/textweb.xml Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/networking/textweb/textweb.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -31,6 +31,6 @@ <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> Modified: trunk/BOOK/postlfs/security/linux-pam.xml ============================================================================== --- trunk/BOOK/postlfs/security/linux-pam.xml Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/postlfs/security/linux-pam.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -113,9 +113,8 @@ <xref linkend="docbook-xsl"/>, <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> <para condition="html" role="usernotes">User Notes: @@ -134,6 +133,15 @@ <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> Install <application>Linux PAM</application> by running the following commands: </para> @@ -141,7 +149,6 @@ <screen><userinput>./configure --prefix=/usr \ --sysconfdir=/etc \ --libdir=/usr/lib \ - --disable-regenerate-docu \ --enable-securedir=/lib/security \ --docdir=/usr/share/doc/Linux-PAM-&linux-pam-version; && make</userinput></screen> @@ -227,12 +234,14 @@ </para> <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> <para> Modified: trunk/BOOK/pst/sgml/docbook-utils.xml ============================================================================== --- trunk/BOOK/pst/sgml/docbook-utils.xml Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/pst/sgml/docbook-utils.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -84,7 +84,8 @@ texinfo), and <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> <para condition="html" role="usernotes">User Notes: Modified: trunk/BOOK/pst/xml/xmlto.xml ============================================================================== --- trunk/BOOK/pst/xml/xmlto.xml Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/pst/xml/xmlto.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -83,7 +83,7 @@ One of <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> Modified: trunk/BOOK/x/installing/x7lib.xml ============================================================================== --- trunk/BOOK/x/installing/x7lib.xml Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/x/installing/x7lib.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -161,7 +161,7 @@ following: <xref linkend="fop"/>, <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> <para condition="html" role="usernotes">User Notes: Modified: trunk/BOOK/xsoft/other/xdg-utils.xml ============================================================================== --- trunk/BOOK/xsoft/other/xdg-utils.xml Sat Apr 20 08:23:00 2019 (r21480) +++ trunk/BOOK/xsoft/other/xdg-utils.xml Sat Apr 20 11:59:41 2019 (r21481) @@ -78,8 +78,8 @@ <para role="required"> <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> <bridgehead renderas="sect4">Required (runtime)</bridgehead> -- http://lists.linuxfromscratch.org/listinfo/blfs-book FAQ: http://www.linuxfromscratch.org/blfs/faq.html Unsubscribe: See the above information page
