From 76c762558a4f31d030cf55dacf0e1913db5c6d60 Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Tue, 16 Oct 2018 12:09:10 +0200 Subject: 3rdparty/xkbcommon: update bundled version 0.4.1 -> 0.8.2 0.8.2 + subsequent commits up to 31f1f355700870c6615399fbfa7934934b3a9a57. There were couple commits after 0.8.2. Mostly minor stuff, with 2 exceptions: fix off-by-one error in xkb_file_type_to_string() and undefined behavior in src/x11/keymap.c We currently don't use any of the features added in later releases of libxkbcommon, therefore the minimal required version in src/gui/configure.json remains the same. [ChangeLog][Third-Party Code] updated bundled libxkbcommon 0.4.1 -> 0.8.2 (up to 31f1f355700870c6615399fbfa7934934b3a9a57) Task-number: QTBUG-71109 Change-Id: Ia03c3dc31c5f39e78dcb5915a45e82797b065ccb Reviewed-by: Lars Knoll --- src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h') diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h b/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h index b57e4cdce1..6c76f381ac 100644 --- a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h +++ b/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h @@ -36,6 +36,9 @@ ExprCreateString(xkb_atom_t str); ExprDef * ExprCreateInteger(int ival); +ExprDef * +ExprCreateFloat(void); + ExprDef * ExprCreateBoolean(bool set); -- cgit v1.2.3 From c3a963da1f9e7b1d37e63eedded61da4fbdaaf9a Mon Sep 17 00:00:00 2001 From: Gatis Paeglis Date: Fri, 16 Nov 2018 17:07:33 +0100 Subject: src/3rdparty: remove xkbcommon The only reason why we bundled this library ~6 years ago was because it was not available on distributions that we supported at the time, but library was a hard dependency for XCB plugin. See: 2122e731abdb619249df89642c0800640b2fa428 Later more and more projects started to depend on it (compose input context plugin, libinput, mir, wayland). The configuration had become too complex, because some projects used bundled and some used the version from the system. Having libxkbcommon in 3rdparty sources is not necessary anymore, after RHEL 6.6 was removed from the list of supported platforms for Qt 5.12. Ubuntu 16.04 - 0.5.0 Ubuntu 18.04 - 0.8.0 openSUSE 42.3 - 0.6.1 RHEL-7.4 - 0.7.1 This will also simplify further development, e.g. QTBUG-42181 Bumped the minimal required version 0.4.1 -> 0.5.0. The patch also contains a code marked with "TRANSITION HACK", which is temporary needed so we can update the dependent wayland module. [ChangeLog][Third-Party Code] Removed xkbcommon from bundled sources. This library is present on all supported platforms. The minimal required version now is 0.5.0. Task-number: QTBUG-65503 Change-Id: Iec50829bb6f8fbb19f3c4e4ad62e332beb837de5 Reviewed-by: Lars Knoll Reviewed-by: Laszlo Agocs Reviewed-by: Oswald Buddenhagen --- src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h | 125 ------------------------- 1 file changed, 125 deletions(-) delete mode 100644 src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h (limited to 'src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h') diff --git a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h b/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h deleted file mode 100644 index 6c76f381ac..0000000000 --- a/src/3rdparty/xkbcommon/src/xkbcomp/ast-build.h +++ /dev/null @@ -1,125 +0,0 @@ -/************************************************************ - * Copyright (c) 1994 by Silicon Graphics Computer Systems, Inc. - * - * Permission to use, copy, modify, and distribute this - * software and its documentation for any purpose and without - * fee is hereby granted, provided that the above copyright - * notice appear in all copies and that both that copyright - * notice and this permission notice appear in supporting - * documentation, and that the name of Silicon Graphics not be - * used in advertising or publicity pertaining to distribution - * of the software without specific prior written permission. - * Silicon Graphics makes no representation about the suitability - * of this software for any purpose. It is provided "as is" - * without any express or implied warranty. - * - * SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS - * SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY - * AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON - * GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE - * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH - * THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - ********************************************************/ - -#ifndef XKBCOMP_AST_BUILD_H -#define XKBCOMP_AST_BUILD_H - -ParseCommon * -AppendStmt(ParseCommon *to, ParseCommon *append); - -ExprDef * -ExprCreateString(xkb_atom_t str); - -ExprDef * -ExprCreateInteger(int ival); - -ExprDef * -ExprCreateFloat(void); - -ExprDef * -ExprCreateBoolean(bool set); - -ExprDef * -ExprCreateKeyName(xkb_atom_t key_name); - -ExprDef * -ExprCreateIdent(xkb_atom_t ident); - -ExprDef * -ExprCreateUnary(enum expr_op_type op, enum expr_value_type type, - ExprDef *child); - -ExprDef * -ExprCreateBinary(enum expr_op_type op, ExprDef *left, ExprDef *right); - -ExprDef * -ExprCreateFieldRef(xkb_atom_t element, xkb_atom_t field); - -ExprDef * -ExprCreateArrayRef(xkb_atom_t element, xkb_atom_t field, ExprDef *entry); - -ExprDef * -ExprCreateAction(xkb_atom_t name, ExprDef *args); - -ExprDef * -ExprCreateMultiKeysymList(ExprDef *list); - -ExprDef * -ExprCreateKeysymList(xkb_keysym_t sym); - -ExprDef * -ExprAppendMultiKeysymList(ExprDef *list, ExprDef *append); - -ExprDef * -ExprAppendKeysymList(ExprDef *list, xkb_keysym_t sym); - -KeycodeDef * -KeycodeCreate(xkb_atom_t name, int64_t value); - -KeyAliasDef * -KeyAliasCreate(xkb_atom_t alias, xkb_atom_t real); - -VModDef * -VModCreate(xkb_atom_t name, ExprDef *value); - -VarDef * -VarCreate(ExprDef *name, ExprDef *value); - -VarDef * -BoolVarCreate(xkb_atom_t ident, bool set); - -InterpDef * -InterpCreate(xkb_keysym_t sym, ExprDef *match); - -KeyTypeDef * -KeyTypeCreate(xkb_atom_t name, VarDef *body); - -SymbolsDef * -SymbolsCreate(xkb_atom_t keyName, VarDef *symbols); - -GroupCompatDef * -GroupCompatCreate(unsigned group, ExprDef *def); - -ModMapDef * -ModMapCreate(xkb_atom_t modifier, ExprDef *keys); - -LedMapDef * -LedMapCreate(xkb_atom_t name, VarDef *body); - -LedNameDef * -LedNameCreate(unsigned ndx, ExprDef *name, bool virtual); - -IncludeStmt * -IncludeCreate(struct xkb_context *ctx, char *str, enum merge_mode merge); - -XkbFile * -XkbFileCreate(enum xkb_file_type type, char *name, ParseCommon *defs, - enum xkb_map_flags flags); - -void -FreeStmt(ParseCommon *stmt); - -#endif -- cgit v1.2.3