From 3591fd2a6caaacf51fc114c1f7c861fc1f059a7b Mon Sep 17 00:00:00 2001
From: columbarius <co1umbarius@protonmail.com>
Date: Thu, 5 May 2022 22:07:32 +0200
Subject: [PATCH] meson: bump version and replace deprecated functions

---
 meson.build           | 10 +++++-----
 protocols/meson.build |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index 50665de4..3305a892 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@ project(
 	'c',
 	version: '0.5.0',
 	license: 'MIT',
-	meson_version: '>=0.50.0',
+	meson_version: '>=0.58.0',
 	default_options: ['c_std=c11', 'warning_level=2', 'werror=true'],
 )
 
@@ -25,7 +25,7 @@ inc = include_directories('include')
 rt = cc.find_library('rt')
 pipewire = dependency('libpipewire-0.3', version: '>= 0.3.41')
 wayland_client = dependency('wayland-client')
-wayland_protos = dependency('wayland-protocols', version: '>=1.14')
+wayland_protos = dependency('wayland-protocols', version: '>=1.24')
 iniparser = dependency('inih')
 gbm = dependency('gbm')
 drm = dependency('libdrm')
@@ -112,8 +112,8 @@ systemd = dependency('systemd', required: get_option('systemd'))
 
 if systemd.found()
 	systemd_service_file = 'xdg-desktop-portal-wlr.service'
-	user_unit_dir = systemd.get_pkgconfig_variable('systemduserunitdir',
-		define_variable: ['prefix', get_option('prefix')])
+	user_unit_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir',
+		pkgconfig_define: ['prefix', get_option('prefix')])
 	conf_data.set('systemd_service', 'SystemdService=' + systemd_service_file)
 
 	configure_file(
@@ -149,7 +149,7 @@ if scdoc.found()
 			input: files(src),
 			output: output,
 			command: [
-				'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_pkgconfig_variable('scdoc'), output)
+				'sh', '-c', '@0@ < @INPUT@ > @1@'.format(scdoc.get_variable(pkgconfig: 'scdoc'), output)
 			],
 			install: true,
 			install_dir: join_paths(get_option('mandir'), 'man' + section),
diff --git a/protocols/meson.build b/protocols/meson.build
index ee4aed1d..f4a76ae2 100644
--- a/protocols/meson.build
+++ b/protocols/meson.build
@@ -3,7 +3,7 @@ wl_protocol_dir = wayland_protos.get_variable('pkgdatadir')
 wayland_scanner_dep = dependency('wayland-scanner', required: false, native: true)
 if wayland_scanner_dep.found()
 	wayland_scanner = find_program(
-		wayland_scanner_dep.get_pkgconfig_variable('wayland_scanner'),
+		wayland_scanner_dep.get_variable(pkgconfig: 'wayland_scanner'),
 		native: true,
 	)
 else