Skip to content

Commit

Permalink
build: Remove wl protos from public API altogether
Browse files Browse the repository at this point in the history
This was introduced recently in 68bf979, but as it turns out, we don't
need to leak the layer-shell-unstable wl proto header into the public
API after all. This is because the previous commit reduced the exports
of PhoshLayerSurface to just its type information.

Signed-off-by: Sam Day <[email protected]>
Part-of: <https://gitlab.gnome.org/World/Phosh/phosh/-/merge_requests/1637>
  • Loading branch information
samcday authored and Marge Bot committed Feb 6, 2025
1 parent 934a2a0 commit 1e23c76
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions protocol/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,6 @@ wl_protocol_dir = wayland_protos_dep.get_variable(pkgconfig: 'pkgdatadir')

wayland_scanner = find_program('wayland-scanner')

# These protocols are referenced directly by public libphosh API headers, the
# generated headers will be exported to the public include dir.
libphosh_wl_protos = [
['wlr-layer-shell-unstable-v1.xml'],
]

wl_protos = [
[wl_protocol_dir, 'stable/xdg-shell/xdg-shell.xml'],
[wl_protocol_dir, 'staging/ext-idle-notify/ext-idle-notify-v1.xml'],
Expand All @@ -23,10 +17,11 @@ wl_protos = [
['virtual-keyboard-unstable-v1.xml'],
['wlr-foreign-toplevel-management-unstable-v1.xml'],
['wlr-gamma-control-unstable-v1.xml'],
['wlr-layer-shell-unstable-v1.xml'],
['wlr-output-management-unstable-v1.xml'],
['wlr-output-power-management-unstable-v1.xml'],
['wlr-screencopy-unstable-v1.xml'],
] + libphosh_wl_protos
]

wl_proto_headers = []
wl_proto_headers = []
Expand All @@ -45,8 +40,6 @@ foreach p : wl_protos
'client-header',
'@INPUT@',
'@OUTPUT@'],
install_dir: lib_inc_dir,
install: libphosh_wl_protos.contains(p),
)
wl_proto_sources += custom_target('@0@ source'.format(proto),
input: xml,
Expand Down

0 comments on commit 1e23c76

Please sign in to comment.