From 23bebf3385a8adc9e1e01731d51531d2ec1de0dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20=C3=85dahl?= Date: Tue, 27 Jul 2021 17:33:38 +0200 Subject: [PATCH] xwayland-grab-keyboard: Switch to g_pattern_spec_match_string() The g_pattern_match_string() variant is deprecated, switch to the properly namespaced one. Part-of: --- .gitlab-ci.yml | 6 +++++- meson.build | 2 +- src/wayland/meta-xwayland-grab-keyboard.c | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a5590abe3..f9fc1df99 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,7 @@ variables: .mutter.fedora:34@common: variables: FDO_DISTRIBUTION_VERSION: 34 - BASE_TAG: '2021-07-22.0' + BASE_TAG: '2021-08-01.0' FDO_DISTRIBUTION_PACKAGES: 'gdm gnome-shell xorg-x11-server-Xvfb sassc gcovr clang' FDO_DISTRIBUTION_EXEC: | @@ -24,6 +24,10 @@ variables: dnf builddep -y mutter --setopt=install_weak_deps=False && dnf builddep -y gnome-shell --setopt=install_weak_deps=False && + ./.gitlab-ci/install-meson-project.sh \ + https://gitlab.gnome.org/GNOME/glib.git \ + main . 02742ef957b532789c003eef80ec7f51c370e3d5 && + ./.gitlab-ci/install-meson-project.sh \ https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git \ 41.alpha . && diff --git a/meson.build b/meson.build index 9c184ed20..371df2865 100644 --- a/meson.build +++ b/meson.build @@ -13,7 +13,7 @@ libmutter_api_version = '@0@'.format(api_version) # generic version requirements fribidi_req = '>= 1.0.0' -glib_req = '>= 2.67.3' +glib_req = '>= 2.69.0' gi_req = '>= 0.9.5' graphene_req = '>= 1.10.2' gtk3_req = '>= 3.19.8' diff --git a/src/wayland/meta-xwayland-grab-keyboard.c b/src/wayland/meta-xwayland-grab-keyboard.c index 66c80d809..c3d6c68fa 100644 --- a/src/wayland/meta-xwayland-grab-keyboard.c +++ b/src/wayland/meta-xwayland-grab-keyboard.c @@ -182,8 +182,8 @@ application_is_in_pattern_array (MetaWindow *window, { GPatternSpec *pattern = (GPatternSpec *) g_ptr_array_index (pattern_array, i); - if (g_pattern_match_string (pattern, class) || - g_pattern_match_string (pattern, name)) + if (g_pattern_spec_match_string (pattern, class) || + g_pattern_spec_match_string (pattern, name)) return TRUE; }