On Fr, 07 Jun 2019, Bram Moolenaar wrote: > Since there are the .desktop files in the distribution, best would be to > just keep these, instead of building a new one. So we try to build a > fresh version, but if it fails then we don't put the broken one over an > older but working one.
So how about the attached patch then? Best, Christian -- Letzte Worte eines Handgranatenwerfers: "Bis wieviel sagten Sie soll ich zählen?" -- -- You received this message from the "vim_dev" maillist. Do not top-post! Type your reply below the text you are replying to. For more information, visit http://www.vim.org/maillist.php --- You received this message because you are subscribed to the Google Groups "vim_dev" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/vim_dev/20190607114025.GV23877%40256bit.org. For more options, visit https://groups.google.com/d/optout.
From 7bc48cc28a92baa812518f8fff185b80f63f051e Mon Sep 17 00:00:00 2001 From: "C.Brabandt" <[email protected]> Date: Fri, 7 Jun 2019 07:31:51 -0400 Subject: [PATCH] desktop: ignore errors from desktop-file-validate Since Ubuntus msgfmt is known to be buggy in version 0.19.7 (in the 1604 LTS distribution), ignore the error and use the distributed desktop file from Vims runtime directory. However there is one exception: when run under Travis (from the regular CI runs triggered by github), do not skip the errors from desktop-file-validate and abort the build step, since the msgfmt that is installed within Travis CI is known to behave correctly Travis sets $CI=true, so use this environment variable to detect how to handle the error. --- src/po/Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/po/Makefile b/src/po/Makefile index 8c7066b..a6e23a4 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -169,14 +169,28 @@ vim.desktop: vim.desktop.in $(POFILES) @echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > 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 + # ignore errors from desktop-file-validate, unless running in Travis CI + if command -v desktop-file-validate; \ + then ( desktop-file-validate tmp_vim.desktop || \ + { test -z "$$CI" && \ + echo "Ignoring previous error" && \ + cp ../../runtime/vim.desktop 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 tmp_gvim.desktop rm -f LINGUAS - if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi + # ignore errors from desktop-file-validate, unless running in Travis CI + if command -v desktop-file-validate; \ + then ( desktop-file-validate tmp_gvim.desktop || \ + { test -z "$$CI" && \ + echo "Ignoring previous error" && \ + cp ../../runtime/gvim.desktop tmp_gvim.desktop; \ + } ) \ + fi mv tmp_gvim.desktop gvim.desktop update-po: $(LANGUAGES) -- 2.7.4
