gentoo resync : 02.02.2022

3 files changed, 50 insertions, 2 deletions

diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 78dcbe08eb6b..439bc6d73bcd 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,3 +1,4 @@
+AUX 40.0-fix-build-with-meson-0.61.1.patch 1456 BLAKE2B 3326dd305dbb9ba2fb24de56d0d6d96507ac6d995f3b01ce2cbbe8fabda6a697e8a4f76043c75ea8415a751b547ef7a58a8d1bdfd8799855d5d1d846567b5bf6 SHA512 d409749979f8f2f07830ca36d902b886cd92daa47fa4fc23b837c988ed2fa272bfce63242bbc08b48e6e6df686139a220c3fb960008b0b7dcf929c0b9d3d9393
 DIST gnome-sound-recorder-40.0.tar.xz 199056 BLAKE2B e830b746ccf9e038a6f425dee9a6ef8eb88cd849659570c11364b833b0be8c7e7302c0b20e8c853d7228a589d6e3953fecf2fddb31304a1905678aa99b461248 SHA512 28de1dbb9251c834513be55c3f4107cd014d74e634e383e6feb3b9430ff562e19d29e9abcd566b0fc0ed1ec3841add0f694b47c51fe91a3b4ba33b9f43a0d617
-EBUILD gnome-sound-recorder-40.0.ebuild 1048 BLAKE2B 1ed337d3faf845a00bf860b032bbc10c0ce31d22914d6c39c2064e1d370b7b6cf53ea918090ab42f839f48400c7031d25a2b0026707a5dac78f57261364fb84a SHA512 a8b998f49f1dd357383f3cbbe39494a660bb0777a7add6f893fa39f52e0ef46f7ceb1bc6a472358a31760c17be98a2fb3c7b6f496e638882978b289ec31e52f1
+EBUILD gnome-sound-recorder-40.0.ebuild 1116 BLAKE2B 8598f16aa62a75219e15dc6c9249b14d80463c1814d89de996c6a58f2a4553ffd8a3e8544f7e1b21915455701c4c09a319e10e44bfa1039de55ad0ef03285ab9 SHA512 8499a041cf2d6cc1efc2a99d2eafac12f080f7176169579df21521b0eefb94909d074e09d1340f162de3d5673b97aeeae544700569b3cc14b89b7fa3a19784f4
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
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@FreeBSD.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..06371a510876 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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
 }