commit: 251a5eaab6db713f85ab69342c1ceef85526834a Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Mon Jan 24 22:53:45 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 25 00:49:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251a5eaa
dev-vcs/gitg: fix build with meson-0.61 Closes: https://bugs.gentoo.org/831666 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/41-fix-build-with-meson-0.61.1.patch | 38 ++++++++++++++++++++++ dev-vcs/gitg/gitg-41.ebuild | 4 +++ 2 files changed, 42 insertions(+) diff --git a/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch new file mode 100644 index 000000000000..0467f7d1ad89 --- /dev/null +++ b/dev-vcs/gitg/files/41-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,38 @@ +https://gitlab.gnome.org/GNOME/gitg/-/commit/1978973b12848741b08695ec2020bac98584d636 +https://bugs.gentoo.org/831666 + +From: Jan Beich <[email protected]> +Date: Mon, 24 Jan 2022 12:17:52 +0000 +Subject: [PATCH] meson: drop unused argument for i18n.merge_file() + +Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. + +data/meson.build:8:0: ERROR: Function does not take positional arguments. +data/meson.build:44:0: ERROR: Function does not take positional arguments. +--- + data/meson.build | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index a8b90fd1..2413531d 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -6,7 +6,6 @@ desktop_config = configuration_data() + desktop_config.set('icon', application_id) + desktop_config.set('binary', gitg_name) + i18n.merge_file( +- desktop, + type: 'desktop', + input: configure_file( + input: desktop + '.in.in', +@@ -42,7 +41,6 @@ appdata_config = configuration_data() + appdata_config.set('app-id', application_id) + appdata_config.set('gettext', gitg_name) + i18n.merge_file( +- appdata, + type: 'xml', + input: configure_file( + input: appdata + '.in.in', +-- +GitLab + diff --git a/dev-vcs/gitg/gitg-41.ebuild b/dev-vcs/gitg/gitg-41.ebuild index 37bca5db740d..1474422be37b 100644 --- a/dev-vcs/gitg/gitg-41.ebuild +++ b/dev-vcs/gitg/gitg-41.ebuild @@ -48,6 +48,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch +) + src_prepare() { default vala_src_prepare
