aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Burgess <matthew@linuxfromscratch.org>2007-06-30 15:33:35 +0000
committerMatthew Burgess <matthew@linuxfromscratch.org>2007-06-30 15:33:35 +0000
commitead6e7a856acbde25015b4ec22f455c91188d88d (patch)
treed9a4186b035b875bd11bd965354807e2e89b5ef2
parent25048ce792c5638a13b62094ea4138727ddc079a (diff)
Apply some upstream fixes to Vim.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@8184 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml3
-rw-r--r--chapter01/whatsnew.xml3
-rw-r--r--chapter03/patches.xml8
-rw-r--r--chapter06/vim.xml6
-rw-r--r--patches.ent4
5 files changed, 24 insertions, 0 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index a0ce76264..6f57bb63d 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -39,6 +39,9 @@
<para>2007-06-30</para>
<itemizedlist>
<listitem>
+ <para>[matthew] - Add upstream patches for Vim.</para>
+ </listitem>
+ <listitem>
<para>[matthew] - Upgrade to Udev-113, fixes
<ulink url="&lfs-ticket-root;2040">#2040</ulink>.</para>
</listitem>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 3884419f3..ba3c87db2 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -222,6 +222,9 @@
<listitem>
<para>&util-linux-lseek-patch;</para>
</listitem>
+ <listitem>
+ <para>&vim-fixes-patch;</para>
+ </listitem>
</itemizedlist>
<itemizedlist>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 7478f8d43..e05ab8bdd 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -253,6 +253,14 @@
<varlistentry>
+ <term>Vim Fixes Patch - <token>&vim-fixes-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink url="&patches-root;&vim-fixes-patch;"/></para>
+ <para>MD5 sum: <literal>&vim-fixes-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Vim Man Directories Patch - <token>&vim-mandir-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink url="&patches-root;&vim-mandir-patch;"/></para>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index af694562a..261ee0918 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -48,6 +48,12 @@
<filename>vim-&vim-version;-lang.tar.gz</filename> archives into the
same directory.</para>
+ <para>Apply a patch which fixes various issues already found and fixed by
+ the upstream maintainers since the inital release of Vim-&vim-version;:
+ </para>
+
+<screen><userinput>patch -Np1 -i ../&vim-fixes-patch;</userinput></screen>
+
<para>This version of Vim installs translated man pages and places
them into directories that will not be searched by Man-DB. Patch Vim
so that it installs its man pages into searchable directories and
diff --git a/patches.ent b/patches.ent
index 053300230..9f6342ed3 100644
--- a/patches.ent
+++ b/patches.ent
@@ -136,6 +136,10 @@
<!ENTITY util-linux-lseek-patch-md5 "5d6c86321c1ea74d7ed7cf57861da423">
<!ENTITY util-linux-lseek-patch-size "10 KB">
+<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-1.patch">
+<!ENTITY vim-fixes-patch-md5 "744bc215560d3fbe80bfef4bab270f9a">
+<!ENTITY vim-fixes-patch-size "19.6 KB">
+
<!ENTITY vim-mandir-patch "vim-&vim-version;-mandir-1.patch">
<!ENTITY vim-mandir-patch-md5 "b6426eb4192faba1e867ddd502323f5b">
<!ENTITY vim-mandir-patch-size "4.2 KB">