Merge pull request #52 from wmww/require-wayland-protocols

Require system wayland-protocols

README.md

@@ -56,6 +56,7 @@ The easiest way to build against GTK Layer Shell is to use the `gtk-layer-shell-
 * [Meson](https://mesonbuild.com/) (>=0.45.1)
 * [Ninja](https://ninja-build.org/) (>=1.8.2)
 * [libwayland](https://gitlab.freedesktop.org/wayland/wayland) (>=1.10.0)
+* [wayland-protocols](https://gitlab.freedesktop.org/wayland/wayland-protocols) (>=1.16.0)
 * [GTK4](https://www.gtk.org/)
 * __If `introspection` enabled:__ [GObject introspection](https://gitlab.gnome.org/GNOME/gobject-introspection/)
 * __If `docs` enabled:__ [GTK Doc](https://wiki.gnome.org/DocumentationProject/GtkDoc)

meson.build

@@ -24,8 +24,8 @@ wayland_server = dependency('wayland-server', version: '>=1.10.0', required: fal
 # wayland_scanner is required, but we can find it without pkg-config
 wayland_scanner = dependency('wayland-scanner', version: '>=1.10.0', required: false, native: true)
 
-# use system xdg-shell protocol when available
-wayland_protocols = dependency('wayland-protocols', version: '>=1.16', required: false)
+# required, see https://github.com/wmww/gtk4-layer-shell/issues/24
+wayland_protocols = dependency('wayland-protocols', version: '>=1.16', required: true)
 
 pkg_config = import('pkgconfig')
 gnome = import('gnome')

protocol/meson.build

@@ -5,17 +5,11 @@ else
 endif
 
 protocols = [
-    'wlr-layer-shell-unstable-v1.xml'
-]
-
-if wayland_protocols.found()
-    protocols += join_paths(
+    'wlr-layer-shell-unstable-v1.xml',
+    join_paths(
         wayland_protocols.get_variable(pkgconfig: 'pkgdatadir'),
-        'stable/xdg-shell/xdg-shell.xml')
-else
-    # use bundled xdg-shell.xml
-    protocols += 'xdg-shell.xml'
-endif
+        'stable/xdg-shell/xdg-shell.xml'),
+]
 
 gen_client_header = generator(prog_wayland_scanner,
     output: ['@BASENAME@-client.h'],