mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-06-19 05:28:34 +02:00
cairo-xcb: Require libxcb 1.6
Since commit 968eb30bba, we use xcb_discard_reply(). This function was
added in libxcb 1.6.
"Fixes": https://bugs.freedesktop.org/show_bug.cgi?id=40925
Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
parent
b6c3fea672
commit
7ba28ff563
2 changed files with 1 additions and 10 deletions
|
|
@ -52,15 +52,9 @@ _cairo_boilerplate_xcb_handle_errors (xcb_target_closure_t *xtc)
|
|||
if (ev->response_type == CAIRO_XCB_ERROR) {
|
||||
xcb_generic_error_t *error = (xcb_generic_error_t *) ev;
|
||||
|
||||
#if XCB_GENERIC_ERROR_HAS_MAJOR_MINOR_CODES
|
||||
fprintf (stderr,
|
||||
"Detected error during xcb run: %d major=%d, minor=%d\n",
|
||||
error->error_code, error->major_code, error->minor_code);
|
||||
#else
|
||||
fprintf (stderr,
|
||||
"Detected error during xcb run: %d\n",
|
||||
error->error_code);
|
||||
#endif
|
||||
} else {
|
||||
fprintf (stderr,
|
||||
"Detected unexpected event during xcb run: %d\n",
|
||||
|
|
|
|||
|
|
@ -101,13 +101,10 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib_xrender, Xlib Xrender, auto, [
|
|||
dnl ===========================================================================
|
||||
|
||||
CAIRO_ENABLE_SURFACE_BACKEND(xcb, XCB, auto, [
|
||||
xcb_REQUIRES="xcb >= 1.1.92 xcb-render >= 0.9.92"
|
||||
xcb_REQUIRES="xcb >= 1.6 xcb-render >= 1.6"
|
||||
PKG_CHECK_MODULES(xcb, $xcb_REQUIRES, ,
|
||||
[AC_MSG_RESULT(no)
|
||||
use_xcb="no (requires $xcb_REQUIRES http://xcb.freedesktop.org)"])
|
||||
if $PKG_CONFIG --atleast-version=1.4 xcb; then
|
||||
CAIRO_CFLAGS="$CAIRO_CFLAGS -DXCB_GENERIC_ERROR_HAS_MAJOR_MINOR_CODES"
|
||||
fi
|
||||
])
|
||||
|
||||
CAIRO_ENABLE_FUNCTIONS(xlib_xcb, Xlib/XCB, no, [
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue