A trivial first patch but hopefully useful nonetheless. Cody
From: Cody Maloney <[email protected]> setjmp(png_ptr->jmpbuf) is depreceated so removed it and bumped the version number in configure.ac --- configure.ac | 2 +- xcursorgen.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index e7344ba..0255ba3 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PROG_INSTALL XORG_DEFAULT_OPTIONS # Checks for pkg-config packages -PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng12) +PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng14) AC_SUBST(XCURSORGEN_CFLAGS) AC_SUBST(XCURSORGEN_LIBS) diff --git a/xcursorgen.c b/xcursorgen.c index fc80f6d..daae18b 100644 --- a/xcursorgen.c +++ b/xcursorgen.c @@ -196,7 +196,7 @@ load_image (struct flist *list, char *prefix) return NULL; } - if (setjmp (png->jmpbuf)) + if (setjmp (png_jmpbuf(png))) { png_destroy_read_struct (&png, &info, NULL); return NULL; -- 1.7.0.2
0001-Upgraded-to-work-with-libpng14.patch
Description: Binary data
_______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
