Skip to content

Don't try localeFromXkbSymbol w/o __X11__ defined#14949

Merged
ywwg merged 1 commit intomixxxdj:mainfrom
PPN-SD:main
Jun 18, 2025
Merged

Don't try localeFromXkbSymbol w/o __X11__ defined#14949
ywwg merged 1 commit intomixxxdj:mainfrom
PPN-SD:main

Conversation

@PPN-SD
Copy link
Copy Markdown
Contributor

@PPN-SD PPN-SD commented Jun 16, 2025

Because X11/XKBlib.h is a part of libX11

That's a kind of fix-on-merge, because the workaround initially targeted 2.5 which do not define __X11__.

Because X11/XKBlib.h is a part of libX11

Signed-off-by: Nicolas PARLANT <nicolas.parlant@parhuet.fr>
@ywwg
Copy link
Copy Markdown
Member

ywwg commented Jun 18, 2025

What situation does this fix? Some sort of wayland-only configuration perhaps?

@PPN-SD
Copy link
Copy Markdown
Contributor Author

PPN-SD commented Jun 18, 2025

Exactly, any system without libX11.

Copy link
Copy Markdown
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

I mean this probably breaks a bunch of locale-specific stuff, but that doesn't work properly anyways...

@PPN-SD
Copy link
Copy Markdown
Contributor Author

PPN-SD commented Jun 18, 2025

I think libxkbcommon could support x11/wayland.

@Swiftb0y
Copy link
Copy Markdown
Member

Qt has probably also improved since this code was written, it would be worth trying to figure out if we can reduce some of the platform dependent stuff.

@ywwg ywwg merged commit 7265da0 into mixxxdj:main Jun 18, 2025
3 checks passed
@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jun 18, 2025

I mean this probably breaks a bunch of locale-specific stuff, but that doesn't work properly anyways...

Qt has probably also improved since this code was written, it would be worth trying to figure out if we can reduce some of the platform dependent stuff.

Nope, this is one of the recent keyboard fixes #14883 that actually make it work ; )

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jun 18, 2025

ifdefs LGTM btw

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants