[gentoo-commits] repo/gentoo:master commit in: media-gfx/gnome-font-viewer/, media-gfx/gnome-font-viewer/files/

[Sam James]

commit:     137d19b835fb24b1c880bac57455c66805fbb1b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 17:23:47 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 17:23:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=137d19b8

media-gfx/gnome-font-viewer: fix build with meson 0.61

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

 ...ome-font-viewer-41.0-fix-meson-0.61-build.patch | 31 ++++++++++++++++++++++
 .../gnome-font-viewer-41.0.ebuild                  |  6 ++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch b/media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch
new file mode 100644
index 000000000000..545f294206a7
--- /dev/null
+++ b/media-gfx/gnome-font-viewer/files/gnome-font-viewer-41.0-fix-meson-0.61-build.patch
@@ -0,0 +1,31 @@
+https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/commit/218166246e29a39e2eac8d3f06976038571b0603
+https://bugs.gentoo.org/831639
+
+From: r-value <i@××××××.moe>
+Date: Thu, 30 Dec 2021 17:14:47 +0800
+Subject: [PATCH] Fix meson build with meson 0.60.0+
+
+`i18n.merge_file` has been ignoring positional arguments for a time
+and explicitly rejects with error since meson 0.60.0
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -1,6 +1,6 @@
+ appdatadir = join_paths(datadir, 'metainfo')
+ appdata_file = 'org.gnome.font-viewer.appdata.xml'
+-merged_appdata = i18n.merge_file(appdata_file,
++merged_appdata = i18n.merge_file(
+   input: appdata_file + '.in',
+   output: appdata_file,
+   po_dir: '../po',
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -39,7 +39,7 @@ desktop_file = 'org.gnome.font-viewer.desktop'
+ desktop_conf = configuration_data()
+ desktop_conf.set('VERSION', meson.project_version())
+ desktop_conf.set('APPLICATION_ID', application_id)
+-i18n.merge_file(desktop_file,
++i18n.merge_file(
+   input: configure_file(input: desktop_file + '.in.in',
+     output: desktop_file + '.in',
+     configuration: desktop_conf),
+GitLab

diff --git a/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild b/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
index 44bd6932c563..8198ca052745 100644
--- a/media-gfx/gnome-font-viewer/gnome-font-viewer-41.0.ebuild
+++ b/media-gfx/gnome-font-viewer/gnome-font-viewer-41.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
@@ -27,3 +27,7 @@ BDEPEND="
 	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
 "
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-meson-0.61-build.patch
+)