From f9d6bccf0ce66b7684e74fdecb70a5e294f871b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Mon, 7 Feb 2022 17:42:47 +0100
Subject: [PATCH] Bump required wayland-protocols version

Once in meson.build to declare the build requirement, then again in the
CI description to build an image a new enough version.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2167>
---
 .gitlab-ci.yml | 4 ++--
 meson.build    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e80d9464..2090cd8ab 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ variables:
 .mutter.fedora:35@common:
   variables:
     FDO_DISTRIBUTION_VERSION: 35
-    BASE_TAG: '2022-02-18.0'
+    BASE_TAG: '2022-03-04.0'
     FDO_DISTRIBUTION_PACKAGES:
       asciidoc
       clang
@@ -70,7 +70,7 @@ variables:
 
       ./.gitlab-ci/install-meson-project.sh \
         https://gitlab.freedesktop.org/wayland/wayland-protocols.git \
-        1.24 . &&
+        1.25 . &&
 
       ./.gitlab-ci/install-meson-project.sh \
         -Dgtk_doc=false \
diff --git a/meson.build b/meson.build
index faa38a84f..ebe3f8014 100644
--- a/meson.build
+++ b/meson.build
@@ -41,7 +41,7 @@ gudev_req = '>= 232'
 
 # wayland version requirements
 wayland_server_req = '>= 1.18'
-wayland_protocols_req = '>= 1.24'
+wayland_protocols_req = '>= 1.25'
 
 # native backend version requirements
 libinput_req = '>= 1.19.0'