diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2022-03-19 00:37:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2022-03-19 00:37:58 +0000 |
| commit | f567bf62e15dd43644f66d58a89d8801f9593d24 (patch) | |
| tree | 632ef7a97336c3fe229c18e7ce5b803b8edb9a9e | |
| parent | 1f00cdc7a65b12329ecfa6719eff816edfa11bac (diff) | |
| parent | dc875b6af9311f3b5275961618ad867bf1f57a1e (diff) | |
| download | gtk+-f567bf62e15dd43644f66d58a89d8801f9593d24.tar.gz | |
Merge branch 'alatiera/stable-wraps-4-6' into 'gtk-4-6'
meson: use proper handling of wayland-protocols dependency
See merge request GNOME/gtk!4580
| -rw-r--r-- | meson.build | 8 | ||||
| -rw-r--r-- | subprojects/glib.wrap | 2 | ||||
| -rw-r--r-- | subprojects/graphene.wrap | 2 | ||||
| -rw-r--r-- | subprojects/libepoxy.wrap | 2 | ||||
| -rw-r--r-- | subprojects/sysprof.wrap | 2 | ||||
| -rw-r--r-- | subprojects/wayland-protocols.wrap | 2 | ||||
| -rw-r--r-- | subprojects/wayland.wrap | 2 |
7 files changed, 8 insertions, 12 deletions
diff --git a/meson.build b/meson.build index 63b4d73bfe..17fdb1cfe7 100644 --- a/meson.build +++ b/meson.build @@ -517,15 +517,11 @@ if wayland_enabled wlclientdep = dependency('wayland-client', version: wayland_req, fallback: 'wayland', default_options: ['documentation=false']) - wlprotocolsdep = dependency('wayland-protocols', version: wayland_proto_req, required: false) + wlprotocolsdep = dependency('wayland-protocols', version: wayland_proto_req) wlegldep = dependency('wayland-egl', fallback: 'wayland') - if not wlprotocolsdep.found() - wlproto_dir = subproject('wayland-protocols').get_variable('wayland_protocols_srcdir') - else - wlproto_dir = wlprotocolsdep.get_variable(pkgconfig: 'pkgdatadir') - endif + wlproto_dir = wlprotocolsdep.get_variable('pkgdatadir') wayland_pkgs = [ 'wayland-client @0@'.format(wayland_req), diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap index c785910d9f..ec5febde86 100644 --- a/subprojects/glib.wrap +++ b/subprojects/glib.wrap @@ -2,5 +2,5 @@ directory=glib url=https://gitlab.gnome.org/GNOME/glib.git push-url=ssh://git@gitlab.gnome.org:GNOME/glib.git -revision=main +revision=glib-2-68 depth=1 diff --git a/subprojects/graphene.wrap b/subprojects/graphene.wrap index 902095dbd7..d9503ab978 100644 --- a/subprojects/graphene.wrap +++ b/subprojects/graphene.wrap @@ -1,5 +1,5 @@ [wrap-git] directory=graphene url=https://github.com/ebassi/graphene.git -revision=master +revision=1.10.6 depth=1 diff --git a/subprojects/libepoxy.wrap b/subprojects/libepoxy.wrap index fc5147a22b..0ab256ef26 100644 --- a/subprojects/libepoxy.wrap +++ b/subprojects/libepoxy.wrap @@ -1,5 +1,5 @@ [wrap-git] directory=libepoxy url=https://github.com/anholt/libepoxy.git -revision=master +revision=1.5.9 depth=1 diff --git a/subprojects/sysprof.wrap b/subprojects/sysprof.wrap index 99aa36ce87..41fb7c6ee2 100644 --- a/subprojects/sysprof.wrap +++ b/subprojects/sysprof.wrap @@ -1,5 +1,5 @@ [wrap-git] directory=sysprof url=https://gitlab.gnome.org/GNOME/sysprof.git -revision=master +revision=sysprof-3-38 depth=1 diff --git a/subprojects/wayland-protocols.wrap b/subprojects/wayland-protocols.wrap index 065651db63..5361f0c540 100644 --- a/subprojects/wayland-protocols.wrap +++ b/subprojects/wayland-protocols.wrap @@ -1,5 +1,5 @@ [wrap-git] directory=wayland-protocols url=https://gitlab.freedesktop.org/wayland/wayland-protocols.git -revision=main +revision=1.23 depth=1 diff --git a/subprojects/wayland.wrap b/subprojects/wayland.wrap index 5be67bf491..bdb12d3aa7 100644 --- a/subprojects/wayland.wrap +++ b/subprojects/wayland.wrap @@ -1,7 +1,7 @@ [wrap-git] directory=wayland url=https://gitlab.freedesktop.org/wayland/wayland.git -revision=main +revision=1.20.0 depth=1 [provide] |