Skip to content

Commit 308a8b6

Browse files
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

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

xorgproto.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package:
22
name: xorgproto
33
version: "2024.1"
4-
epoch: 2
4+
epoch: 3
55
description: Combined X.Org X11 protocol headers
66
copyright:
77
- license: BSD-2-Clause AND MIT AND X11
@@ -24,6 +24,10 @@ pipeline:
2424
uri: https://xorg.freedesktop.org/archive/individual/proto/xorgproto-${{package.version}}.tar.gz
2525

2626
- uses: meson/configure
27+
with:
28+
# Building the xf86miscproto requires legacy support
29+
opts: |
30+
-Dlegacy=true
2731
2832
- uses: meson/compile
2933

0 commit comments

Comments
 (0)