[gentoo-commits] repo/gentoo:master commit in: media-sound/gnome-sound-recorder/, media-sound/gnome-sound-recorder/files/

[Sam James]

commit:     ec6f916ca52e7d3b3bc1b045de3d5e6c4732d014
Author:     Christophe Lermytte <gentoo <AT> lermytte <DOT> be>
AuthorDate: Mon Jan 24 22:03:31 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 00:49:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec6f916c

media-sound/gnome-sound-recorder: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831924
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/40.0-fix-build-with-meson-0.61.1.patch   | 43 ++++++++++++++++++++++
 .../gnome-sound-recorder-40.0.ebuild               |  4 ++
 2 files changed, 47 insertions(+)

diff --git a/media-sound/gnome-sound-recorder/files/40.0-fix-build-with-meson-0.61.1.patch b/media-sound/gnome-sound-recorder/files/40.0-fix-build-with-meson-0.61.1.patch
new file mode 100644
index 000000000000..0eea5fe096e9
--- /dev/null
+++ b/media-sound/gnome-sound-recorder/files/40.0-fix-build-with-meson-0.61.1.patch
@@ -0,0 +1,43 @@
+https://gitlab.gnome.org/GNOME/gnome-sound-recorder/-/commit/1335b1b1aff61167f8648f7cb3c569764031960d.patch
+https://bugs.gentoo.org/831924
+
+From: Jan Beich <jbeich@×××××××.org>
+Date: Mon, 24 Jan 2022 11:37:06 +0000
+Subject: [PATCH] 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/appdata/meson.build:5:0: ERROR: Function does not take positional arguments.
+data/meson.build:16:0: ERROR: Function does not take positional arguments.
+---
+ data/appdata/meson.build | 1 -
+ data/meson.build         | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/data/appdata/meson.build b/data/appdata/meson.build
+index 1f5744e..d2c2c3a 100644
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -3,7 +3,6 @@ metainfo_conf.set('app-id', application_id)
+ metainfo_conf.set('gettext-package', gettext_package)
+ 
+ metainfo_file = i18n.merge_file(
+-  'metainfo-file',
+   input: configure_file(
+   	input: 'org.gnome.SoundRecorder.metainfo.xml.in.in',
+   	output: '@BASENAME@',
+diff --git a/data/meson.build b/data/meson.build
+index 44117ad..0ff8fa5 100644
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -14,7 +14,6 @@ install_data(
+ desktop_conf = configuration_data()
+ desktop_conf.set('app-id', application_id)
+ desktop_file = i18n.merge_file(
+-  'desktop',
+   input: configure_file(
+   	input: 'org.gnome.SoundRecorder.desktop.in.in',
+   	output: '@BASENAME@',
+-- 
+GitLab
+

diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
index a16fdea8099a..2ff9bf286ecc 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
+)
+
 pkg_setup() {
 	python-any-r1_pkg_setup
 }