[gnome-kiosk: 1/2] meson: Remove incorrect args for i18n.merge_file




commit b800ff03510a5f0d239da16258a9283f74053e97
Author: Acid Xeon <xeonacid protonmail com>
Date:   Tue Dec 28 14:42:13 2021 +0000

    meson: Remove incorrect args for i18n.merge_file
    
    `i18n.merge_file` has been ignoring positional arguments for a time and explicitly rejects with error 
since meson 0.60.0.

 meson.build | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meson.build b/meson.build
index c47215b..703203b 100644
--- a/meson.build
+++ b/meson.build
@@ -183,7 +183,7 @@ desktop_file = configure_file(
         configuration: desktop_config_data
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: desktop_file,
         output: 'org.gnome.Kiosk.Script.desktop',
         po_dir: po_dir,
@@ -208,7 +208,7 @@ install_data('kiosk-script/gnome-session/gnome-kiosk-script.session',
         install_dir: session_dir,
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: 'kiosk-script/xsessions/gnome-kiosk-script-xorg.desktop.in',
         output: '@BASENAME@',
         po_dir: po_dir,
@@ -217,7 +217,7 @@ i18n.merge_file('desktop',
         type: 'desktop'
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: 'kiosk-script/wayland-sessions/gnome-kiosk-script-wayland.desktop.in',
         output: '@BASENAME@',
         po_dir: po_dir,
@@ -237,7 +237,7 @@ session_file = configure_file(
 
 subdir('input-selector')
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: session_file,
         output: 'org.gnome.Kiosk.SearchApp.session',
         po_dir: po_dir,
@@ -246,7 +246,7 @@ i18n.merge_file('desktop',
         type: 'desktop'
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: 'search-app/org.gnome.Kiosk.SearchApp.Session.desktop.in',
         output: 'org.gnome.Kiosk.SearchApp.Session.desktop',
         po_dir: po_dir,
@@ -261,7 +261,7 @@ search_app_desktop_file = configure_file(
         configuration: desktop_config_data
 )
 
-i18n.merge_file('desktop',
+i18n.merge_file(
         input: search_app_desktop_file,
         output: 'org.gnome.Kiosk.SearchApp.desktop',
         po_dir: po_dir,


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