Skip to content

Commit d2e03f0

Browse files
committed
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.
1 parent 027387f commit d2e03f0

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/auto/configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8919,7 +8919,7 @@ $as_echo_n "checking version of Gdk-Pixbuf... " >&6; }
89198919
gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \
89208920
sed -e 's/[0-9][0-9]*\.\([0-9][0-9]*\)\.[0-9][0-9]*/\1/'`
89218921
if test "x$gdk_pixbuf_version_minor" != x -a \
8922-
$gdk_pixbuf_version_minor -ge 32 ; then
8922+
$gdk_pixbuf_version_minor -ge 31 ; then
89238923
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OK." >&5
89248924
$as_echo "OK." >&6; }
89258925
# Extract the first word of "glib-compile-resources", so it can be a program name with args.

src/configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2500,7 +2500,7 @@ if test -z "$SKIP_GTK2"; then
25002500
fi
25012501
fi
25022502

2503-
dnl Check the version of Gdk-Pixbuf. If the version is 2.32 or later and
2503+
dnl Check the version of Gdk-Pixbuf. If the version is 2.31 or later and
25042504
dnl glib-compile-resources is found in PATH, use GResource.
25052505
if test "x$GUITYPE" = "xGTK"; then
25062506
AC_MSG_CHECKING([version of Gdk-Pixbuf])
@@ -2509,7 +2509,7 @@ if test "x$GUITYPE" = "xGTK"; then
25092509
gdk_pixbuf_version_minor=`echo $gdk_pixbuf_version | \
25102510
sed -e 's/[[0-9]][[0-9]]*\.\([[0-9]][[0-9]]*\)\.[[0-9]][[0-9]]*/\1/'`
25112511
if test "x$gdk_pixbuf_version_minor" != x -a \
2512-
$gdk_pixbuf_version_minor -ge 32 ; then
2512+
$gdk_pixbuf_version_minor -ge 31 ; then
25132513
AC_MSG_RESULT([OK.])
25142514
AC_PATH_PROG(GLIB_COMPILE_RESOURCES,[glib-compile-resources],no)
25152515
AC_MSG_CHECKING([glib-compile-resources])

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -741,6 +741,8 @@ static char *(features[]) =
741741

742742
static int included_patches[] =
743743
{ /* Add new patch number below this line */
744+
/**/
745+
1038,
744746
/**/
745747
1037,
746748
/**/

0 commit comments

Comments
 (0)