[gentoo-commits] repo/gentoo:master commit in: app-misc/bijiben/files/, app-misc/bijiben/

[gentoo-commits] repo/gentoo:master commit in: app-misc/bijiben/files/, app-misc/bijiben/

[Sam James]

commit:     38229adac7d9e6b52828f83a5cc3ac6761c9a93e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 25 01:58:55 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 25 01:58:55 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38229ada

app-misc/bijiben: fix build with meson 0.61

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

 app-misc/bijiben/bijiben-40.1.ebuild               |  6 +++-
 .../bijiben/files/bijiben-40.1-meson-0.61.patch    | 38 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/app-misc/bijiben/bijiben-40.1.ebuild b/app-misc/bijiben/bijiben-40.1.ebuild
index d0fada65c229..261b6eea5d78 100644
--- a/app-misc/bijiben/bijiben-40.1.ebuild
+++ b/app-misc/bijiben/bijiben-40.1.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
@@ -36,6 +36,10 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-40.1-meson-0.61.patch
+)
+
 src_configure() {
 	local emesonargs=(
 		-Dupdate_mimedb=false

diff --git a/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch b/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch
new file mode 100644
index 000000000000..63584fc81464
--- /dev/null
+++ b/app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch
@@ -0,0 +1,38 @@
+https://gitlab.gnome.org/GNOME/gnome-notes/-/merge_requests/158.patch
+https://bugs.gentoo.org/831929
+
+From 01ccae2ccb640b2d33fd09c3dfb7d605830b5b0f Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 22 Jan 2022 23:16:37 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+--- a/data/appdata/meson.build
++++ b/data/appdata/meson.build
+@@ -1,7 +1,6 @@
+ info = 'org.gnome.Notes.appdata.xml'
+ 
+ i18n.merge_file(
+-  info,
+   input: info + '.in',
+   output: info,
+   po_dir: po_dir,
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -4,7 +4,6 @@ subdir('appdata')
+ mime = 'org.gnome.Notes.xml'
+ 
+ i18n.merge_file(
+-  mime,
+   input: mime + '.in',
+   output: mime,
+   po_dir: po_dir,
+@@ -18,7 +17,6 @@ desktop_conf = configuration_data()
+ desktop_conf.set ('icon', application_id)
+ 
+ i18n.merge_file(
+-  desktop,
+   type: 'desktop',
+   input: configure_file(
+     input: files (desktop + '.in'),
+GitLab