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