mirror of
https://git.yoctoproject.org/poky
synced 2026-03-02 05:19:40 +01:00
94483d6607
There's a fairly constant flow of CVEs being fixed in Vim, which are getting increasing non-trivial to backport. Instead of trying to backport (and potentially introduce more bugs), or just ignoring them entirely, upgrade vim to the latest patch in the hope that vim 8.3 will be released before we release Kirkstone. (From OE-Core rev: c987c75ca06c67b6055c50a9fb29e4fd24aceffc) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 78a4796de27d710f97c336d288d797557a58694e) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
The creation of the LINGUAS file is duplicated for each desktop file
|
|
which can lead the commands to race against each other. Rework
|
|
the makefile to avoid this as the expense of leaving the file on disk.
|
|
|
|
Upstream-Status: Pending
|
|
RP 2021/2/15
|
|
|
|
Index: git/src/po/Makefile
|
|
===================================================================
|
|
--- git.orig/src/po/Makefile
|
|
+++ git/src/po/Makefile
|
|
@@ -207,17 +207,16 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM
|
|
# Delete the temporary files
|
|
rm *.js
|
|
|
|
-vim.desktop: vim.desktop.in $(POFILES)
|
|
+LINGUAS:
|
|
echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
|
|
+
|
|
+vim.desktop: vim.desktop.in $(POFILES) LINGUAS
|
|
$(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop
|
|
- rm -f LINGUAS
|
|
if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi
|
|
mv tmp_vim.desktop vim.desktop
|
|
|
|
-gvim.desktop: gvim.desktop.in $(POFILES)
|
|
- echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
|
|
+gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS
|
|
$(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop
|
|
- rm -f LINGUAS
|
|
if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi
|
|
mv tmp_gvim.desktop gvim.desktop
|
|
|