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

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),

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

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

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

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

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

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]