commit: f844ba75b62115c7045e059226eb74dd441aa914 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jan 20 14:54:10 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jan 20 14:54:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f844ba75
media-gfx/entangle: fix build with meson 0.61 Closes: https://bugs.gentoo.org/831581 Signed-off-by: Sam James <sam <AT> gentoo.org> media-gfx/entangle/entangle-3.0.ebuild | 6 +++- .../files/entangle-3.0-fix-meson-0.61-build.patch | 32 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/media-gfx/entangle/entangle-3.0.ebuild b/media-gfx/entangle/entangle-3.0.ebuild index a86a9e92e53b..cc06e89278bc 100644 --- a/media-gfx/entangle/entangle-3.0.ebuild +++ b/media-gfx/entangle/entangle-3.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -45,6 +45,10 @@ BDEPEND=" sys-devel/gettext virtual/pkgconfig" +PATCHES=( + "${FILESDIR}"/${P}-fix-meson-0.61-build.patch +) + src_compile() { # prevent gst from loading system plugins which causes # sandbox violations on device access diff --git a/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch b/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch new file mode 100644 index 000000000000..ba2d1addfb13 --- /dev/null +++ b/media-gfx/entangle/files/entangle-3.0-fix-meson-0.61-build.patch @@ -0,0 +1,32 @@ +https://gitlab.com/entangle/entangle/-/commit/54795d275a93e94331a614c8712740fcedbdd4f0.patch +https://bugs.gentoo.org/831581 + +From: EorlBruder <[email protected]> +Date: Wed, 12 Jan 2022 11:27:50 +0100 +Subject: [PATCH] meson: fix build for meson >=0.60.0 + +Replaced the positional arguments in i18n.merge_files with the +data_dirs-keyword + +Fixes #67 +--- a/src/meson.build ++++ b/src/meson.build +@@ -40,7 +40,7 @@ appname = 'org.entangle_photo.Manager' + desktop = appname + '.desktop' + + i18n.merge_file ( +- desktop, ++ data_dirs: desktop, + type: 'desktop', + input: desktop, + output: desktop, +@@ -60,7 +60,7 @@ metainfotmp = custom_target('gen-metadata', + '@INPUT@', '@OUTPUT@']) + + i18n.merge_file( +- metainfo, ++ data_dirs: metainfo, + input: metainfotmp, + output: metainfo, + install: true, +GitLab
