From d2e03f02c4a69d13bd90b5d084990bca95d0b0af Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 2 Jan 2016 22:46:36 +0100 Subject: [PATCH] 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. --- src/auto/configure | 2 +- src/configure.in | 4 ++-- src/version.c | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/auto/configure b/src/auto/configure index 38e1cb992..a0452795a 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -8919,7 +8919,7 @@ $as_echo_n "checking version of Gdk-Pixbuf... " >&6; } 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. diff --git a/src/configure.in b/src/configure.in index 91c055574..17368c1ac 100644 --- 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]) diff --git a/src/version.c b/src/version.c index 0ca4f8ab9..dc52ed142 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1038, /**/ 1037, /**/ -- 2.50.1