[gnome-build-meta/abderrahim/fdsdk-master: 5/7] core-deps/malcontent.bst: backport patch to fix build with newer meson

[Jordan Petridis <jpetridis src gnome org>]

commit 6fc3ed5f7336848745708b10681e62fc87b29ea5
Author: Abderrahim Kitouni <akitouni gnome org>
Date:   Mon Mar 7 10:11:07 2022 +0100

    core-deps/malcontent.bst: backport patch to fix build with newer meson

 elements/core-deps/malcontent.bst                  |  2 +
 ...-superfluous-arguments-to-i18n.merge_file.patch | 57 ++++++++++++++++++++++
 2 files changed, 59 insertions(+)
---
diff --git a/elements/core-deps/malcontent.bst b/elements/core-deps/malcontent.bst
index 2257f6828..33aef7d56 100644
--- a/elements/core-deps/malcontent.bst
+++ b/elements/core-deps/malcontent.bst
@@ -3,6 +3,8 @@ kind: meson
 sources:
 - kind: tar
   url: tecnocode:malcontent-0.10.1.tar.xz
+- kind: patch
+  path: files/malcontent/Remove-superfluous-arguments-to-i18n.merge_file.patch
 
 build-depends:
 - core-deps/glib-testing.bst
diff --git a/files/malcontent/Remove-superfluous-arguments-to-i18n.merge_file.patch 
b/files/malcontent/Remove-superfluous-arguments-to-i18n.merge_file.patch
new file mode 100644
index 000000000..145ae2d90
--- /dev/null
+++ b/files/malcontent/Remove-superfluous-arguments-to-i18n.merge_file.patch
@@ -0,0 +1,57 @@
+From f433aaf8c8f82f0aeaedee664f08bc6fcad47b0d Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka exherbo org>
+Date: Wed, 12 Jan 2022 23:45:53 +0100
+Subject: [PATCH] Remove superfluous arguments to i18n.merge_file
+
+It fixes the build with meson 0.61.0. The positional argument was
+ignored in the past, became a warning in meson 0.60 and a hard error
+starting with 0.61.0.
+---
+ accounts-service/meson.build   | 2 +-
+ malcontent-control/meson.build | 6 +++---
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/accounts-service/meson.build b/accounts-service/meson.build
+index 6942d2b..198692c 100644
+--- a/accounts-service/meson.build
++++ b/accounts-service/meson.build
+@@ -1,4 +1,4 @@
+-i18n.merge_file('com.endlessm.ParentalControls.policy',
++i18n.merge_file(
+   input: 'com.endlessm.ParentalControls.policy.in',
+   output: 'com.endlessm.ParentalControls.policy',
+   po_dir: po_dir,
+diff --git a/malcontent-control/meson.build b/malcontent-control/meson.build
+index 8263306..d4ef3c1 100644
+--- a/malcontent-control/meson.build
++++ b/malcontent-control/meson.build
+@@ -36,7 +36,7 @@ malcontent_control = executable('malcontent-control',
+   install: true,
+ )
+ 
+-desktop_file = i18n.merge_file('desktop-file',
++desktop_file = i18n.merge_file(
+   type: 'desktop',
+   input: '@0  desktop in'.format(application_id),
+   output: '@0@.desktop'.format(application_id),
+@@ -57,7 +57,7 @@ if desktop_file_validate.found()
+   )
+ endif
+ 
+-appdata_file = i18n.merge_file('appdata-file',
++appdata_file = i18n.merge_file(
+   input: '@0  appdata xml in'.format(application_id),
+   output: '@0  appdata xml'.format(application_id),
+   po_dir: join_paths(meson.current_source_dir(), '..', 'po'),
+@@ -94,7 +94,7 @@ if xmllint.found()
+   )
+ endif
+ 
+-policy_file = i18n.merge_file('policy-file',
++policy_file = i18n.merge_file(
+   input: '@0  policy in'.format(application_id),
+   output: '@0@.policy'.format(application_id),
+   po_dir: join_paths(meson.current_source_dir(), '..', 'po'),
+-- 
+GitLab
+