diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-05 21:25:34 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-05 21:25:34 +0200 |
| commit | d0380dc7820828cb7faa06138d4e86a63c1d755d (patch) | |
| tree | ff8d0b96a71a567cc954bdba58c4de9c95136fbc | |
| parent | d6ec1730bab0ef4a472637ffe5796d1351442308 (diff) | |
patch 8.1.1468: the generated desktop files may be invalidv8.1.1468
Problem: The generated desktop files may be invalid.
Solution: Check validity with desktop-file-validate. (Christian Brabandt,
Will Thompson, closes #4480)
| -rw-r--r-- | src/po/Makefile | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/po/Makefile b/src/po/Makefile index 6049b497ea..8c7066b64c 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -151,7 +151,7 @@ prefixcheck: clean: checkclean rm -f core core.* *.old.po *.mo *.pot sjiscorr - rm -f LINGUAS vim.desktop gvim.desktop + rm -f LINGUAS vim.desktop gvim.desktop tmp_*desktop distclean: clean @@ -167,13 +167,17 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../GvimExt/gvimext.cpp ../globals.h ../if_p vim.desktop: vim.desktop.in $(POFILES) @echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS - $(MSGFMT) --desktop -d . --template vim.desktop.in -o vim.desktop + $(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 - $(MSGFMT) --desktop -d . --template gvim.desktop.in -o gvim.desktop + $(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 update-po: $(LANGUAGES) diff --git a/src/version.c b/src/version.c index de5e0abbb4..443a114a8f 100644 --- a/src/version.c +++ b/src/version.c @@ -768,6 +768,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1468, +/**/ 1467, /**/ 1466, |