Changes in chapter08/ncurses.xml [5bef8f2:91f9a17]

File:

• chapter08/ncurses.xml (modified) (6 diffs)

chapter08/ncurses.xml

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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" [
@@ -100 +100 @@
         <listitem>
           <para>This switch causes wide-character libraries (e.g., <filename
-          class="libraryfile">libncursesw.so.&ncurses-release;</filename>)
+          class="libraryfile">libncursesw.so.&ncurses-version;</filename>)
           to be built instead of normal ones (e.g., <filename
-          class="libraryfile">libncurses.so.&ncurses-release;</filename>).
+          class="libraryfile">libncurses.so.&ncurses-version;</filename>).
           These wide-character libraries are usable in both multibyte and
           traditional 8-bit locales, while normal libraries work properly
@@ -128 +128 @@
 
     <para>The installation of this package will overwrite
-    <filename class="libraryfile">libncursesw.so.&ncurses-release;</filename>
+    <filename class="libraryfile">libncursesw.so.&ncurses-version;</filename>
     in-place.  It may crash the shell process which is using code and data
     from the library file.  Install the package with
     <literal>DESTDIR</literal>, and replace the library file correctly using
-    <command>install</command> command (the header
-    <filename>curses.h</filename> is also edited to ensure the
-    wide-character ABI to be used as what we've done in
-    <xref linkend='ch-tools-ncurses'/>):</para>
+    <command>install</command> command:</para>
 
 <screen><userinput remap="install">make DESTDIR=$PWD/dest install
-install -vm755 dest/usr/lib/libncursesw.so.&ncurses-release; /usr/lib
-rm -v  dest/usr/lib/libncursesw.so.&ncurses-release;
-sed -e 's/^#if.*XOPEN.*$/#if 1/' \
-    -i dest/usr/include/curses.h
+install -vm755 dest/usr/lib/libncursesw.so.&ncurses-version; /usr/lib
+rm -v  dest/usr/lib/libncursesw.so.&ncurses-version;
 cp -av dest/* /</userinput></screen>
 
     <para>Many applications still expect the linker to be able to find
-    non-wide-character Ncurses libraries. Trick such applications into
-    linking with wide-character libraries by means of symlinks
-    (note that the <filename class='extension'>.so</filename> links are
-    only safe with <filename>curses.h</filename> edited to always use the
-    wide-character ABI):</para>
+    non-wide-character Ncurses libraries. Trick such applications into linking with
+    wide-character libraries by means of symlinks and linker scripts:</para>
 
 <screen><userinput remap="install">for lib in ncurses form panel menu ; do
-    ln -sfv lib${lib}w.so /usr/lib/lib${lib}.so
-    ln -sfv ${lib}w.pc    /usr/lib/pkgconfig/${lib}.pc
+    rm -vf                    /usr/lib/lib${lib}.so
+    echo "INPUT(-l${lib}w)" &gt; /usr/lib/lib${lib}.so
+    ln -sfv ${lib}w.pc        /usr/lib/pkgconfig/${lib}.pc
 done</userinput></screen>
 
@@ -160 +153 @@
     buildable:</para>
 
-<screen><userinput remap="install">ln -sfv libncursesw.so /usr/lib/libcurses.so</userinput></screen>
+<screen><userinput remap="install">rm -vf                     /usr/lib/libcursesw.so
+echo "INPUT(-lncursesw)" &gt; /usr/lib/libcursesw.so
+ln -sfv libncurses.so      /usr/lib/libcurses.so</userinput></screen>
 
     <para>If desired, install the Ncurses documentation:</para>
@@ -212 +207 @@
         </seg>
         <seg>
-           libcurses.so (symlink),
-           libform.so (symlink),
+           libcursesw.so (symlink and linker script to libncursesw.so),
            libformw.so,
-           libmenu.so (symlink),
            libmenuw.so,
-           libncurses.so (symlink),
            libncursesw.so,
            libncurses++w.so,
-           libpanel.so (symlink),
-           and libpanelw.so,
-        </seg>
+           libpanelw.so, and their non-wide-character counterparts without "w"
+              in the library names.</seg>
         <seg>
            /usr/share/tabset,
@@ -352 +343 @@
       </varlistentry>
 
+      <varlistentry id="libcursesw">
+        <term><filename class="libraryfile">libcursesw</filename></term>
+        <listitem>
+          <para>A link to <filename>libncursesw</filename></para>
+          <indexterm zone="ch-system-ncurses libcursesw">
+            <primary sortas="c-libcursesw">libcursesw</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="libncursesw">
         <term><filename class="libraryfile">libncursesw</filename></term>