media-video/totem: fix build with meson-0.61

Closes: https://bugs.gentoo.org/831931
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 22:31:08 +01:00
committed by Sam James
parent bb777f201e
commit 4382ae869f
2 changed files with 42 additions and 0 deletions

View File

@@ -0,0 +1,41 @@
https://gitlab.gnome.org/GNOME/totem/-/commit/61e3a957cb7339c6614e764fcf1120d967d687e9
https://bugs.gentoo.org/831931
From: Bastien Nocera <hadess@hadess.net>
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

View File

@@ -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() {