r1563 - / trunk/BOOK trunk/BOOK/final-system/common trunk/BOOK/final-system/multilib trunk/BOOK/introduction/common trunk/BOOK/materials/common

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu May 11 16:13:22 PDT 2006


Author: jim
Date: 2006-05-11 17:13:21 -0600 (Thu, 11 May 2006)
New Revision: 1563

Modified:
   /
   trunk/BOOK/
   trunk/BOOK/final-system/common/vim.xml
   trunk/BOOK/final-system/multilib/vim.xml
   trunk/BOOK/introduction/common/changelog.xml
   trunk/BOOK/materials/common/patches.xml
   trunk/BOOK/patches.ent
Log:
 r3395 at server (orig r1592):  jim | 2006-05-11 15:56:28 -0700
  r3392 at server:  jim | 2006-05-11 15:54:34 -0700
  Added: Vim 7.0 Upstream Patches
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1591
   + b6734a72-470d-0410-b049-f317dca95413:/:1592


Property changes on: trunk/BOOK
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3391
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790
   + 38c7b366-470d-0410-a457-935707c16d9b:/cross-lfs:3392
3949c430-d905-0410-97b6-f115d20341b5:/cross-lfs:1422
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/cross-lfs:1269
b6734a72-470d-0410-b049-f317dca95413:/trunk/BOOK:1406
f6929928-7304-0410-9559-ff6106abff4d:/cross-lfs:790

Modified: trunk/BOOK/final-system/common/vim.xml
===================================================================
--- trunk/BOOK/final-system/common/vim.xml	2006-05-11 23:13:08 UTC (rev 1562)
+++ trunk/BOOK/final-system/common/vim.xml	2006-05-11 23:13:21 UTC (rev 1563)
@@ -35,17 +35,24 @@
 
     <para os="a">First, unpack both <filename>vim-&vim-version;.tar.bz2</filename>
     and (optionally) <filename>vim-&vim-version;-lang.tar.gz</filename>
-    archives into the same directory. Then, change the default location of
+    archives into the same directory.</para>
+
+    <para os="p1">The following patch contains updates from the maintainer. The
+    maintainer of Vim only releases these patches to fix serious issues.</para>
+
+<screen os="p2"><userinput>patch -Np1 -i ../&vim-fixes-patch;</userinput></screen>
+
+    <para os="b">Change the default location of
     the <filename>vimrc</filename> configuration file to <filename
     class="directory">/etc</filename>:</para>
 
-<screen os="b"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen>
+<screen os="c"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' >> src/feature.h</userinput></screen>
 
-    <para os="c">Prepare Vim for compilation:</para>
+    <para os="d">Prepare Vim for compilation:</para>
 
-<screen os="d"><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
+<screen os="e"><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
 
-    <variablelist os="e">
+    <variablelist os="f">
       <title>The meaning of the configure options:</title>
 
       <varlistentry>
@@ -62,18 +69,18 @@
 
     </variablelist>
 
-    <para os="f">Compile the package:</para>
+    <para os="g">Compile the package:</para>
 
-<screen os="g"><userinput>make</userinput></screen>
+<screen os="h"><userinput>make</userinput></screen>
 
-    <para os="h">To test the results, issue: <userinput>make test</userinput>.
+    <para os="i">To test the results, issue: <userinput>make test</userinput>.
     However, this test suite outputs a lot of binary data to the
     screen, which can cause issues with the settings of the current terminal.
     This can be resolved by redirecting the output to a log file.</para>
 
-    <para os="i">Install the package:</para>
+    <para os="j">Install the package:</para>
 
-<screen os="j"><userinput>make install</userinput></screen>
+<screen os="k"><userinput>make install</userinput></screen>
 
     <para os="l">Many users are used to using <command>vi</command> instead of
     <command>vim</command>. To allow execution of <command>vim</command>
@@ -82,15 +89,15 @@
 
 <screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
 
