blob: 4418b965aad020bf79ce58a5351063679b994f6e (
plain)
1 Adjusted from commit 9e7c41e0e16183110cd7b28d012a0bb69aed4655 upstream.
2
3 diff -aur xcursorgen-1.0.3.orig/configure xcursorgen-1.0.3/configure
4 --- xcursorgen-1.0.3.orig/configure 2009-10-17 02:42:25.000000000 +0200
5 +++ xcursorgen-1.0.3/configure 2010-09-05 11:59:50.910999988 +0200
6 @@ -5043,12 +5043,12 @@
7 pkg_cv_XCURSORGEN_CFLAGS="$XCURSORGEN_CFLAGS"
8 elif test -n "$PKG_CONFIG"; then
9 if test -n "$PKG_CONFIG" && \
10 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5
11 - ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5
12 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng >= 1.2.0\"") >&5
13 + ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng >= 1.2.0") 2>&5
14 ac_status=$?
15 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
16 (exit $ac_status); }; then
17 - pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng12" 2>/dev/null`
18 + pkg_cv_XCURSORGEN_CFLAGS=`$PKG_CONFIG --cflags "x11 xcursor libpng >= 1.2.0" 2>/dev/null`
19 else
20 pkg_failed=yes
21 fi
22 @@ -5059,12 +5059,12 @@
23 pkg_cv_XCURSORGEN_LIBS="$XCURSORGEN_LIBS"
24 elif test -n "$PKG_CONFIG"; then
25 if test -n "$PKG_CONFIG" && \
26 - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng12\"") >&5
27 - ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng12") 2>&5
28 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xcursor libpng >= 1.2.0\"") >&5
29 + ($PKG_CONFIG --exists --print-errors "x11 xcursor libpng >= 1.2.0") 2>&5
30 ac_status=$?
31 $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
32 (exit $ac_status); }; then
33 - pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng12" 2>/dev/null`
34 + pkg_cv_XCURSORGEN_LIBS=`$PKG_CONFIG --libs "x11 xcursor libpng >= 1.2.0" 2>/dev/null`
35 else
36 pkg_failed=yes
37 fi
38 @@ -5082,14 +5082,14 @@
39 _pkg_short_errors_supported=no
40 fi
41 if test $_pkg_short_errors_supported = yes; then
42 - XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng12" 2>&1`
43 + XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "x11 xcursor libpng >= 1.2.0" 2>&1`
44 else
45 - XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng12" 2>&1`
46 + XCURSORGEN_PKG_ERRORS=`$PKG_CONFIG --print-errors "x11 xcursor libpng >= 1.2.0" 2>&1`
47 fi
48 # Put the nasty error message in config.log where it belongs
49 echo "$XCURSORGEN_PKG_ERRORS" >&5
50
51 - { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng12) were not met:
52 + { { $as_echo "$as_me:$LINENO: error: Package requirements (x11 xcursor libpng >= 1.2.0) were not met:
53
54 $XCURSORGEN_PKG_ERRORS
55
56 @@ -5100,7 +5100,7 @@
57 and XCURSORGEN_LIBS to avoid the need to call pkg-config.
58 See the pkg-config man page for more details.
59 " >&5
60 -$as_echo "$as_me: error: Package requirements (x11 xcursor libpng12) were not met:
61 +$as_echo "$as_me: error: Package requirements (x11 xcursor libpng >= 1.2.0) were not met:
62
63 $XCURSORGEN_PKG_ERRORS
64
65
66
67 diff --git a/xcursorgen.c b/xcursorgen.c
68 index fc80f6d..daae18b 100644
69 --- a/xcursorgen.c
70 +++ b/xcursorgen.c
71 @@ -196,7 +196,7 @@ load_image (struct flist *list, char *prefix)
72 return NULL;
73 }
74
75 - if (setjmp (png->jmpbuf))
76 + if (setjmp (png_jmpbuf(png)))
77 {
78 png_destroy_read_struct (&png, &info, NULL);
79 return NULL;
|
