jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7092 from HiassofT/le11-xkb-fix

Browse Source 
Fix broken xkeyboard-config on gbm
This commit is contained in:
Rudi Heitbaum 2022-11-06 10:27:43 +11:00 committed by GitHub
commit 929ae641ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/x11/data/xkeyboard-config/package.mk
View File

@ -18,12 +18,10 @@ configure_package() {
}
pre_configure_target() {
PKG_MESON_OPTS_TARGET="-Dcompat-rules=true \
-Ddatadir=lib"
PKG_MESON_OPTS_TARGET="-Dcompat-rules=true"
if [ "${DISPLAYSERVER}" = "x11" ]; then
PKG_MESON_OPTS_TARGET+=" -Dxkb-base=${XORG_PATH_XKB} \
-Dxorg-rules-symlinks=true"
PKG_MESON_OPTS_TARGET+=" -Dxorg-rules-symlinks=true"
else
PKG_MESON_OPTS_TARGET+=" -Dxorg-rules-symlinks=false"
fi

15
packages/x11/data/xkeyboard-config/patches/xkeyboard-config-995.01-2.36-fix-xkb-base-path.patch
View File

@ -1,15 +0,0 @@
--- /meson.build
+++ /meson.build
@@ -4,7 +4,10 @@
meson_version: '>= 0.54.0')
dir_data = join_paths(get_option('prefix'), get_option('datadir'))
-dir_xkb_base = join_paths(dir_data, 'X11', 'xkb')
+dir_xkb_base = get_option('xkb-base')
+if dir_xkb_base == ''
+ dir_xkb_base = join_paths(dir_data, 'X11', 'xkb')
+endif
dir_xkb_rules = join_paths(dir_xkb_base, 'rules')
dir_man7 = join_paths(get_option('prefix'), get_option('mandir'), 'man7')
dir_pkgconfig = join_paths(dir_data, 'pkgconfig')