Changeset 6f21829 for BOOK/final-system/multilib

Timestamp:

Dec 28, 2015, 10:42:49 AM (9 years ago)

Author:

William Harrington <kb0iic@…>

Branches:

master, systemd

Children:

223e237

Parents:

c4ebdab

Message:

Upgrade Ncurses from 5.9 to 6.0

Location:

BOOK/final-system/multilib

Files:

• ncurses-64bit.xml (modified) (5 diffs)
• ncurses-n32.xml (modified) (5 diffs)
• ncurses.xml (modified) (5 diffs)

BOOK/final-system/multilib/ncurses-64bit.xml

@@ -22 +22 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="ncurses.xml"
@@ -29 +30 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -41 +43 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -65 +65 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
+    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
     the multiarch wrapper and then wrap it:</para>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-64}
-ln -svf multiarch_wrapper /usr/bin/ncursesw5-config</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-64}
+ln -svf multiarch_wrapper /usr/bin/ncursesw6-config</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -98 +98 @@
 ln -sfv libncurses.a /usr/lib64/libcurses.a
 ln -sfv libncurses++w.a /usr/lib64/libncurses++.a
-ln -sfv ncursesw5-config-64 /usr/bin/ncurses5-config-64
-ln -sfv ncursesw5-config /usr/bin/ncurses5-config</userinput></screen>
+ln -sfv ncursesw6-config-64 /usr/bin/ncurses6-config-64
+ln -sfv ncursesw6-config /usr/bin/ncurses6-config</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/ncurses-n32.xml

@@ -23 +23 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="ncurses.xml"
@@ -30 +31 @@
     href="ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -42 +44 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -66 +66 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
+    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
     the multiarch wrapper:</para>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-n32}</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-n32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -98 +98 @@
 ln -sfv libncurses.a /usr/lib32/libcurses.a
 ln -sfv libncurses++w.a /usr/lib32/libncurses++.a
-ln -sfv ncurses5w-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
+ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
 
   </sect2>

BOOK/final-system/multilib/ncurses.xml

@@ -23 +23 @@
     <title>Installation of Ncurses</title>
 
+<!--Ncurses Branch Update Area
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/ncurses.xml"
@@ -30 +31 @@
     href="../common/ncurses.xml"
     xpointer="xpointer(//*[@os='p2'])"/>
+-->
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -42 +44 @@
     --without-debug \
     --enable-widec \
-    --with-manpage-format=normal \
-    --enable-pc-files \
-    --with-default-terminfo-dir=/usr/share/terminfo</userinput></screen>
+    --enable-pc-files</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -70 +70 @@
     xpointer="xpointer(//*[@os='g'])"/>
 
-    <para os="m1">Prepare <filename>ncursesw5-config</filename> to be wrapped by
+    <para os="m1">Prepare <filename>ncursesw6-config</filename> to be wrapped by
     the multiarch wrapper:</para>
 
-<screen os="m2"><userinput>mv -v /usr/bin/ncursesw5-config{,-32}</userinput></screen>
+<screen os="m2"><userinput>mv -v /usr/bin/ncursesw6-config{,-32}</userinput></screen>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -104 +104 @@
 ln -sfv libncurses.a /usr/lib/libcurses.a
 ln -sfv libncurses++w.a /usr/lib/libncurses++.a
-ln -sfv ncursesw5-config-32 /usr/bin/ncurses5-config-32</userinput></screen>
+ln -sfv ncursesw6-config-32 /usr/bin/ncurses6-config-32</userinput></screen>
 
   </sect2>