aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-02 05:04:20 -04:00
Code Activity

patch 8.1.1468: the generated desktop files may be invalid

Browse Source 
Problem:    The generated desktop files may be invalid.
Solution:   Check validity with desktop-file-validate. (Christian Brabandt,
            Will Thompson, closes #4480)
This commit is contained in:
Bram Moolenaar
2019-06-05 21:25:34 +02:00
parent d6ec1730ba
commit d0380dc782
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/po/Makefile
View File

@@ -151,7 +151,7 @@ prefixcheck:
clean: checkclean clean: checkclean
rm -f core core.* *.old.po *.mo *.pot sjiscorr 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 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) vim.desktop: vim.desktop.in $(POFILES)
@echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS @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 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) gvim.desktop: gvim.desktop.in $(POFILES)
@echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS @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 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) update-po: $(LANGUAGES)

2
src/version.c
View File

@@ -767,6 +767,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1468,
/**/ /**/
1467, 1467,
/**/ /**/