On Do, 06 Jun 2019, Mike Williams wrote:
> The desktop file still seems valid apart from encoding errors. Is there
> a problem if the makefile ignored the error and continued? Or have a
The problem is, we might not notice failures :(
> build option to allow ignoring errors generating desktop files? Just a
> wild thought.
I think for fixing your local environment, the best is to commit a local
patch like below, that should just ignore the error. Granted, that would
install a probably invalid desktop file, but that happened before as
well (and it seemed nobody noticed since the desktop files are generated
from the po files directly (8.1.1147)).
Well, at least Debian and Ubuntu do not offer official packages newer
than 8.1.0875, in case of Debian this is probably due to the buster
freeze).
That patch could be stashed on top, or just kept around in your local
repository, shouldn't really matter.
diff --git a/src/po/Makefile b/src/po/Makefile
index 8c7066b64..dcf88ab19 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -169,14 +169,14 @@ 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
+ -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 tmp_gvim.desktop
rm -f LINGUAS
- if command -v desktop-file-validate; then desktop-file-validate
tmp_gvim.desktop; fi
+ -if command -v desktop-file-validate; then desktop-file-validate
tmp_gvim.desktop; fi
mv tmp_gvim.desktop gvim.desktop
update-po: $(LANGUAGES)
Best,
Christian
--
Eine Frau heiratet einen Mann in der Erwartung, daß er sich ändert,
aber er ändert sich nicht.
Ein Mann heiratet eine Frau in der Erwartung, daß sie sich nicht
ändert - doch sie tut es.
--
--
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/20190606172222.GP23877%40256bit.org.
For more options, visit https://groups.google.com/d/optout.
