diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2018-03-20 14:27:12 +0300 |
|---|---|---|
| committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2018-03-20 20:49:33 +0000 |
| commit | 1f5d791708d5d256a76872f254251dac66e82cdb (patch) | |
| tree | 8bd7e03fb58a59e0ffb779d72fc8631a374045dc /src/gui/configure.json | |
| parent | 321c2d29fbebce63406e80da5d8f05e53cf34b23 (diff) | |
Bump up the required libxcb version to 1.9
...and update bundled xcb sources to libxcb 1.9.1 with xcb-proto 1.8.
These are the minimal versions of libxcb and xcb-proto available
on officially supported platforms (they are present on RHEL 6.6).
Remove support_libxcb_versions_where_xcb_sumof_not_available.patch
and revert it for xkb.c, because libxcb 1.9 implements xcb_sumof().
This change makes it easier to bundle xcb libs from newer versions
of libxcb (e.g. xcb-xinput).
[ChangeLog][Third-Party Code][X11] The minimal required version of
libxcb is now 1.9. Bundled xcb sources were updated to libxcb 1.9.1
built with xcb-proto 1.8.
Change-Id: Iebcd05656c4a5ed5dd95e898d497acef857423f0
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/gui/configure.json')
| -rw-r--r-- | src/gui/configure.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json index aac70a16a3..db2fc665ae 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -439,18 +439,18 @@ ] }, "xcb": { - "label": "XCB >= 1.5 (core)", + "label": "XCB >= 1.9 (core)", "test": { "include": "xcb/xcb.h", "main": [ "int primaryScreen = 0;", "(void)xcb_connect(\"\", &primaryScreen);", - "// This won't compile unless libxcb >= 1.5 which defines XCB_ATOM_PRIMARY.", - "int xcbAtomPrimary = XCB_ATOM_PRIMARY;" + "// This won't compile unless libxcb >= 1.9 which defines XCB_CONN_CLOSED_INVALID_SCREEN.", + "int xcbScreenError = XCB_CONN_CLOSED_INVALID_SCREEN;" ] }, "sources": [ - { "type": "pkgConfig", "args": "xcb >= 1.5" }, + { "type": "pkgConfig", "args": "xcb >= 1.9" }, "-lxcb" ] }, |