[eog: 8/11] build: Use get_variable method
- From: Felix Riemann <friemann src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [eog: 8/11] build: Use get_variable method
- Date: Wed, 29 Dec 2021 14:45:58 +0000 (UTC)
commit 1e4d3268de04e79c351fbe70d770ae6e8137d684
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Wed Oct 27 11:44:37 2021 +0200
build: Use get_variable method
Since meson 0.51 dependencies have a new generic `get_variable`
method[0], and in meson 0.56 the older `get_pkgconfig_variable` has
been deprecated[1].
All the calls to deprecated `get_pkgconfig_variable` have been
replaced by `get_variable`.
[0] https://mesonbuild.com/Release-notes-for-0-51-0.html#dependency-objects-now-have-a-get_variable-method
[1]
https://mesonbuild.com/Release-notes-for-0-56-0.html#deprecate-dependencyget_pkgconfig_variable-and-dependencyget_configtool_variable
meson.build | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meson.build b/meson.build
index 86e4c321..89e88d02 100644
--- a/meson.build
+++ b/meson.build
@@ -125,10 +125,10 @@ common_deps = [
dependency('libpeas-1.0', version: peas_req_version),
]
-gio_schemasdir = gio_dep.get_pkgconfig_variable(
+gio_schemasdir = gio_dep.get_variable(
'schemasdir',
- define_variable: ['datadir', eog_prefix / eog_datadir],
- default: eog_datadir / 'glib-2.0/schemas',
+ pkgconfig_define: ['datadir', eog_prefix / eog_datadir],
+ default_value: eog_datadir / 'glib-2.0/schemas',
)
# ZLIB support (required)
@@ -218,7 +218,7 @@ config_h.set('HAVE_RSVG', enable_librsvg)
# libX11 (required for TotemScrSaver and Color Profiling)
gdk_dep = dependency('gdk-3.0', required: false)
-enable_x11 = enable_cms or (gdk_dep.found() and gdk_dep.get_pkgconfig_variable('targets').contains('x11'))
+enable_x11 = enable_cms or (gdk_dep.found() and gdk_dep.get_variable('targets').contains('x11'))
if enable_x11
x11_dep = dependency('x11')
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]