From ed8ff7de8c19e5a71e849864080c7aa2b1abb4d3 Mon Sep 17 00:00:00 2001
From: Matthew Burgess <matthew@linuxfromscratch.org>
Date: Tue, 20 Apr 2010 19:59:37 +0000
Subject: [PATCH] Remove the Vim fixes patch. Fixes #2597.

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9245 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
---
 chapter01/changelog.xml | 11 +++++++++++
 chapter01/whatsnew.xml  |  3 +++
 chapter03/patches.xml   | 16 ----------------
 chapter06/vim.xml       | 14 --------------
 general.ent             |  4 ++--
 patches.ent             |  8 --------
 6 files changed, 16 insertions(+), 40 deletions(-)

diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4ec3dde31..2c78d847f 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -36,6 +36,17 @@
     </listitem>
 
 -->
+    <listitem>
+      <para>2010-04-20</para>
+      <itemizedlist>
+        <listitem>
+          <para>[matthew] Remove the Vim fixes patch as it is out of date and
+          looks to be applying fixes still in upstream's development cycle.
+          Fixes <ulink url="&lfs-ticket-root;2597">#2597</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>2010-04-12</para>
       <itemizedlist>
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 5fa072780..47613d369 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -222,6 +222,9 @@
     <listitem>
       <para>grep-2.5.4-debian_fixes-1.patch</para>
     </listitem>
+    <listitem>
+      <para>vim-7.2-fixes-5.patch</para>
+    </listitem>
   </itemizedlist>
 
 </sect1>
diff --git a/chapter03/patches.xml b/chapter03/patches.xml
index 35e55b762..6adf19b9a 100644
--- a/chapter03/patches.xml
+++ b/chapter03/patches.xml
@@ -171,22 +171,6 @@
       </listitem>
     </varlistentry> -->
 
-    <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>
-        <para>MD5 sum: <literal>&vim-mandir-patch-md5;</literal></para>
-      </listitem>
-    </varlistentry> -->
-
     <!--<varlistentry>
       <term>Zlib fPIC Patch - <token>&zlib-fpic-patch-size;</token>:</term>
       <listitem>
diff --git a/chapter06/vim.xml b/chapter06/vim.xml
index 2132424bb..cd3a441ba 100644
--- a/chapter06/vim.xml
+++ b/chapter06/vim.xml
@@ -54,20 +54,6 @@
     <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 remap="pre">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
-    ultimately allows Man-DB to transcode the page into the desired format
-    at run-time:</para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../&vim-mandir-patch;</userinput></screen>
--->
     <para>Change the default location of the
     <filename>vimrc</filename> configuration file to <filename
     class="directory">/etc</filename>:</para>
diff --git a/general.ent b/general.ent
index 519fe7d1b..947eb6ba4 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20100412">
-<!ENTITY releasedate "April 12, 2010">
+<!ENTITY version "SVN-20100420">
+<!ENTITY releasedate "April 20, 2010">
 <!ENTITY copyrightdate "1999-2010"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "6.7">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/patches.ent b/patches.ent
index faae4a110..8e75053dc 100644
--- a/patches.ent
+++ b/patches.ent
@@ -85,14 +85,6 @@
 <!ENTITY shadow-useradd-patch-size "6.1 KB"> -->
 
 
-<!ENTITY vim-fixes-patch "vim-&vim-version;-fixes-5.patch">
-<!ENTITY vim-fixes-patch-md5 "3af30a47fbf94d141c4317bf87d28e25">
-<!ENTITY vim-fixes-patch-size "826 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"> -->
-
 <!ENTITY zlib-fpic-patch "zlib-&zlib-version;-fPIC-1.patch">
 <!ENTITY zlib-fpic-patch-md5 "545d60b20bfde6f53023de44438cef59">
 <!ENTITY zlib-fpic-patch-size "21 KB">