-<para os="m1">By default, Vim's documentation is installed in
+<para os="n">By default, Vim's documentation is installed in
 <filename class="directory">/usr/share/vim</filename>.  The following symlink
 allows the documentation to be accessed via
 <filename class="directory">/usr/share/doc/vim-&vim-version;</filename>, making
 it consistent with the location of documentation for other packages:</para>
 
-<screen os="m2"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
+<screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
 
-    <para os="n">If an X Window System is going to be installed on the LFS
+    <para os="p">If an X Window System is going to be installed on the LFS
     system, it may be necessary to recompile Vim after installing X. Vim
     comes with a GUI version of the editor that requires X and some
     additional libraries to be installed. For more information on this

Modified: trunk/BOOK/final-system/multilib/vim.xml
===================================================================
--- trunk/BOOK/final-system/multilib/vim.xml	2006-05-11 23:13:08 UTC (rev 1562)
+++ trunk/BOOK/final-system/multilib/vim.xml	2006-05-11 23:13:21 UTC (rev 1563)
@@ -27,19 +27,27 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='b'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
     xpointer="xpointer(//*[@os='c'])"/>
 
-<screen os="d"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
-   --enable-multibyte</userinput></screen>
-
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='e'])"/>
+    xpointer="xpointer(//*[@os='d'])"/>
 
+<screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
+   --enable-multibyte</userinput></screen>
+
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
     xpointer="xpointer(//*[@os='f'])"/>
@@ -62,6 +70,10 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
+    xpointer="xpointer(//*[@os='k'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+    href="../common/vim.xml"
     xpointer="xpointer(//*[@os='l'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -70,15 +82,15 @@
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='n'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='o'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/vim.xml"
-    xpointer="xpointer(//*[@os='n'])"/>
+    xpointer="xpointer(//*[@os='p'])"/>
 
   </sect2>
 

Modified: trunk/BOOK/introduction/common/changelog.xml
===================================================================
--- trunk/BOOK/introduction/common/changelog.xml	2006-05-11 23:13:08 UTC (rev 1562)
+++ trunk/BOOK/introduction/common/changelog.xml	2006-05-11 23:13:21 UTC (rev 1563)
@@ -42,6 +42,9 @@
         <listitem>
           <para>[jim] - Updated Linux and Linux Headers to 2.6.16.16.</para>
         </listitem>
+        <listitem>
+          <para>[jim] - Add Vim 7.0 Upstream Patches.</para>
+        </listitem>
       </itemizedlist>
     </listitem>
 

Modified: trunk/BOOK/materials/common/patches.xml
===================================================================
--- trunk/BOOK/materials/common/patches.xml	2006-05-11 23:13:08 UTC (rev 1562)
+++ trunk/BOOK/materials/common/patches.xml	2006-05-11 23:13:21 UTC (rev 1563)
@@ -240,6 +240,14 @@
     </varlistentry>
 
     <varlistentry>
+      <term>Vim Fixes Patch - 8.5 KB:</term>
+      <listitem>
+        <para><ulink
+        url="&patches-root;vim/&vim-fixes-patch;"/></para>
+      </listitem>
+    </varlistentry>
+
+    <varlistentry>
       <term>Zlib fPIC Patch - 3.2 KB:</term> <listitem>
         <para><ulink
         url="&patches-root;zlib/&zlib-fpic-patch;"/></para>

Modified: trunk/BOOK/patches.ent
===================================================================
--- trunk/BOOK/patches.ent	2006-05-11 23:13:08 UTC (rev 1562)
+++ trunk/BOOK/patches.ent	2006-05-11 23:13:21 UTC (rev 1563)
@@ -52,7 +52,7 @@
 <!ENTITY util-linux-cramfs-patch "util-linux-&util-linux-version;-cramfs-1.patch">
 <!ENTITY util-linux-gcc4_fixes-patch "util-linux-&util-linux-version;-gcc4_fixes-1.patch">
 
-<!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch">
+<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-1.patch">
 
 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
 




More information about the cross-lfs mailing list