[oe-commits] Paul Barker : vim: Upgrade to v7.4.258

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: 30c9cf0f2ca191caf8a1f66851ccf3dac7553c39
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=30c9cf0f2ca191caf8a1f66851ccf3dac7553c39

Author: Paul Barker <paul at paulbarker.me.uk>
Date:   Sat Apr 12 20:14:09 2014 +0100

vim: Upgrade to v7.4.258

The patch against configure.in was resubmitted to the vim mailing list and was
merged into the upstream sources so is no longer needed.

Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../vim/files/configure.in_remove_CC_quotes.patch       | 17 -----------------
 .../vim/{vim_7.4.155.bb => vim_7.4.258.bb}              |  5 ++---
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch b/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch
deleted file mode 100644
index c8cfe8e..0000000
--- a/meta-oe/recipes-support/vim/files/configure.in_remove_CC_quotes.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-upstream: http://groups.google.com/group/vim_dev/browse_thread/thread/5685c3b859e3c793# 
-status: reported upstream
---- vim72-orig/src/configure.in	2010-09-29 19:13:33.000000000 +0200
-+++ vim72/src/configure.in	2010-09-29 19:17:07.000000000 +0200
-@@ -35,10 +35,10 @@
- fi
- if test "$GCC" = yes; then
-   dnl method that should work for nearly all versions
--  gccversion=`"$CC" -dumpversion`
-+  gccversion=`$CC -dumpversion`
-   if test "x$gccversion" = "x"; then
-     dnl old method; fall-back for when -dumpversion doesn't work
--    gccversion=`"$CC" --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
-+    gccversion=`$CC --version | sed -e '2,$d' -e 's/darwin.//' -e 's/^[[^0-9]]*\([[0-9]]\.[[0-9.]]*\).*$/\1/g'`
-   fi
-   dnl version 4.0.1 was reported to cause trouble on Macintosh by Marcin Dalecki
-   if test "$gccversion" = "3.0.1" -o "$gccversion" = "3.0.2" -o "$gccversion" = "4.0.1"; then
diff --git a/meta-oe/recipes-support/vim/vim_7.4.155.bb b/meta-oe/recipes-support/vim/vim_7.4.258.bb
similarity index 96%
rename from meta-oe/recipes-support/vim/vim_7.4.155.bb
rename to meta-oe/recipes-support/vim/vim_7.4.258.bb
index 0d98e7a..878c79e 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.155.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.258.bb
@@ -6,9 +6,8 @@ RSUGGESTS_${PN} = "diffutils"
 LICENSE = "vim"
 LIC_FILES_CHKSUM = "file://../runtime/doc/uganda.txt;md5=b779e18be6ed77facc770691c967b8f8"
 
-SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim \
-	   file://configure.in_remove_CC_quotes.patch;patchdir=.."
-SRCREV = "v7-4-155"
+SRC_URI = "hg://vim.googlecode.com/hg/;protocol=https;module=vim"
+SRCREV = "v7-4-258"
 
 S = "${WORKDIR}/${PN}/src"