To: vim_dev@googlegroups.com Subject: Patch 7.4.1772 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1772 (after 7.4.1767) Problem: Installation fails when $GTK_UPDATE_ICON_CACHE is empty. Solution: Add quotes. (Kazunobu Kuriyama) Files: src/Makefile *** ../vim-7.4.1771/src/Makefile 2016-04-21 18:20:03.654235895 +0200 --- src/Makefile 2016-04-22 10:11:09.981612994 +0200 *************** *** 2363,2369 **** if test -d $(ICON48PATH) -a -w $(ICON48PATH) \ -a ! -f $(ICON48PATH)/gvim.png; then \ $(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \ ! if test -z "$(DESTDIR)" -a -x $(GTK_UPDATE_ICON_CACHE) \ -a -w $(ICONTHEMEPATH) \ -a -f $(ICONTHEMEPATH)/index.theme; then \ $(GTK_UPDATE_ICON_CACHE) -q $(ICONTHEMEPATH); \ --- 2363,2369 ---- if test -d $(ICON48PATH) -a -w $(ICON48PATH) \ -a ! -f $(ICON48PATH)/gvim.png; then \ $(INSTALL_DATA) $(SCRIPTSOURCE)/vim48x48.png $(ICON48PATH)/gvim.png; \ ! if test -z "$(DESTDIR)" -a -x "$(GTK_UPDATE_ICON_CACHE)" \ -a -w $(ICONTHEMEPATH) \ -a -f $(ICONTHEMEPATH)/index.theme; then \ $(GTK_UPDATE_ICON_CACHE) -q $(ICONTHEMEPATH); \ *************** *** 2381,2387 **** $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \ $(SCRIPTSOURCE)/gvim.desktop \ $(DESKTOPPATH); \ ! if test -z "$(DESTDIR)" -a -x $(UPDATE_DESKTOP_DATABASE); then \ $(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \ fi \ fi --- 2381,2387 ---- $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \ $(SCRIPTSOURCE)/gvim.desktop \ $(DESKTOPPATH); \ ! if test -z "$(DESTDIR)" -a -x "$(UPDATE_DESKTOP_DATABASE)"; then \ $(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \ fi \ fi *** ../vim-7.4.1771/src/version.c 2016-04-22 10:00:31.888192784 +0200 --- src/version.c 2016-04-22 10:12:44.240640493 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1772, /**/ -- ARTHUR: I am your king! WOMAN: Well, I didn't vote for you. ARTHUR: You don't vote for kings. WOMAN: Well, 'ow did you become king then? The Quest for the Holy Grail (Monty Python) /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///