www-client/epiphany: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831923
Signed-off-by: Christophe Lermytte <gentoo@lermytte.be>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Christophe Lermytte
2022-01-24 23:08:47 +01:00
committed by Sam James
parent ec6f916ca5
commit b50b24b5fa
2 changed files with 36 additions and 0 deletions

View File

@@ -50,6 +50,7 @@ BDEPEND="
PATCHES=(
# Allow /var/tmp prefixed recursive delete (due to package manager setting TMPDIR)
"${FILESDIR}"/var-tmp-tests.patch
"${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch
)
src_configure() {

View File

@@ -0,0 +1,35 @@
https://gitlab.gnome.org/GNOME/epiphany/-/commit/bfbb5f7bab38301d8a4a444173acdae8d9692146
https://bugs.gentoo.org/831923
From: rvalue <i@rvalue.moe>
Date: Wed, 24 Nov 2021 04:52:42 +0000
Subject: [PATCH] Remove incorrect args for i18n.merge_file
Part-of: <https://gitlab.gnome.org/GNOME/epiphany/-/merge_requests/1031>
---
data/meson.build | 2 --
1 file changed, 2 deletions(-)
diff --git a/data/meson.build b/data/meson.build
index 46df3fd80..eac6b8224 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -16,7 +16,6 @@ install_data(
desktop_conf = configuration_data()
desktop_conf.set('icon', application_id)
desktop = i18n.merge_file(
- 'desktop',
input: configure_file(
input: files('org.gnome.Epiphany.desktop.in.in'),
output: 'org.gnome.Epiphany.desktop.in',
@@ -32,7 +31,6 @@ desktop = i18n.merge_file(
appdata_conf = configuration_data()
appdata_conf.set('appid', application_id)
appdata = i18n.merge_file(
- 'appdata',
input: configure_file(
input: files('org.gnome.Epiphany.appdata.xml.in.in'),
output: 'org.gnome.Epiphany.appdata.xml.in',
--
GitLab