1 |
commit: 485a8aafec86fd2d3e2ff43a7dd11c0c6df232c8 |
2 |
Author: Christophe Lermytte <gentoo <AT> lermytte <DOT> be> |
3 |
AuthorDate: Mon Jan 24 20:09:15 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 25 00:49:00 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=485a8aaf |
7 |
|
8 |
x11-term/gnome-terminal: fix build with meson-0.61 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/831940 |
11 |
Signed-off-by: Christophe Lermytte <gentoo <AT> lermytte.be> |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
.../files/3.42.2-fix-build-with-meson-0.61.1.patch | 39 ++++++++++++++++++++++ |
15 |
.../gnome-terminal/gnome-terminal-3.42.2.ebuild | 6 +++- |
16 |
2 files changed, 44 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch |
19 |
new file mode 100644 |
20 |
index 000000000000..e0e9d39204f2 |
21 |
--- /dev/null |
22 |
+++ b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch |
23 |
@@ -0,0 +1,39 @@ |
24 |
+https://github.com/GNOME/gnome-terminal/commit/9a168cc23962ce9fa106dc8a40407d381a3db403 |
25 |
+https://bugs.gentoo.org/831940 |
26 |
+ |
27 |
+From: Christian Persch <chpe@×××××××××.org> |
28 |
+Date: Fri, 14 Jan 2022 11:33:32 +0100 |
29 |
+Subject: [PATCH] build: Fix for newer meson |
30 |
+--- a/data/meson.build |
31 |
++++ b/data/meson.build |
32 |
+@@ -18,7 +18,6 @@ |
33 |
+ metainfodir = gt_datadir / 'metainfo' |
34 |
+ |
35 |
+ i18n.merge_file( |
36 |
+- gt_dns_name + '.metainfo.xml', |
37 |
+ input: gt_dns_name + '.metainfo.xml.in', |
38 |
+ output: '@BASENAME@', |
39 |
+ po_dir: po_dir, |
40 |
+@@ -27,7 +26,6 @@ i18n.merge_file( |
41 |
+ ) |
42 |
+ |
43 |
+ i18n.merge_file( |
44 |
+- gt_dns_name + '.Nautilus.metainfo.xml', |
45 |
+ input: gt_dns_name + '.Nautilus.metainfo.xml.in', |
46 |
+ output: '@BASENAME@', |
47 |
+ po_dir: po_dir, |
48 |
+@@ -40,7 +38,6 @@ i18n.merge_file( |
49 |
+ desktopdatadir = gt_datadir / 'applications' |
50 |
+ |
51 |
+ i18n.merge_file( |
52 |
+- gt_dns_name + '.desktop', |
53 |
+ input: gt_dns_name + '.desktop.in', |
54 |
+ output: '@BASENAME@', |
55 |
+ type: 'desktop', |
56 |
+@@ -57,4 +54,4 @@ meson.add_install_script( |
57 |
+ |
58 |
+ # Subdirs |
59 |
+ |
60 |
+-subdir('icons') |
61 |
+\ No newline at end of file |
62 |
++subdir('icons') |
63 |
|
64 |
diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild |
65 |
index 066ebe755cd7..f47df2f66e01 100644 |
66 |
--- a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild |
67 |
+++ b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild |
68 |
@@ -1,4 +1,4 @@ |
69 |
-# Copyright 1999-2021 Gentoo Authors |
70 |
+# Copyright 1999-2022 Gentoo Authors |
71 |
# Distributed under the terms of the GNU General Public License v2 |
72 |
|
73 |
EAPI=7 |
74 |
@@ -40,6 +40,10 @@ BDEPEND=" |
75 |
virtual/pkgconfig |
76 |
" |
77 |
|
78 |
+PATCHES=( |
79 |
+ "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch |
80 |
+) |
81 |
+ |
82 |
DOC_CONTENTS="To get previous working directory inherited in new opened tab, or |
83 |
notifications of long-running commands finishing, you will need |
84 |
to add the following line to your ~/.bashrc:\n |