[gnome-disk-utility] build: Use dictionaries in configuration_data objects



commit 69fa03c0eec9cd68dcc84a260e5026906f7e2031
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Thu Jul 4 07:40:30 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       | 5 +----
 src/notify/meson.build | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index 702fbc32..4c4fe35b 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -18,17 +18,14 @@ foreach desktop: desktops
   )
 endforeach
 
-service_conf = configuration_data()
-service_conf.set('bindir', gdu_prefix / gdu_bindir)
-
 service = 'org.gnome.DiskUtility.service'
 
 configure_file(
   input: service + '.in',
   output: service,
+  configuration: {'bindir': gdu_prefix / gdu_bindir},
   install: true,
   install_dir: gdu_datadir / 'dbus-1/services',
-  configuration: service_conf,
 )
 
 install_data(
diff --git a/src/notify/meson.build b/src/notify/meson.build
index e7698d78..bf0710bb 100644
--- a/src/notify/meson.build
+++ b/src/notify/meson.build
@@ -20,15 +20,12 @@ executable(
   install_dir: gdu_libexecdir,
 )
 
-desktop_conf = configuration_data()
-desktop_conf.set('libexecdir', gdu_prefix / gdu_libexecdir)
-
 desktop = 'org.gnome.SettingsDaemon.DiskUtilityNotify.desktop'
 
 configure_file(
   input: desktop + '.in',
   output: desktop,
-  configuration: desktop_conf,
+  configuration: {'libexecdir': gdu_prefix / gdu_libexecdir},
   install: true,
   install_dir: gdu_sysconfdir / 'xdg/autostart',
 )


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]