Mercurial > vim
changeset 7471:c79a52efcf2f v7.4.1038
commit https://github.com/vim/vim/commit/d2e03f02c4a69d13bd90b5d084990bca95d0b0af
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jan 2 22:46:36 2016 +0100
patch 7.4.1038
Problem: Still get a warning for a deprecated function with gdk-pixbuf
2.31.
Solution: Change minimum minor version from 32 to 31.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 02 Jan 2016 23:00:04 +0100 |
| parents | d55a00611624 |
| children | 2d15db60f712 |
| files | src/auto/configure src/configure.in src/version.c |
| diffstat | 3 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -8919,7 +8919,7 @@ if test "x$GUITYPE" = "xGTK"; then gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \ sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'` if test "x$gdk_pixbuf_version_minor" != x -a \ - $gdk_pixbuf_version_minor -ge 32 ; then + $gdk_pixbuf_version_minor -ge 31 ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5 $as_echo "OK." >&6; } # Extract the first word of "glib-compile-resources", so it can be a program name with args.
--- a/src/configure.in +++ b/src/configure.in @@ -2500,7 +2500,7 @@ if test -z "$SKIP_GTK2"; then fi fi -dnl Check the version of Gdk-Pixbuf. If the version is 2.32 or later and +dnl Check the version of Gdk-Pixbuf. If the version is 2.31 or later and dnl glib-compile-resources is found in PATH, use GResource. if test "x$GUITYPE" = "xGTK"; then AC_MSG_CHECKING([version of Gdk-Pixbuf]) @@ -2509,7 +2509,7 @@ if test "x$GUITYPE" = "xGTK"; then gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \ sed -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/'` if test "x$gdk_pixbuf_version_minor" != x -a \ - $gdk_pixbuf_version_minor -ge 32 ; then + $gdk_pixbuf_version_minor -ge 31 ; then AC_MSG_RESULT([OK.]) AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no) AC_MSG_CHECKING([glib-compile-resources])