[gentoo-commits] repo/gentoo:master commit in: dev-util/d-feet/, dev-util/d-feet/files/

[gentoo-commits] repo/gentoo:master commit in: dev-util/d-feet/, dev-util/d-feet/files/

[Sam James]

commit:     9e504fe8c23d104f4b274154070901ba88915e2f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 01:11:26 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 01:11:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e504fe8

dev-util/d-feet: fix build with meson 0.61

Closes: https://bugs.gentoo.org/831524
Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/d-feet/d-feet-0.3.16.ebuild               |  6 ++++-
 .../files/d-feet-0.3.16-fix-meson-0.61.patch       | 31 ++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/dev-util/d-feet/d-feet-0.3.16.ebuild b/dev-util/d-feet/d-feet-0.3.16.ebuild
index 7a9d65104598..346847660580 100644
--- a/dev-util/d-feet/d-feet-0.3.16.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.16.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
@@ -37,6 +37,10 @@ BDEPEND="
 	test? ( dev-python/pycodestyle )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.3.16-fix-meson-0.61.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		$(meson_use test tests)

diff --git a/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch b/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch
new file mode 100644
index 000000000000..064f94105882
--- /dev/null
+++ b/dev-util/d-feet/files/d-feet-0.3.16-fix-meson-0.61.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/d-feet/-/merge_requests/32
+https://bugs.gentoo.org/831524
+
+From 05465d486afdba116dbc22fc22c1e6573aea4f22 Mon Sep 17 00:00:00 2001
+From: Jan Beich <jbeich@FreeBSD.org>
+Date: Mon, 24 Jan 2022 12:11:57 +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/meson.build:15:0: ERROR: Function does not take positional arguments.
+data/meson.build:27:0: ERROR: Function does not take positional arguments.
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -13,7 +13,6 @@ desktop_in = configure_file(
+ )
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: desktop_in,
+   output: '@BASENAME@',
+@@ -25,7 +24,6 @@ i18n.merge_file(
+ appdata = df_namespace + '.appdata.xml'
+ 
+ i18n.merge_file(
+-  appdata,
+   input: appdata + '.in',
+   output: '@BASENAME@',
+   po_dir: po_dir,
+GitLab