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.

diff --git a/src/auto/configure b/src/auto/configure
index 38e1cb99260c18324c686abcaba566f06fb28847..a0452795a5be909723e7e568f5c96ba07a028abc 100755 (executable)
--- 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 91c055574e765e4414e63756d4b34b5f47de4512..17368c1ac9210521e2f8c4ab6949387b09b915fc 100644 (file)
--- 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 0ca4f8ab9536ed9f8b8f89056e3981774cb3785f..dc52ed142c82c04621701db64c53cfa747939d23 100644 (file)
--- 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,
 /**/