commit: 4382ae869f3836f5bca74d9ce975881dff9fa0cf Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Mon Jan 24 21:31:08 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jan 25 00:49:03 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4382ae86
media-video/totem: fix build with meson-0.61 Closes: https://bugs.gentoo.org/831931 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/3.38.2-fix-build-with-meson-0.61.1.patch | 41 ++++++++++++++++++++++ media-video/totem/totem-3.38.2.ebuild | 1 + 2 files changed, 42 insertions(+) diff --git a/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch b/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch new file mode 100644 index 000000000000..da494e2b61b4 --- /dev/null +++ b/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,41 @@ +https://gitlab.gnome.org/GNOME/totem/-/commit/61e3a957cb7339c6614e764fcf1120d967d687e9 +https://bugs.gentoo.org/831931 + +From: Bastien Nocera <[email protected]> +Date: Thu, 6 Jan 2022 17:21:28 +0100 +Subject: [PATCH] build: Remove unused i18n.merge_file() "name" + +data/meson.build:78:0: ERROR: Function does not take positional arguments. +data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments. +--- + data/appdata/meson.build | 1 - + data/meson.build | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/data/appdata/meson.build b/data/appdata/meson.build +index c4d17e927..c2e646327 100644 +--- a/data/appdata/meson.build ++++ b/data/appdata/meson.build +@@ -1,7 +1,6 @@ + appdata = 'org.gnome.Totem.appdata.xml' + + appdata_file = i18n.merge_file ( +- 'appdata', + input: appdata + '.in', + output: appdata, + install: true, +diff --git a/data/meson.build b/data/meson.build +index b31ce755c..8eebe3db1 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -76,7 +76,6 @@ desktop_in = configure_file( + ) + + desktop_file = i18n.merge_file ( +- desktop, + type: 'desktop', + input: desktop_in, + output: desktop, +-- +GitLab + diff --git a/media-video/totem/totem-3.38.2.ebuild b/media-video/totem/totem-3.38.2.ebuild index 1f81efbd3f0a..086dd67eb632 100644 --- a/media-video/totem/totem-3.38.2.ebuild +++ b/media-video/totem/totem-3.38.2.ebuild @@ -74,6 +74,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/3.38.0-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue) + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch ) pkg_setup() {
