From 38f3d1749b762bebad3a04d2d324ac2b3b064315 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 29 Jun 2022 14:15:11 +0100
Subject: vim: 8.2.5083 -> 9.0.0005

The license checksum changed due to a major version change in the referenced file.

(From OE-Core rev: 89f34d8aa4f4572d048dbb732ca4c83d443157fb)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-support/vim/vim-tiny_8.2.bb | 12 ------------
 meta/recipes-support/vim/vim-tiny_9.0.bb | 12 ++++++++++++
 meta/recipes-support/vim/vim.inc         |  6 +++---
 meta/recipes-support/vim/vim_8.2.bb      | 23 -----------------------
 meta/recipes-support/vim/vim_9.0.bb      | 23 +++++++++++++++++++++++
 5 files changed, 38 insertions(+), 38 deletions(-)
 delete mode 100644 meta/recipes-support/vim/vim-tiny_8.2.bb
 create mode 100644 meta/recipes-support/vim/vim-tiny_9.0.bb
 delete mode 100644 meta/recipes-support/vim/vim_8.2.bb
 create mode 100644 meta/recipes-support/vim/vim_9.0.bb

(limited to 'meta/recipes-support/vim')

diff --git a/meta/recipes-support/vim/vim-tiny_8.2.bb b/meta/recipes-support/vim/vim-tiny_8.2.bb
deleted file mode 100644
index e4c26d23f6..0000000000
--- a/meta/recipes-support/vim/vim-tiny_8.2.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require vim.inc
-
-SUMMARY += " (with tiny features)"
-
-PACKAGECONFIG += "tiny"
-
-do_install() {
-    install -D -m 0755 ${S}/src/vim ${D}/${bindir}/vim.tiny
-}
-
-ALTERNATIVE_PRIORITY = "90"
-ALTERNATIVE_TARGET = "${bindir}/vim.tiny"
diff --git a/meta/recipes-support/vim/vim-tiny_9.0.bb b/meta/recipes-support/vim/vim-tiny_9.0.bb
new file mode 100644
index 0000000000..e4c26d23f6
--- /dev/null
+++ b/meta/recipes-support/vim/vim-tiny_9.0.bb
@@ -0,0 +1,12 @@
+require vim.inc
+
+SUMMARY += " (with tiny features)"
+
+PACKAGECONFIG += "tiny"
+
+do_install() {
+    install -D -m 0755 ${S}/src/vim ${D}/${bindir}/vim.tiny
+}
+
+ALTERNATIVE_PRIORITY = "90"
+ALTERNATIVE_TARGET = "${bindir}/vim.tiny"
diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc
index 06707dbe11..b85f34d6c8 100644
--- a/meta/recipes-support/vim/vim.inc
+++ b/meta/recipes-support/vim/vim.inc
@@ -11,7 +11,7 @@ RSUGGESTS:${PN} = "diffutils"
 
 LICENSE = "Vim"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=6b30ea4fa660c483b619924bc709ef99 \
-                    file://runtime/doc/uganda.txt;md5=daf48235bb824c77fe8ae88d5f575f74"
+                    file://runtime/doc/uganda.txt;md5=001ef779f422a0e9106d428c84495b4d"
 
 SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://disable_acl_header_check.patch \
@@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \
            file://racefix.patch \
            "
 
-PV .= ".5083"
-SRCREV = "db77c49401145d76441fbb3d22a1d7d987681c13"
+PV .= ".0005"
+SRCREV = "040674129f3382822eeb7b590380efa5228124a8"
 
 # Remove when 8.3 is out
 UPSTREAM_VERSION_UNKNOWN = "1"
diff --git a/meta/recipes-support/vim/vim_8.2.bb b/meta/recipes-support/vim/vim_8.2.bb
deleted file mode 100644
index fee9f055e9..0000000000
--- a/meta/recipes-support/vim/vim_8.2.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-require vim.inc
-
-PROVIDES = "xxd"
-
-RDEPENDS:${PN} = "ncurses-terminfo-base ${PN}-xxd"
-# Recommend that runtime data is installed along with vim
-RRECOMMENDS:${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
-
-PACKAGECONFIG:class-native = ""
-BBCLASSEXTEND = "native nativesdk"
-
-PACKAGES =+ "${PN}-xxd"
-FILES:${PN}-xxd = "${bindir}/xxd"
-RPROVIDES:${PN}-xxd = "xxd"
-
-ALTERNATIVE:${PN}-xxd = "xxd"
-ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
-ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
-
-# We override the default in security_flags.inc because vim (not vim-tiny!) will abort
-# in many places for _FORTIFY_SOURCE=2.  Security flags become part of CC.
-#
-lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=1',d)}"
diff --git a/meta/recipes-support/vim/vim_9.0.bb b/meta/recipes-support/vim/vim_9.0.bb
new file mode 100644
index 0000000000..fee9f055e9
--- /dev/null
+++ b/meta/recipes-support/vim/vim_9.0.bb
@@ -0,0 +1,23 @@
+require vim.inc
+
+PROVIDES = "xxd"
+
+RDEPENDS:${PN} = "ncurses-terminfo-base ${PN}-xxd"
+# Recommend that runtime data is installed along with vim
+RRECOMMENDS:${PN} = "${PN}-syntax ${PN}-help ${PN}-tutor ${PN}-vimrc ${PN}-common"
+
+PACKAGECONFIG:class-native = ""
+BBCLASSEXTEND = "native nativesdk"
+
+PACKAGES =+ "${PN}-xxd"
+FILES:${PN}-xxd = "${bindir}/xxd"
+RPROVIDES:${PN}-xxd = "xxd"
+
+ALTERNATIVE:${PN}-xxd = "xxd"
+ALTERNATIVE_TARGET[xxd] = "${bindir}/xxd"
+ALTERNATIVE_LINK_NAME[xxd] = "${bindir}/xxd"
+
+# We override the default in security_flags.inc because vim (not vim-tiny!) will abort
+# in many places for _FORTIFY_SOURCE=2.  Security flags become part of CC.
+#
+lcl_maybe_fortify = "${@oe.utils.conditional('DEBUG_BUILD','1','','-D_FORTIFY_SOURCE=1',d)}"
-- 
cgit v1.2.3-54-g00ecf