Skip to content
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

Jump to bottom

Keysyms update #375

Merged
merged 3 commits into from
Sep 28, 2023
Merged

Keysyms update #375

merged 3 commits into from
Sep 28, 2023

Conversation

wismill
Copy link
Member

@wismill wismill commented Sep 20, 2023 •
edited
Loading

Fixes #358

NOTE: wait for the following MR in xorgproto to be merged:

Then the commit message should be updated with the correct xorgproto commit ref.

@wismill wismill added enhancement Indicates new feature requests compile-keymap Indicates a need for improvements or additions to keymap compilation keysyms generator labels Sep 20, 2023
@wismill wismill self-assigned this Sep 20, 2023
@wismill wismill added this to the 1.6.0 milestone Sep 20, 2023
@wismill
Copy link
Member Author

wismill commented Sep 20, 2023

The test x11comp is failing because we need xkbcomp compiled with x11proto-dev 2023.2, but none of the Ubuntu release has this recent version. The test passes on my computer (openSUSE Tumbleweed).

@wismill wismill force-pushed the keysyms/update branch 2 times, most recently from 30d09c7 to 0a59aa4 Compare September 20, 2023 10:37
@wismill
Copy link
Member Author

wismill commented Sep 20, 2023

x11comp test fixed with an ugly hack.

bluetech
bluetech approved these changes Sep 23, 2023
View reviewed changes
Copy link
Member

@bluetech bluetech left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, feel free to merge once xorgproto is ready

@wismill
scripts/makeheader: Minor improvements
a6a7c59 
Use `pathlib` for proper path handling.
@wismill
Keysyms: Update using latest xorgproto
62b3bb8 
xorgproto commit: 1c8128d72df22843a2022576850bc5ab5e3a46ea.
@wismill
Keysyms: Fix failing tests
07ac949 
- Update keymap to use reference keysym names.
- Fix x11comp test by handling old x11proto.

  We need xkbcomp to be compiled with at least x11proto-dev 2023.2.
  So we replace the unsupported keysyms with supported ones not
  already in the keymap. This is kind of ugly, but it works. If we
  ever want to restore the original keysyms with their supported names,
  the substitute keysyms will be easy to spot.
@wismill
Copy link
Member Author

wismill commented Sep 28, 2023

Rebased, updated with latest xorgproto, reworked commits. Will merge when CI is successful.

@wismill wismill marked this pull request as ready for review September 28, 2023 05:48
@wismill wismill merged commit 0d45411 into xkbcommon:master Sep 28, 2023
4 checks passed
@wismill wismill deleted the keysyms/update branch September 29, 2023 07:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bluetech bluetech bluetech approved these changes

Assignees

@wismill wismill

Labels
compile-keymap Indicates a need for improvements or additions to keymap compilation enhancement Indicates new feature requests keysyms generator
Projects
None yet
Milestone
1.6.0
Development

Successfully merging this pull request may close these issues.

Update keysyms
2 participants
@wismill @bluetech