commit: 5ca2382369b7715be3cee1cd7885b9dcf7e879e7 Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> AuthorDate: Mon Feb 21 11:49:05 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Feb 21 23:16:40 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca23823
gnome-extra/gnome-documents: fix build with meson-0.61 Upstream looks abandoned, fixing in-tree. Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> Closes: https://bugs.gentoo.org/833843 Closes: https://github.com/gentoo/gentoo/pull/24296 Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/fix-build-with-meson-0.61.patch | 19 +++++++++++++++++++ .../gnome-documents/gnome-documents-3.34.0-r1.ebuild | 6 +++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch b/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch new file mode 100644 index 000000000000..2a3a5cd3d3e3 --- /dev/null +++ b/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/833843 +--- a/data/meson.build ++++ b/data/meson.build +@@ -56,7 +56,6 @@ foreach app: documents_apps + appdata = app + '.appdata.xml' + + appdata_file = i18n.merge_file( +- appdata, + input: appdata + '.in', + output: appdata, + po_dir: po_dir, +@@ -76,7 +75,6 @@ foreach app: documents_apps + desktop = app + '.desktop' + + desktop_file = i18n.merge_file( +- desktop, + type: 'desktop', + input: desktop + '.in', + output: desktop, diff --git a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild index 3b571baadadb..5245d0f95f9d 100644 --- a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild +++ b/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -49,6 +49,10 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " +PATCHES=( + "${FILESDIR}"/fix-build-with-meson-0.61.patch +) + src_configure() { local emesonargs=( -Ddocumentation=true #manpage
