[gnome-user-share] build: Remove uses of get_pkgconfig_variable
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-user-share] build: Remove uses of get_pkgconfig_variable
- Date: Fri, 15 Jul 2022 09:49:42 +0000 (UTC)
commit 3f6c312072b66630024441b2ee21dca43c1db38f
Author: Maximiliano Sandoval R <msandova gnome org>
Date: Thu Jul 14 22:06:13 2022 +0200
build: Remove uses of get_pkgconfig_variable
get_pkgconfig_variable will throw a warning on meson versions post 0.56.
Bumped glib and gio version to use
https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2517
meson.build | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/meson.build b/meson.build
index 7ccd034..1a71d26 100644
--- a/meson.build
+++ b/meson.build
@@ -55,22 +55,21 @@ endif
add_project_arguments(common_flags, language: 'c')
-gio_dep = dependency('gio-2.0', version: '>= 2.26')
+gio_dep = dependency('gio-2.0', version: '>= 2.71.3')
gio_unix_dep = dependency('gio-unix-2.0')
-glib_dep = dependency('glib-2.0', version: '>= 2.58')
+glib_dep = dependency('glib-2.0', version: '>= 2.71.3')
gtk_dep = dependency('gtk+-3.0')
# GIO schemas
-gio_schemasdir = gio_dep.get_pkgconfig_variable(
- 'schemasdir',
- define_variable: ['datadir', user_share_prefix / user_share_datadir],
- default: user_share_prefix / user_share_datadir / 'glib-2.0/schemas',
+gio_schemasdir = gio_dep.get_variable(
+ pkgconfig: 'schemasdir',
+ pkgconfig_define: ['datadir', user_share_prefix / user_share_datadir]
)
# systemd user unit directory
systemd_systemduserunitdir = get_option('systemduserunitdir')
if systemd_systemduserunitdir == ''
- systemd_systemduserunitdir = dependency('systemd').get_pkgconfig_variable('systemduserunitdir')
+ systemd_systemduserunitdir = dependency('systemd').get_variable(pkgconfig: 'systemduserunitdir')
endif
httpd = find_program(get_option('httpd'), required: false)
@@ -103,7 +102,10 @@ modules_path = get_option('modules_path')
# Check for nautilus for the share bar
libnautilus_extension_dep = dependency('libnautilus-extension', version: '>= 3.27.90')
-libnautilus_extension_extensiondir = libnautilus_extension_dep.get_pkgconfig_variable('extensiondir',
define_variable: ['libdir', user_share_prefix / user_share_libdir])
+libnautilus_extension_extensiondir = libnautilus_extension_dep.get_variable(
+ pkgconfig: 'extensiondir',
+ pkgconfig_define: ['libdir', user_share_prefix / user_share_libdir]
+)
message('installing nautilus plugin in: ' + libnautilus_extension_extensiondir)
subdir('data')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]