Backport patch from upstream to fix FBTFS with Meson 0.61

Closes: #1005534

debian/changelog

@@ -1,3 +1,12 @@
+gnome-shell-extensions (41.1-2) unstable; urgency=medium
+
+  * Team upload
+  * d/p/meson-Drop-unused-argument-for-i18n.merge_file.patch:
+    Backport patch from upstream to fix FBTFS with Meson 0.61
+    (Closes: #1005534)
+
+ -- Simon McVittie <smcv@debian.org>  Tue, 15 Feb 2022 11:18:30 +0000
+
 gnome-shell-extensions (41.1-1) unstable; urgency=medium
 
   * New upstream release

debian/patches/gnome-session-classic-wrapper-script.patch

@@ -16,7 +16,7 @@ as a workaround. Once [1] is fixed, this should be removed again.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/data/gnome-classic.desktop.in b/data/gnome-classic.desktop.in
-index 5df6821..34827ee 100644
+index 13da2b5..d627655 100644
 --- a/data/gnome-classic.desktop.in
 +++ b/data/gnome-classic.desktop.in
 @@ -1,7 +1,7 @@

debian/patches/meson-Drop-unused-argument-for-i18n.merge_file.patch

@@ -0,0 +1,26 @@
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Tue, 25 Jan 2022 11:49:54 +0000
+Subject: 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.
+
+data/meson.build:23:0: ERROR: Function does not take positional arguments.
+
+Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/merge_requests/210>
+Origin: backport, 42.beta, commit:cdaa837d48894737ca0b4e7d2dfb365119e53759
+Bug-Debian: https://bugs.debian.org/1005534
+---
+ data/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index 27f4287..a4bcd5e 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,5 +1,5 @@
+ session_desktop = 'gnome-classic.desktop'
+-i18n.merge_file('',
++i18n.merge_file(
+   input:  session_desktop + '.in',
+   output: session_desktop,
+   po_dir: '../po',

debian/patches/series

@@ -1 +1,2 @@
 gnome-session-classic-wrapper-script.patch
+meson-Drop-unused-argument-for-i18n.merge_file.patch