Skip to content

Fix xkbcommon build #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
joas8211 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix xkbcommon build #166

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6961a4a
Fix xkbcommon build
joas8211 Dec 23, 2025
1274d9d
Embed xkeyboard-config-2 directly to /usr/share/X11/xkb
joas8211 Dec 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libs/compositor-wasm/xkbcommon/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,15 +54,15 @@ build() {
popd

pushd repo-xkeyboard-config
meson setup --wipe build/ --cross-file "${PACKAGE_DIR}/emscripten-toolchain.ini" --cross-file "${PACKAGE_DIR}/emscripten-build.ini" -Dprefix="${PACKAGE_DIR}/xkbcommon/repo/" -Dxkb-base="/usr/share"
meson setup --wipe build/ --cross-file "${PACKAGE_DIR}/emscripten-toolchain.ini" --cross-file "${PACKAGE_DIR}/emscripten-build.ini" -Dprefix="${PACKAGE_DIR}/xkbcommon/repo/"
ninja -C build/ install
popd

pushd repo
meson setup --wipe build/ --cross-file "${PACKAGE_DIR}/emscripten-toolchain.ini" --cross-file "${PACKAGE_DIR}/emscripten-build.ini" \
-Denable-x11=false -Denable-docs=false -Denable-tools=false -Denable-xkbregistry=true -Dxkb-config-root=/usr/share/X11/xkb -Dxkb-config-extra-path=/usr/share/X11/xkb
ninja -C build/
emcc -s MODULARIZE=1 -s EXPORT_ES6=1 -s ENVIRONMENT='web' -s SINGLE_FILE=1 -O3 -flto -msimd128 -s EVAL_CTORS=2 "${PACKAGE_DIR}/xkbcommon/repo/build/libxkbcommon.a" -o ../../src/libxkbcommon.js --embed-file "${PACKAGE_DIR}/xkbcommon/repo/share/X11@/usr/share/X11" -s EXPORTED_RUNTIME_METHODS='["lengthBytesUTF8","stringToUTF8","UTF8ToString","FS"]' -s EXPORTED_FUNCTIONS='["_malloc", "_free", "_xkb_context_new","_xkb_keymap_new_from_string","_xkb_state_new","_free","_xkb_keymap_get_as_string","_xkb_state_update_key","_xkb_state_update_key","_xkb_state_serialize_mods","_xkb_state_serialize_layout","_xkb_keymap_new_from_names","_xkb_context_include_path_append","_xkb_keymap_mod_get_index","_xkb_keymap_led_get_index","_xkb_state_update_mask","_xkb_keymap_unref","_xkb_state_led_index_is_active"]'
emcc -s MODULARIZE=1 -s EXPORT_ES6=1 -s ENVIRONMENT='web' -s SINGLE_FILE=1 -O3 -flto -msimd128 -s EVAL_CTORS=2 "${PACKAGE_DIR}/xkbcommon/repo/build/libxkbcommon.a" -o ../../src/libxkbcommon.js --embed-file "${PACKAGE_DIR}/xkbcommon/repo/share/xkeyboard-config-2@/usr/share/X11/xkb" -s EXPORTED_RUNTIME_METHODS='["lengthBytesUTF8","stringToUTF8","UTF8ToString","FS"]' -s EXPORTED_FUNCTIONS='["_malloc", "_free", "_xkb_context_new","_xkb_keymap_new_from_string","_xkb_state_new","_free","_xkb_keymap_get_as_string","_xkb_state_update_key","_xkb_state_update_key","_xkb_state_serialize_mods","_xkb_state_serialize_layout","_xkb_keymap_new_from_names","_xkb_context_include_path_append","_xkb_keymap_mod_get_index","_xkb_keymap_led_get_index","_xkb_state_update_mask","_xkb_keymap_unref","_xkb_state_led_index_is_active"]'
popd
}

Expand Down