Changeset ce6a89f

Timestamp:

02/18/2012 01:53:24 PM (12 years ago)

Author:

Andrew Benton <andy@…>

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:

ce889d2

Parents:

c4a1934a

Message:

w3m-0.5.3

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

Files:

• general.ent (modified) (1 diff)
• introduction/welcome/changelog.xml (modified) (1 diff)
• networking/textweb/w3m.xml (modified) (10 diffs)

general.ent

@@ -512 +512 @@
 <!ENTITY Links-version                "2.4">
 <!ENTITY lynx-version                 "2.8.8dev.10">
-<!ENTITY w3m-version                  "0.5.2">
+<!ENTITY w3m-version                  "0.5.3">
 
 <!-- Chapter 18 -->

introduction/welcome/changelog.xml

@@ -59 +59 @@
           modules.</para>
         </listitem>
+        <listitem>
+          <para>[abenton] - w3m 0.5.3.</para>
+        </listitem>
       </itemizedlist>
     </listitem>

networking/textweb/w3m.xml

@@ -7 +7 @@
   <!ENTITY w3m-download-http "&sourceforge-repo;/w3m/w3m-&w3m-version;.tar.gz">
   <!ENTITY w3m-download-ftp  " ">
-  <!ENTITY w3m-md5sum        "ba06992d3207666ed1bf2dcf7c72bf58">
-  <!ENTITY w3m-size          "1.9 MB">
-  <!ENTITY w3m-buildsize     "20 MB">
+  <!ENTITY w3m-md5sum        "1b845a983a50b8dec0169ac48479eacc">
+  <!ENTITY w3m-size          "2.1 MB">
+  <!ENTITY w3m-buildsize     "26 MB">
   <!ENTITY w3m-time          "0.3 SBU">
 ]>
@@ -33 +33 @@
     also be used as a text-mode WWW browser.</para>
 
-    &lfs67_built;
+    &lfs70_built;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -63 +63 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
-    <para role="optional"><!-- <xref linkend="pkgconfig"/>, -->
-    <xref linkend="gpm"/>,
+    <para role="optional"><xref linkend="gpm"/>,
     <xref linkend="openssl"/>,
     <xref linkend="imlib2"/>,
@@ -72 +71 @@
     <ulink url="http://bugs.debian.org/448360">buggy</ulink>, and gives no
     additional functionality as compared to other image loading libraries),
-    <!-- <xref linkend="gdk"/>, -->
-    <ulink url="&gnome-download-http;/gdk-pixbuf/0.22/">GDK
-    Pixbuf-0.22</ulink>,
+    <xref linkend="gdk-pixbuf"/>,
     <xref linkend="compface"/>,
     <ulink url="http://packages.debian.org/unstable/text/nkf">nkf</ulink>,
@@ -81 +78 @@
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/W3M"/></para>
-
   </sect2>
 
@@ -90 +86 @@
     commands:</para>
 
-<screen><userinput>./configure --prefix=/usr \
-            --libexecdir=/usr/lib \
-            --sysconfdir=/etc &amp;&amp;
+<screen><userinput>sed -i 's/file_handle/file_foo/' istream.{c,h} &amp;&amp;
+./configure --prefix=/usr --sysconfdir=/etc LIBS=-lX11 &amp;&amp;
 make</userinput></screen>
 
@@ -105 +100 @@
 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>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><option>--sysconfdir=/etc</option>: This option puts the configuration
+    files in /etc.</para>
+
+    <para><parameter>LIBS=-lX11</parameter>: This tells the linker
+    (<command>ld</command>) to link <application>w3m</application> to
+    <application>libX11</application>. Without this the build will fail. This
+    is only needed if you have installed <xref linkend="x-window-system"/>.
+    Remove <parameter>LIBS=-lX11</parameter> if you've not installed
+    <application>libX11</application>.</para>
   </sect2>
 
@@ -124 +137 @@
         <primary sortas="e-AA.w3m/*">~/.w3m/*</primary>
       </indexterm>
-
     </sect3>
-
   </sect2>
 
@@ -134 +145 @@
     <segmentedlist>
       <segtitle>Installed Programs</segtitle>
-      <segtitle>Installed Libraries</segtitle>
       <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
         <seg>w3m and w3mman</seg>
-        <seg>None</seg>
-        <seg>/usr/lib/w3m, /usr/share/w3m and
+        <seg>/usr/libexec/w3m, /usr/share/w3m and
         usr/share/doc/w3m-&w3m-version;</seg>
       </seglistitem>
@@ -171 +180 @@
         </listitem>
       </varlistentry>
-
     </variablelist>
-
   </sect2>
-
 </sect1>