meson: drop unused argument for i18n.merge_file()

Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. panels/applications/meson.build:10:5: ERROR: Function does not take positional arguments. panels/background/meson.build:10:5: ERROR: Function does not take positional arguments. panels/camera/meson.build:10:5: ERROR: Function does not take positional arguments. [...]
2022-01-07 01:53:52 +00:00 · 2022-01-07 01:53:52 +00:00 · 37b29c32cb
commit 37b29c32cb
parent 12fefbc0d7
35 changed files with 0 additions and 39 deletions
--- a/panels/applications/meson.build
+++ b/panels/applications/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-       desktop,
         type : 'desktop',
        input : desktop_in,
       output : desktop,
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/bluetooth/meson.build
+++ b/panels/bluetooth/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/camera/meson.build
+++ b/panels/camera/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/color/meson.build
+++ b/panels/color/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/datetime/meson.build
+++ b/panels/datetime/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
@ -20,7 +19,6 @@ i18n.merge_file(
 polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname)

 i18n.merge_file(
-  polkit,
  input: polkit + '.in',
  output: polkit,
  po_dir: po_dir,
--- a/panels/default-apps/meson.build
+++ b/panels/default-apps/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/diagnostics/meson.build
+++ b/panels/diagnostics/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/display/meson.build
+++ b/panels/display/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/info-overview/meson.build
+++ b/panels/info-overview/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/keyboard/meson.build
+++ b/panels/keyboard/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
@ -45,7 +44,6 @@ xml_files = [

 foreach file: xml_files
  i18n.merge_file(
-    file,
    input: file + '.in',
    output: file,
    po_dir: po_dir,
--- a/panels/location/meson.build
+++ b/panels/location/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/lock/meson.build
+++ b/panels/lock/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/microphone/meson.build
+++ b/panels/microphone/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/mouse/meson.build
+++ b/panels/mouse/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/multitasking/meson.build
+++ b/panels/multitasking/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/network/meson.build
+++ b/panels/network/meson.build
@ -25,7 +25,6 @@ foreach name: panel_names
  )

  i18n.merge_file(
-    desktop,
    type: 'desktop',
    input: desktop_in,
    output: desktop,
--- a/panels/notifications/meson.build
+++ b/panels/notifications/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/online-accounts/meson.build
+++ b/panels/online-accounts/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/power/meson.build
+++ b/panels/power/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/printers/meson.build
+++ b/panels/printers/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/region/meson.build
+++ b/panels/region/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/removable-media/meson.build
+++ b/panels/removable-media/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/search/meson.build
+++ b/panels/search/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/sharing/meson.build
+++ b/panels/sharing/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
@ -29,7 +28,6 @@ polkit_in = configure_file(
 )

 i18n.merge_file(
-  polkit,
  input: polkit_in,
  output: polkit,
  po_dir: po_dir,
--- a/panels/sound/meson.build
+++ b/panels/sound/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/thunderbolt/meson.build
+++ b/panels/thunderbolt/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/universal-access/meson.build
+++ b/panels/universal-access/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/usage/meson.build
+++ b/panels/usage/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
--- a/panels/user-accounts/meson.build
+++ b/panels/user-accounts/meson.build
@ -8,7 +8,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-  desktop,
  type: 'desktop',
  input: desktop_in,
  output: desktop,
@ -85,7 +84,6 @@ meson.add_install_script('sh', '-c',
 polkit = 'org.gnome.controlcenter.@0@.policy'.format(cappletname)

 i18n.merge_file(
-  polkit,
  input: polkit + '.in',
  output: polkit,
  po_dir: po_dir,
--- a/panels/wacom/meson.build
+++ b/panels/wacom/meson.build
@ -30,7 +30,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-       desktop,
         type : 'desktop',
        input : desktop_in,
       output : desktop,
--- a/panels/wwan/meson.build
+++ b/panels/wwan/meson.build
@ -12,7 +12,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-       desktop,
         type : 'desktop',
        input : desktop_in,
       output : desktop,
--- a/shell/appdata/meson.build
+++ b/shell/appdata/meson.build
@ -1,7 +1,6 @@
 appdata = 'gnome-control-center.appdata.xml'

 i18n.merge_file(
-  appdata,
  input: appdata + '.in',
  output: appdata,
  po_dir: po_dir,
--- a/shell/meson.build
+++ b/shell/meson.build
@ -23,7 +23,6 @@ desktop_in = configure_file(
 )

 i18n.merge_file(
-       desktop,
         type : 'desktop',
        input : desktop_in,
       output : desktop,
--- a/tests/interactive-panels/applications/meson.build
+++ b/tests/interactive-panels/applications/meson.build
@ -12,7 +12,6 @@ desktop_files = [

 foreach desktop_file : desktop_files
  i18n.merge_file(
-              desktop,
                type : 'desktop',
               input : 'gtp-@0@.desktop.in'.format(desktop_file),
              output : 'gnome-@0@-panel.desktop'.format(desktop_file),