commit: b50b24b5fa3e06e28b5a227a845005e11c6712ff Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Mon Jan 24 22:08:47 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 25 00:49:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b50b24b5
www-client/epiphany: fix build with meson-0.61 Closes: https://bugs.gentoo.org/831923 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Signed-off-by: Sam James <sam <AT> gentoo.org> www-client/epiphany/epiphany-41.3.ebuild | 1 + .../files/41.3-fix-build-with-meson-0.61.1.patch | 35 ++++++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/www-client/epiphany/epiphany-41.3.ebuild b/www-client/epiphany/epiphany-41.3.ebuild index f64e9c5a230e..a49751cb9e30 100644 --- a/www-client/epiphany/epiphany-41.3.ebuild +++ b/www-client/epiphany/epiphany-41.3.ebuild @@ -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() { diff --git a/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch b/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch new file mode 100644 index 000000000000..7b521c052574 --- /dev/null +++ b/www-client/epiphany/files/41.3-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,35 @@ +https://gitlab.gnome.org/GNOME/epiphany/-/commit/bfbb5f7bab38301d8a4a444173acdae8d9692146 +https://bugs.gentoo.org/831923 + +From: rvalue <[email protected]> +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 +
