Changeset 6334994


Ignore:
Timestamp:
May 11, 2006, 3:56:28 PM (13 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
56102c2
Parents:
45c9bdd
Message:

r3392@server: jim | 2006-05-11 15:54:34 -0700
Added: Vim 7.0 Upstream Patches

Location:
BOOK
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • BOOK/final-system/common/vim.xml

    r45c9bdd r6334994  
    3636    <para os="a">First, unpack both <filename>vim-&vim-version;.tar.bz2</filename>
    3737    and (optionally) <filename>vim-&vim-version;-lang.tar.gz</filename>
    38     archives into the same directory. Then, change the default location of
     38    archives into the same directory.</para>
     39
     40    <para os="p1">The following patch contains updates from the maintainer. The
     41    maintainer of Vim only releases these patches to fix serious issues.</para>
     42
     43<screen os="p2"><userinput>patch -Np1 -i ../&vim-fixes-patch;</userinput></screen>
     44
     45    <para os="b">Change the default location of
    3946    the <filename>vimrc</filename> configuration file to <filename
    4047    class="directory">/etc</filename>:</para>
    4148
    42 <screen os="b"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
    43 
    44     <para os="c">Prepare Vim for compilation:</para>
    45 
    46 <screen os="d"><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
    47 
    48     <variablelist os="e">
     49<screen os="c"><userinput>echo '#define SYS_VIMRC_FILE "/etc/vimrc"' &gt;&gt; src/feature.h</userinput></screen>
     50
     51    <para os="d">Prepare Vim for compilation:</para>
     52
     53<screen os="e"><userinput>./configure --prefix=/usr --enable-multibyte</userinput></screen>
     54
     55    <variablelist os="f">
    4956      <title>The meaning of the configure options:</title>
    5057
     
    6370    </variablelist>
    6471
    65     <para os="f">Compile the package:</para>
    66 
    67 <screen os="g"><userinput>make</userinput></screen>
    68 
    69     <para os="h">To test the results, issue: <userinput>make test</userinput>.
     72    <para os="g">Compile the package:</para>
     73
     74<screen os="h"><userinput>make</userinput></screen>
     75
     76    <para os="i">To test the results, issue: <userinput>make test</userinput>.
    7077    However, this test suite outputs a lot of binary data to the
    7178    screen, which can cause issues with the settings of the current terminal.
    7279    This can be resolved by redirecting the output to a log file.</para>
    7380
    74     <para os="i">Install the package:</para>
    75 
    76 <screen os="j"><userinput>make install</userinput></screen>
     81    <para os="j">Install the package:</para>
     82
     83<screen os="k"><userinput>make install</userinput></screen>
    7784
    7885    <para os="l">Many users are used to using <command>vi</command> instead of
     
    8390<screen os="m"><userinput>ln -sv vim /usr/bin/vi</userinput></screen>
    8491
    85 <para os="m1">By default, Vim's documentation is installed in
     92<para os="n">By default, Vim's documentation is installed in
    8693<filename class="directory">/usr/share/vim</filename>.  The following symlink
    8794allows the documentation to be accessed via
     
    8996it consistent with the location of documentation for other packages:</para>
    9097
    91 <screen os="m2"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
    92 
    93     <para os="n">If an X Window System is going to be installed on the LFS
     98<screen os="o"><userinput>ln -sv ../vim/vim&vim-version2;/doc /usr/share/doc/vim-&vim-version;</userinput></screen>
     99
     100    <para os="p">If an X Window System is going to be installed on the LFS
    94101    system, it may be necessary to recompile Vim after installing X. Vim
    95102    comes with a GUI version of the editor that requires X and some
  • BOOK/final-system/multilib/vim.xml

    r45c9bdd r6334994  
    2828    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    2929    href="../common/vim.xml"
     30    xpointer="xpointer(//*[@os='p1'])"/>
     31
     32    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     33    href="../common/vim.xml"
     34    xpointer="xpointer(//*[@os='p2'])"/>
     35
     36    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     37    href="../common/vim.xml"
    3038    xpointer="xpointer(//*[@os='b'])"/>
    3139
     
    3442    xpointer="xpointer(//*[@os='c'])"/>
    3543
    36 <screen os="d"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
    37    --enable-multibyte</userinput></screen>
    38 
    3944    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    4045    href="../common/vim.xml"
    41     xpointer="xpointer(//*[@os='e'])"/>
     46    xpointer="xpointer(//*[@os='d'])"/>
     47
     48<screen os="e"><userinput>CC="gcc ${BUILD64}" CXX="g++ ${BUILD64}" ./configure --prefix=/usr \
     49   --enable-multibyte</userinput></screen>
    4250
    4351    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     
    6371    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    6472    href="../common/vim.xml"
     73    xpointer="xpointer(//*[@os='k'])"/>
     74
     75    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     76    href="../common/vim.xml"
    6577    xpointer="xpointer(//*[@os='l'])"/>
    6678
     
    7183    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7284    href="../common/vim.xml"
    73     xpointer="xpointer(//*[@os='m1'])"/>
     85    xpointer="xpointer(//*[@os='n'])"/>
    7486
    7587    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    7688    href="../common/vim.xml"
    77     xpointer="xpointer(//*[@os='m2'])"/>
     89    xpointer="xpointer(//*[@os='o'])"/>
    7890
    7991    <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
    8092    href="../common/vim.xml"
    81     xpointer="xpointer(//*[@os='n'])"/>
     93    xpointer="xpointer(//*[@os='p'])"/>
    8294
    8395  </sect2>
  • BOOK/introduction/common/changelog.xml

    r45c9bdd r6334994  
    4343          <para>[jim] - Updated Linux and Linux Headers to 2.6.16.16.</para>
    4444        </listitem>
     45        <listitem>
     46          <para>[jim] - Add Vim 7.0 Upstream Patches.</para>
     47        </listitem>
    4548      </itemizedlist>
    4649    </listitem>
  • BOOK/materials/common/patches.xml

    r45c9bdd r6334994  
    241241
    242242    <varlistentry>
     243      <term>Vim Fixes Patch - 8.5 KB:</term>
     244      <listitem>
     245        <para><ulink
     246        url="&patches-root;vim/&vim-fixes-patch;"/></para>
     247      </listitem>
     248    </varlistentry>
     249
     250    <varlistentry>
    243251      <term>Zlib fPIC Patch - 3.2 KB:</term> <listitem>
    244252        <para><ulink
  • BOOK/patches.ent

    r45c9bdd r6334994  
    5353<!ENTITY util-linux-gcc4_fixes-patch "util-linux-&util-linux-version;-gcc4_fixes-1.patch">
    5454
    55 <!ENTITY vim-security_fix-patch "vim-&vim-version;-security_fix-2.patch">
     55<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-1.patch">
    5656
    5757<!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
Note: See TracChangeset for help on using the changeset viewer.