Commit 308a8b6
authored
xorgproto: enable legacy headers (wolfi-dev#60252)
Part 1/2: wolfi-dev#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: wolfi-dev#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 <[email protected]>1 parent 4d99b91 commit 308a8b6
1 file changed
+5
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | 3 | | |
4 | | - | |
| 4 | + | |
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
27 | 31 | | |
28 | 32 | | |
29 | 33 | | |
| |||
0 commit comments