Patch 7.4.1767
Problem: When installing Vim on a GTK system the icon cache is not updated.
Solution: Update the GTK icon cache when possible. (Kazunobu Kuriyama)
Files: src/Makefile, src/configure.in, src/config.mk.in,
src/auto/configure
*** ../vim-7.4.1766/src/Makefile 2016-04-14 16:45:59.078193218 +0200
--- src/Makefile 2016-04-21 18:12:51.566734045 +0200
***************
*** 1977,1983 ****
test_listlbr_utf8 \
test_mapping \
test_marks \
- test_match_conceal \
test_nested_function \
test_options \
test_ruby \
--- 1977,1982 ----
***************
*** 2013,2023 ****
--- 2012,2025 ----
test_delete \
test_ex_undo \
test_expand \
+ test_expand_dllpath \
test_expr \
+ test_expr_utf8 \
test_feedkeys \
test_file_perm \
test_fnamemodify \
test_glob2regpat \
+ test_goto \
test_hardcopy \
test_help_tagjump \
test_history \
***************
*** 2026,2033 ****
--- 2028,2038 ----
test_json \
test_langmap \
test_lispwords \
+ test_matchadd_conceal \
+ test_matchadd_conceal_utf8 \
test_matchstrpos \
test_menu \
+ test_messages \
test_packadd \
test_partial \
test_perl \
***************
*** 2042,2047 ****
--- 2047,2053 ----
test_syn_attr \
test_syntax \
test_tabline \
+ test_tagjump \
test_timers \
test_undolevels \
test_unlet \
***************
*** 2350,2361 ****
--- 2356,2373 ----
ICON48PATH = $(DESTDIR)$(DATADIR)/icons/hicolor/48x48/apps
ICON32PATH = $(DESTDIR)$(DATADIR)/icons/locolor/32x32/apps
ICON16PATH = $(DESTDIR)$(DATADIR)/icons/locolor/16x16/apps
+ ICONTHEMEPATH = $(DATADIR)/icons/hicolor
DESKTOPPATH = $(DESTDIR)$(DATADIR)/applications
KDEPATH = $(HOME)/.kde/share/icons
install-icons:
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); \
+ fi \
fi
if test -d $(ICON32PATH) -a -w $(ICON32PATH) \
-a ! -f $(ICON32PATH)/gvim.png; then \
***************
*** 2369,2374 ****
--- 2381,2389 ----
$(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
$(HELPSOURCE)/vim.1 $(MACROSOURCE) $(TOOLSSOURCE):
*** ../vim-7.4.1766/src/configure.in 2016-04-14 16:45:59.074193261 +0200
--- src/configure.in 2016-04-21 18:09:46.652648782 +0200
***************
*** 2688,2697 ****
--- 2688,2729 ----
else
AC_MSG_RESULT([cannot obtain from pkg_config.])
fi
+
+ AC_MSG_CHECKING([--disable-icon-cache-update argument])
+ AC_ARG_ENABLE(icon_cache_update,
+ [ --disable-icon-cache-update update disabled],
+ [],
+ [enable_icon_cache_update="yes"])
+ if test "$enable_icon_cache_update" = "yes"; then
+ AC_MSG_RESULT([not set])
+ AC_PATH_PROG(GTK_UPDATE_ICON_CACHE,[gtk-update-icon-cache],no)
+ if test "x$GTK_UPDATE_ICON_CACHE" = "xno" ; then
+ AC_MSG_RESULT([not found in PATH.])
+ fi
+ else
+ AC_MSG_RESULT([update disabled])
+ fi
+
+ AC_MSG_CHECKING([--disable-desktop-database-update argument])
+ AC_ARG_ENABLE(desktop_database_update,
+ [ --disable-desktop-database-update update disabled],
+ [],
+ [enable_desktop_database_update="yes"])
+ if test "$enable_desktop_database_update" = "yes"; then
+ AC_MSG_RESULT([not set])
+ AC_PATH_PROG(UPDATE_DESKTOP_DATABASE,[update-desktop-database],no)
+ if test "x$UPDATE_DESKTOP_DATABASE" = "xno" ; then
+ AC_MSG_RESULT([not found in PATH.])
+ fi
+ else
+ AC_MSG_RESULT([update disabled])
+ fi
fi
AC_SUBST(GLIB_COMPILE_RESOURCES)
AC_SUBST(GRESOURCE_SRC)
AC_SUBST(GRESOURCE_OBJ)
+ AC_SUBST(GTK_UPDATE_ICON_CACHE)
+ AC_SUBST(UPDATE_DESKTOP_DATABASE)
dnl Check for Motif include files location.
dnl The LAST one found is used, this makes the highest version to be used,
*** ../vim-7.4.1766/src/config.mk.in 2016-04-14 16:45:59.078193218 +0200
--- src/config.mk.in 2016-04-21 18:09:46.652648782 +0200
***************
*** 162,167 ****
--- 162,170 ----
GRESOURCE_SRC = @GRESOURCE_SRC@
GRESOURCE_OBJ = @GRESOURCE_OBJ@
+ GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
+ UPDATE_DESKTOP_DATABASE = @UPDATE_DESKTOP_DATABASE@
+
### Any OS dependent extra source and object file
OS_EXTRA_SRC = @OS_EXTRA_SRC@
OS_EXTRA_OBJ = @OS_EXTRA_OBJ@
*** ../vim-7.4.1766/src/auto/configure 2016-04-14 16:45:59.078193218 +0200
--- src/auto/configure 2016-04-21 18:14:01.242012734 +0200
***************
*** 638,643 ****
--- 638,645 ----
MOTIF_LIBNAME
GRESOURCE_OBJ
GRESOURCE_SRC
+ UPDATE_DESKTOP_DATABASE
+ GTK_UPDATE_ICON_CACHE
GLIB_COMPILE_RESOURCES
GNOME_INCLUDEDIR
GNOME_LIBDIR
***************
*** 828,833 ****
--- 830,837 ----
with_gnome_includes
with_gnome_libs
with_gnome
+ enable_icon_cache_update
+ enable_desktop_database_update
with_motif_lib
with_tlib
enable_largefile
***************
*** 1488,1493 ****
--- 1492,1499 ----
--enable-nextaw-check If auto-select GUI, check for neXtaw default=yes
--enable-carbon-check If auto-select GUI, check for Carbon default=yes
--disable-gtktest Do not try to compile and run a test GTK program
+ --disable-icon-cache-update update disabled
+ --disable-desktop-database-update update disabled
--disable-largefile omit support for large files
--disable-acl Don't check for ACL support.
--disable-gpm Don't use gpm (Linux mouse daemon).
***************
*** 9351,9358 ****
--- 9357,9490 ----
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot obtain from
pkg_config." >&5
$as_echo "cannot obtain from pkg_config." >&6; }
fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking
--disable-icon-cache-update argument" >&5
+ $as_echo_n "checking --disable-icon-cache-update argument... " >&6; }
+ # Check whether --enable-icon_cache_update was given.
+ if test "${enable_icon_cache_update+set}" = set; then :
+ enableval=$enable_icon_cache_update;
+ else
+ enable_icon_cache_update="yes"
+ fi
+
+ if test "$enable_icon_cache_update" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+ $as_echo "not set" >&6; }
+ # Extract the first word of "gtk-update-icon-cache", so it can be a
program name with args.
+ set dummy gtk-update-icon-cache; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if ${ac_cv_path_GTK_UPDATE_ICON_CACHE+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GTK_UPDATE_ICON_CACHE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_GTK_UPDATE_ICON_CACHE="$GTK_UPDATE_ICON_CACHE" # Let the user
override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_GTK_UPDATE_ICON_CACHE="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found
$as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GTK_UPDATE_ICON_CACHE" &&
ac_cv_path_GTK_UPDATE_ICON_CACHE="no"
+ ;;
+ esac
+ fi
+ GTK_UPDATE_ICON_CACHE=$ac_cv_path_GTK_UPDATE_ICON_CACHE
+ if test -n "$GTK_UPDATE_ICON_CACHE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_UPDATE_ICON_CACHE" >&5
+ $as_echo "$GTK_UPDATE_ICON_CACHE" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test "x$GTK_UPDATE_ICON_CACHE" = "xno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5
+ $as_echo "not found in PATH." >&6; }
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5
+ $as_echo "update disabled" >&6; }
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking
--disable-desktop-database-update argument" >&5
+ $as_echo_n "checking --disable-desktop-database-update argument... " >&6; }
+ # Check whether --enable-desktop_database_update was given.
+ if test "${enable_desktop_database_update+set}" = set; then :
+ enableval=$enable_desktop_database_update;
+ else
+ enable_desktop_database_update="yes"
fi
+ if test "$enable_desktop_database_update" = "yes"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5
+ $as_echo "not set" >&6; }
+ # Extract the first word of "update-desktop-database", so it can be a
program name with args.
+ set dummy update-desktop-database; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if ${ac_cv_path_UPDATE_DESKTOP_DATABASE+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $UPDATE_DESKTOP_DATABASE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_UPDATE_DESKTOP_DATABASE="$UPDATE_DESKTOP_DATABASE" # Let the
user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_UPDATE_DESKTOP_DATABASE="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found
$as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_UPDATE_DESKTOP_DATABASE" &&
ac_cv_path_UPDATE_DESKTOP_DATABASE="no"
+ ;;
+ esac
+ fi
+ UPDATE_DESKTOP_DATABASE=$ac_cv_path_UPDATE_DESKTOP_DATABASE
+ if test -n "$UPDATE_DESKTOP_DATABASE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UPDATE_DESKTOP_DATABASE"
>&5
+ $as_echo "$UPDATE_DESKTOP_DATABASE" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test "x$UPDATE_DESKTOP_DATABASE" = "xno" ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found in PATH." >&5
+ $as_echo "not found in PATH." >&6; }
+ fi
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: update disabled" >&5
+ $as_echo "update disabled" >&6; }
+ fi
+ fi
+
+
+
*** ../vim-7.4.1766/src/version.c 2016-04-21 14:34:46.940894155 +0200
--- src/version.c 2016-04-21 18:18:51.186996421 +0200
***************
*** 750,751 ****
--- 750,753 ----
{ /* Add new patch number below this line */
+ /**/
+ 1767,
/**/
--
Witches prefer brooms: vacuum-cleaners need extension cords!
/// Bram Moolenaar -- [email protected] -- 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 ///
--
--
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].
For more options, visit https://groups.google.com/d/optout.
