mirror of
https://github.com/openwrt/video.git
synced 2026-07-14 02:54:55 +04:00
Daniel Golle
a5e8aecf2b
Pass the xkb-config extensions path options explicitly: 1.13.2 adds versioned and unversioned extensions directories, and tools/info.c references DFLT_XKB_CONFIG_*_EXTENSIONS_PATH unconditionally while meson only defines them when an xkeyboard-config root is detected, which broke the build otherwise. Refresh 100-no-python.patch for the new source. https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-1.13.2/NEWS.md Signed-off-by: Daniel Golle <daniel@makrotopia.org>
12 lines
496 B
Diff
12 lines
496 B
Diff
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -1068,7 +1068,7 @@ test(
|
|
pymod = import('python')
|
|
python = pymod.find_installation('python3', modules: ['jinja2'], required: false)
|
|
has_merge_modes_tests = python.found() and python.language_version().version_compare('>=3.11')
|
|
-if has_merge_modes_tests
|
|
+if false
|
|
script = find_program('scripts/update-merge-modes-tests.py')
|
|
merge_modes_tests = [meson.project_name()]
|
|
# NOTE: The following tests deal with third-party XKB compilers and are
|