[eog: 14/21] build: Use dictionaries in configuration_data objects

[Felix Riemann <friemann src gnome org>]

commit 4b55ebef2501543201e2310bfbd0e9a6126d42e0
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Fri Jun 28 08:28:13 2019 +0200

    build: Use dictionaries in configuration_data objects
    
    Since 0.49.0[0], a dictionary could be used as a replacement for
    each key/value pair as if `set` method was called for each of them.
    
    Almost all of the `configuration_data` objects have been changed to
    use a dictionary.
    
    [0] http://mesonbuild.com/Reference-manual.html#configuration_data

 data/meson.build          | 10 ++--------
 doc/reference/meson.build |  5 +----
 tests/meson.build         |  9 +++++----
 3 files changed, 8 insertions(+), 16 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 482e4a92..16a3d724 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -14,15 +14,12 @@ resource_data = files(
   'popup-menus.ui',
 )
 
-desktop_conf = configuration_data()
-desktop_conf.set('VERSION', eog_version)
-
 desktop = 'eog.desktop'
 
 desktop_in = configure_file(
   input: desktop + '.in.in',
   output: desktop + '.in',
-  configuration: desktop_conf,
+  configuration: {'VERSION': eog_version},
 )
 
 i18n.merge_file(
@@ -46,15 +43,12 @@ i18n.merge_file(
   install_dir: eog_datadir / 'metainfo',
 )
 
-schema_conf = configuration_data()
-schema_conf.set('GETTEXT_PACKAGE', meson.project_name())
-
 schema = 'org.gnome.eog.gschema.xml'
 
 configure_file(
   input: schema + '.in',
   output: schema,
-  configuration: schema_conf,
+  configuration: {'GETTEXT_PACKAGE': meson.project_name()},
   install: true,
   install_dir: gio_schemasdir,
 )
diff --git a/doc/reference/meson.build b/doc/reference/meson.build
index d9550418..08fc4a7c 100644
--- a/doc/reference/meson.build
+++ b/doc/reference/meson.build
@@ -21,15 +21,12 @@ if not enable_libexif
   private_headers += 'eog-exif-util.h'
 endif
 
-version_conf = configuration_data()
-version_conf.set('VERSION', eog_version)
-
 version_xml = 'version.xml'
 
 configure_file(
   input: version_xml + '.in',
   output: version_xml,
-  configuration: version_conf,
+  configuration: {'VERSION': eog_version},
 )
 
 gnome.gtkdoc(
diff --git a/tests/meson.build b/tests/meson.build
index fe99c6ba..f72990c0 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -30,15 +30,16 @@ test_names = [
 ]
 
 foreach test_name: test_names
-  tests_conf = configuration_data()
-  tests_conf.set('TESTS_PATH', tests_execdir)
-  tests_conf.set('TEST_NAME', test_name)
+  tests_conf = {
+    'TESTS_PATH': tests_execdir,
+    'TEST_NAME': test_name,
+  }
 
   configure_file(
     input: 'template.test.in',
     output: test_name + '.test',
+    configuration: tests_conf,
     install: true,
     install_dir: tests_metadir,
-    configuration: tests_conf,
   )
 endforeach