mirror of
https://github.com/vim/vim.git
synced 2025-09-24 03:44:06 -04:00
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.
This commit is contained in:
2
src/auto/configure
vendored
2
src/auto/configure
vendored
@@ -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.
|
||||
|
@@ -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])
|
||||
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1038,
|
||||
/**/
|
||||
1037,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user