From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 10926158087 for ; Tue, 25 Jan 2022 02:16:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 87ACEE07AE; Tue, 25 Jan 2022 02:15:59 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 154E1E07A5 for ; Tue, 25 Jan 2022 02:15:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 078C3342BBC for ; Tue, 25 Jan 2022 02:15:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AB6AD0 for ; Tue, 25 Jan 2022 02:15:50 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1643075935.38229adac7d9e6b52828f83a5cc3ac6761c9a93e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/bijiben/files/, app-misc/bijiben/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/bijiben/bijiben-40.1.ebuild app-misc/bijiben/files/bijiben-40.1-meson-0.61.patch X-VCS-Directories: app-misc/bijiben/files/ app-misc/bijiben/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 38229adac7d9e6b52828f83a5cc3ac6761c9a93e X-VCS-Branch: master Date: Tue, 25 Jan 2022 02:15:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 55bf1299-a986-40d0-9866-471f56f74d76 X-Archives-Hash: 4f1a1e9409695e1926e6c07a97af1ccd commit: 38229adac7d9e6b52828f83a5cc3ac6761c9a93e Author: Sam James gentoo org> AuthorDate: Tue Jan 25 01:58:55 2022 +0000 Commit: Sam James gentoo 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 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 +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