| 1 |
commit: 5ca2382369b7715be3cee1cd7885b9dcf7e879e7 |
| 2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
| 3 |
AuthorDate: Mon Feb 21 11:49:05 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 21 23:16:40 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ca23823 |
| 7 |
|
| 8 |
gnome-extra/gnome-documents: fix build with meson-0.61 |
| 9 |
|
| 10 |
Upstream looks abandoned, fixing in-tree. |
| 11 |
|
| 12 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
| 13 |
Closes: https://bugs.gentoo.org/833843 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/24296 |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
.../files/fix-build-with-meson-0.61.patch | 19 +++++++++++++++++++ |
| 18 |
.../gnome-documents/gnome-documents-3.34.0-r1.ebuild | 6 +++++- |
| 19 |
2 files changed, 24 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
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 |
| 22 |
new file mode 100644 |
| 23 |
index 000000000000..2a3a5cd3d3e3 |
| 24 |
--- /dev/null |
| 25 |
+++ b/gnome-extra/gnome-documents/files/fix-build-with-meson-0.61.patch |
| 26 |
@@ -0,0 +1,19 @@ |
| 27 |
+https://bugs.gentoo.org/833843 |
| 28 |
+--- a/data/meson.build |
| 29 |
++++ b/data/meson.build |
| 30 |
+@@ -56,7 +56,6 @@ foreach app: documents_apps |
| 31 |
+ appdata = app + '.appdata.xml' |
| 32 |
+ |
| 33 |
+ appdata_file = i18n.merge_file( |
| 34 |
+- appdata, |
| 35 |
+ input: appdata + '.in', |
| 36 |
+ output: appdata, |
| 37 |
+ po_dir: po_dir, |
| 38 |
+@@ -76,7 +75,6 @@ foreach app: documents_apps |
| 39 |
+ desktop = app + '.desktop' |
| 40 |
+ |
| 41 |
+ desktop_file = i18n.merge_file( |
| 42 |
+- desktop, |
| 43 |
+ type: 'desktop', |
| 44 |
+ input: desktop + '.in', |
| 45 |
+ output: desktop, |
| 46 |
|
| 47 |
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 |
| 48 |
index 3b571baadadb..5245d0f95f9d 100644 |
| 49 |
--- a/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild |
| 50 |
+++ b/gnome-extra/gnome-documents/gnome-documents-3.34.0-r1.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2020 Gentoo Authors |
| 53 |
+# Copyright 1999-2022 Gentoo Authors |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
EAPI=6 |
| 57 |
@@ -49,6 +49,10 @@ DEPEND="${COMMON_DEPEND} |
| 58 |
virtual/pkgconfig |
| 59 |
" |
| 60 |
|
| 61 |
+PATCHES=( |
| 62 |
+ "${FILESDIR}"/fix-build-with-meson-0.61.patch |
| 63 |
+) |
| 64 |
+ |
| 65 |
src_configure() { |
| 66 |
local emesonargs=( |
| 67 |
-Ddocumentation=true #manpage |
Archives