diff options
author | Randy MacLeod <randy.macleod@windriver.com> | 2022-08-01 08:52:34 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-08-22 14:29:48 +0100 |
commit | ef2da8f28e54b306674e86e31ebca94ffc4bf50f (patch) | |
tree | 9f66fc463c406db62d130f961ba9c6b7a5cb570c /meta/recipes-support/vim/files/racefix.patch | |
parent | 5373e681cf22990ab780e4bce8f94138b6a3b551 (diff) | |
download | poky-ef2da8f28e54b306674e86e31ebca94ffc4bf50f.tar.gz |
vim: update from 9.0.0063 to 9.0.0115
Drop crosscompile.patch which was merged as part of:
509695c1c (tag: v9.0.0065) patch 9.0.0065: \
cross-compiling doesn't work because of timer_create check
Also drop: racefix.patch which may have been fixed upstream
and is being tracked by:
https://github.com/vim/vim/pull/10776
where upstream is asking if the different approach resolves the
race condition. Let's see what's out there!
(From OE-Core rev: 083d6de4139859a5eb66f78c2a62a1d59c8aee35)
Signed-off-by: Randy MacLeod <Randy.MacLeod@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 6996472cd33d2d4b91821f2dfe24a27a697e4afe)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/vim/files/racefix.patch')
-rw-r--r-- | meta/recipes-support/vim/files/racefix.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-support/vim/files/racefix.patch b/meta/recipes-support/vim/files/racefix.patch deleted file mode 100644 index 34bd37d650..0000000000 --- a/meta/recipes-support/vim/files/racefix.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | po/Makefile: Avoid race over LINGUAS file | ||
2 | |||
3 | The creation of the LINGUAS file is duplicated for each desktop file | ||
4 | which can lead the commands to race against each other. One target might | ||
5 | remove it before another has been able to use it. Rework the makefile to | ||
6 | avoid this as the expense of leaving the file on disk. | ||
7 | |||
8 | Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/vim/vim/pull/10776] | ||
11 | |||
12 | Index: git/src/po/Makefile | ||
13 | =================================================================== | ||
14 | --- git.orig/src/po/Makefile | ||
15 | +++ git/src/po/Makefile | ||
16 | @@ -207,17 +207,16 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM | ||
17 | # Delete the temporary files | ||
18 | rm *.js | ||
19 | |||
20 | -vim.desktop: vim.desktop.in $(POFILES) | ||
21 | +LINGUAS: | ||
22 | echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS | ||
23 | + | ||
24 | +vim.desktop: vim.desktop.in $(POFILES) LINGUAS | ||
25 | $(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop | ||
26 | - rm -f LINGUAS | ||
27 | if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi | ||
28 | mv tmp_vim.desktop vim.desktop | ||
29 | |||
30 | -gvim.desktop: gvim.desktop.in $(POFILES) | ||
31 | - echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS | ||
32 | +gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS | ||
33 | $(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop | ||
34 | - rm -f LINGUAS | ||
35 | if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi | ||
36 | mv tmp_gvim.desktop gvim.desktop | ||
37 | |||