From 1d1544730f8d8472d93b9e40b25eb53a15833cf8 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 26 Mar 2024 08:34:32 +0800 Subject: libxkbcommon: upgrade 1.6.0 -> 1.7.0 Changelog: =========== - Added early detection of invalid encodings and BOM for keymaps, rules & Compose. Also added a hint that the expected encoding must be UTF-8 compatible. - Updated keysyms using latest [xorgproto] - Keysyms: Fixed inconsistent results in 'xkb_keysym_from_name' when used with the flag 'XKB_KEYSYM_CASE_INSENSITIVE'. - Keysyms: Fixed case mapping for 3 Latin 1 keysyms: - 'XKB_KEY_ydiaeresis' - 'XKB_KEY_mu' - 'XKB_KEY_ssharp' - Keysyms: Fixed 'xkb_keysym_is_modifier' to detect also the following keysyms: - 'XKB_KEY_ISO_Level5_Shift' - 'XKB_KEY_ISO_Level5_Latch' - 'XKB_KEY_ISO_Level5_Lock' - Prevent recursive includes of keymap components. - Fixed global default statements 'x.y = z;' in wrong scope not raising an error. - Rules: Made newline required after '!include' line. - Rules: Fixed a bug where variant indexes were ignored with the layout index used instead. They are practically always the same, but don't have to be. - Compose: Fixed a segfault with 'xkb_compose_table_iterator_next' when used on an empty table. - Compose: Added check to ensure to open only regular files, not e.g. directories. - Registry: Updated the DTD and always parse the "popularity" attribute. - Fixed a few memory leaks and keymap symbols parsing. (From OE-Core rev: 9ae00c047f3a9a5993be70cb27d34c6814e4944d) Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie --- .../xorg-lib/libxkbcommon_1.6.0.bb | 40 ---------------------- .../xorg-lib/libxkbcommon_1.7.0.bb | 40 ++++++++++++++++++++++ 2 files changed, 40 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_1.6.0.bb create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb (limited to 'meta/recipes-graphics') diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.6.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.6.0.bb deleted file mode 100644 index 02045cc212..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.6.0.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "Generic XKB keymap library" -DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ -processes a reduced subset of keymaps as defined by the XKB specification." -HOMEPAGE = "http://www.xkbcommon.org" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e525ed9809e1f8a07cf4bce8b09e8b87" -LICENSE = "MIT & MIT" - -DEPENDS = "flex-native bison-native" - -SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" - -SRC_URI[sha256sum] = "0edc14eccdd391514458bc5f5a4b99863ed2d651e4dd761a90abf4f46ef99c2b" - -UPSTREAM_CHECK_URI = "http://xkbcommon.org/" - -inherit meson pkgconfig bash-completion - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} xkbregistry" - -PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native" -PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols," -PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," -PACKAGECONFIG[xkbregistry] = "-Denable-xkbregistry=true,-Denable-xkbregistry=false,libxml2" - -PACKAGE_BEFORE_PN += "xkbcli" -FILES:${PN} = "" -FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*" - -python populate_packages:prepend () { - # Put the libraries into separate packages to avoid dependency creep - do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True) -} - -# Fix a following runtime error: -# xkbcommon: ERROR: couldn't find a Compose file for locale "C" -RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" - -BBCLASSEXTEND += "native" - -CVE_PRODUCT += "xkbcommon:libxkbcommon" diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb new file mode 100644 index 0000000000..40cf616f0b --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_1.7.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "Generic XKB keymap library" +DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ +processes a reduced subset of keymaps as defined by the XKB specification." +HOMEPAGE = "http://www.xkbcommon.org" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e525ed9809e1f8a07cf4bce8b09e8b87" +LICENSE = "MIT & MIT" + +DEPENDS = "flex-native bison-native" + +SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" + +SRC_URI[sha256sum] = "65782f0a10a4b455af9c6baab7040e2f537520caa2ec2092805cdfd36863b247" + +UPSTREAM_CHECK_URI = "http://xkbcommon.org/" + +inherit meson pkgconfig bash-completion + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)} xkbregistry" + +PACKAGECONFIG[docs] = "-Denable-docs=true,-Denable-docs=false,doxygen-native" +PACKAGECONFIG[wayland] = "-Denable-wayland=true,-Denable-wayland=false,wayland-native wayland wayland-protocols," +PACKAGECONFIG[x11] = "-Denable-x11=true,-Denable-x11=false,libxcb xkeyboard-config," +PACKAGECONFIG[xkbregistry] = "-Denable-xkbregistry=true,-Denable-xkbregistry=false,libxml2" + +PACKAGE_BEFORE_PN += "xkbcli" +FILES:${PN} = "" +FILES:xkbcli = "${bindir}/xkbcli ${libexecdir}/xkbcommon/xkbcli-*" + +python populate_packages:prepend () { + # Put the libraries into separate packages to avoid dependency creep + do_split_packages(d, d.expand('${libdir}'), r'^(lib.*)\.so\.*', '%s', '%s library', extra_depends='', allow_links=True) +} + +# Fix a following runtime error: +# xkbcommon: ERROR: couldn't find a Compose file for locale "C" +RDEPENDS:${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libx11-locale', 'libx11-compose-data', d)}" + +BBCLASSEXTEND += "native" + +CVE_PRODUCT += "xkbcommon:libxkbcommon" -- cgit v1.2.3-54-g00ecf