1 |
commit: cc80d63352181053f7ea6a793a6505561b1243ad |
2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
3 |
AuthorDate: Sun Feb 20 20:07:07 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 20 21:12:30 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc80d633 |
7 |
|
8 |
gnome-extra/nautilus-sendto: fix build with meson 0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831837 |
11 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/24293 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
.../nautilus-sendto/files/fix-build-with-meson-0.61.patch | 12 ++++++++++++ |
16 |
gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild | 6 +++++- |
17 |
2 files changed, 17 insertions(+), 1 deletion(-) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 000000000000..556fab877bd1 |
22 |
--- /dev/null |
23 |
+++ b/gnome-extra/nautilus-sendto/files/fix-build-with-meson-0.61.patch |
24 |
@@ -0,0 +1,12 @@ |
25 |
+https://bugs.gentoo.org/831837 |
26 |
+--- a/src/meson.build |
27 |
++++ b/src/meson.build |
28 |
+@@ -7,7 +7,7 @@ executable('nautilus-sendto', |
29 |
+ |
30 |
+ po_dir = join_paths(meson.source_root(), 'po') |
31 |
+ |
32 |
+-i18n.merge_file ('appdata', |
33 |
++i18n.merge_file ( |
34 |
+ input: 'nautilus-sendto.metainfo.xml.in', |
35 |
+ output: 'nautilus-sendto.metainfo.xml', |
36 |
+ install: true, |
37 |
|
38 |
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild |
39 |
index be615119ac23..988f463cb538 100644 |
40 |
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild |
41 |
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.6.ebuild |
42 |
@@ -1,4 +1,4 @@ |
43 |
-# Copyright 1999-2021 Gentoo Authors |
44 |
+# Copyright 1999-2022 Gentoo Authors |
45 |
# Distributed under the terms of the GNU General Public License v2 |
46 |
|
47 |
EAPI=6 |
48 |
@@ -19,6 +19,10 @@ DEPEND="${RDEPEND} |
49 |
virtual/pkgconfig |
50 |
" |
51 |
|
52 |
+PATCHES=( |
53 |
+ "${FILESDIR}"/fix-build-with-meson-0.61.patch |
54 |
+) |
55 |
+ |
56 |
pkg_postinst() { |
57 |
if ! has_version "gnome-base/nautilus[sendto]"; then |
58 |
einfo "Note that ${CATEGORY}/${PN} is meant to be used as a helper by gnome-base/nautilus[sendto]" |