[gnome-initial-setup/gnome-41] build: Fix Meson deprecation warning



commit ec386e6c6dcce53e42c5df543e9ace730669ab1d
Author: Will Thompson <will willthompson co uk>
Date:   Fri Dec 17 11:40:53 2021 +0000

    build: Fix Meson deprecation warning
    
        Configuring gnome-initial-setup-copy-worker.desktop.in using configuration
        DEPRECATION: i18n.merge_file does not take any positional arguments. This will become a hard error in 
the next Meson release.
        Configuring gnome-initial-setup-first-login.desktop.in using configuration
        DEPRECATION: i18n.merge_file does not take any positional arguments. This will become a hard error in 
the next Meson release.
        Configuring gnome-initial-setup.desktop.in using configuration
        DEPRECATION: i18n.merge_file does not take any positional arguments. This will become a hard error in 
the next Meson release.
    
    These invocations both correctly specify the 'type' keyword argument.
    
    (cherry picked from commit 6423c28949f667bd9a3a05f017c4b36fc5bf994b,
    having spotted Debian carrying this patch downstream)

 data/meson.build | 2 --
 1 file changed, 2 deletions(-)
---
diff --git a/data/meson.build b/data/meson.build
index ae8d9f95..31fa2f93 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -31,7 +31,6 @@ desktop_conf.set('systemd_hidden', enable_systemd ? 'true' : 'false')
 
 foreach desktop_file: autostart_files
     i18n.merge_file(
-        'desktop',
         input: configure_file(
             input: files(desktop_file + '.in.in'),
             output: desktop_file + '.in',
@@ -46,7 +45,6 @@ foreach desktop_file: autostart_files
 endforeach
 
 i18n.merge_file(
-    'desktop',
     input: configure_file(
         input: files('gnome-initial-setup.desktop.in.in'),
         output: 'gnome-initial-setup.desktop.in',


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