commit: cc80d63352181053f7ea6a793a6505561b1243ad Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Sun Feb 20 20:07:07 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Feb 20 21:12:30 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc80d633
gnome-extra/nautilus-sendto: fix build with meson 0.61 Closes: https://bugs.gentoo.org/831837 Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Closes: https://github.com/gentoo/gentoo/pull/24293 Signed-off-by: Sam James <sam <AT> gentoo.org> .../nautilus-sendto/files/fix-build-with-meson-0.61.patch | 12 ++++++++++++ gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/gnome-extra/nautilus-sendto/files/fix-build-with-meson-0.61.patch b/gnome-extra/nautilus-sendto/files/fix-build-with-meson-0.61.patch new file mode 100644 index 000000000000..556fab877bd1 --- /dev/null +++ b/gnome-extra/nautilus-sendto/files/fix-build-with-meson-0.61.patch @@ -0,0 +1,12 @@ +https://bugs.gentoo.org/831837 +--- a/src/meson.build ++++ b/src/meson.build +@@ -7,7 +7,7 @@ executable('nautilus-sendto', + + po_dir = join_paths(meson.source_root(), 'po') + +-i18n.merge_file ('appdata', ++i18n.merge_file ( + input: 'nautilus-sendto.metainfo.xml.in', + output: 'nautilus-sendto.metainfo.xml', + install: true, diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild index be615119ac23..988f463cb538 100644 --- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild +++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.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=6 @@ -19,6 +19,10 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/fix-build-with-meson-0.61.patch +) + pkg_postinst() { if ! has_version "gnome-base/nautilus[sendto]"; then einfo "Note that ${CATEGORY}/${PN} is meant to be used as a helper by gnome-base/nautilus[sendto]"
