[PATCH] xcursorgen: Upgraded to work with libpng14

[Cody Maloney]

A trivial first patch but hopefully useful nonetheless.

Cody

From: Cody Maloney <cmaloney at theoreticalchaos.com>

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Upgraded-to-work-with-libpng14.patch
Type: application/octet-stream
Size: 1133 bytes
Desc: not available
URL: <http://lists.x.org/archives/xorg-devel/attachments/20100312/e67e190f/attachment.obj>