libx11: drop some headers provided by xorgproto #60251
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Dentrax <furkan.turkal@chainguard.dev>
octo-sts
bot
added
the
bincapz/pass
dannf
approved these changes
Jul 21, 2025
Dentrax
added a commit
that referenced
this pull request
Jul 21, 2025
Part 1/2: #60251 Part 2/2: `xf86miscproto` is deprecated and replaced with `xorgproto`: https://gitlab.freedesktop.org/xorg/proto/xf86miscproto/-/blob/master/autogen.sh?ref_type=heads To build this: #59993 we do need some headers. It builds if we do enable xorgproto with legacy support. libx11-dev doesn't provide `xf86mscstr.h`. But some headers like `XKBgeom.h XKBsrv.h XKBstr.h` is still provided by `libx11`, which resulting conflict during install: ``` installing apk packages: installing packages: installing libx11-dev (ver:1.8.12-r1 arch:aarch64): unable to install files for pkg libx11-dev: writing header for "usr/include/X11/extensions/XKBgeom.h": packages map[libx11-dev:libx11 xorgproto:xorgproto] has conflicting file: "usr/include/X11/extensions/XKBgeom.h" ``` So remove those from libx11 and re-build xorgproto with having those headers. So we can build `libXxf86misc`. Signed-off-by: Dentrax <furkan.turkal@chainguard.dev>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part 1/2:
xf86miscprotois deprecated and replaced withxorgproto: https://gitlab.freedesktop.org/xorg/proto/xf86miscproto/-/blob/master/autogen.sh?ref_type=headsTo build this: #59993 we do need some headers. It builds if we do enable xorgproto with legacy support. libx11-dev doesn't provide
xf86mscstr.h.But some headers like
XKBgeom.h XKBsrv.h XKBstr.his still provided bylibx11, which resulting conflict during install:So remove those from libx11 and re-build xorgproto with having those headers. So we can build
libXxf86misc.