diff options
| author |   Christophe Lermytte <gentoo@lermytte.be> | 2022-01-24 21:09:15 +0100 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2022-01-25 00:49:00 +0000 |
| commit | 485a8aafec86fd2d3e2ff43a7dd11c0c6df232c8 (patch) | |
| tree | 45284afcdbac61f3b6cd03dffc818358ddeeed93 | |
| parent | java-utils-2.eclass: update rather-obsolete python-updater reference (diff) | |
| download | gentoo-485a8aafec86fd2d3e2ff43a7dd11c0c6df232c8.tar.gz gentoo-485a8aafec86fd2d3e2ff43a7dd11c0c6df232c8.tar.bz2 gentoo-485a8aafec86fd2d3e2ff43a7dd11c0c6df232c8.zip | |
x11-term/gnome-terminal: fix build with meson-0.61
Closes: https://bugs.gentoo.org/831940
Signed-off-by: Christophe Lermytte <gentoo@lermytte.be>
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch | 39 | ||||
| -rw-r--r-- | x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild | 6 |
2 files changed, 44 insertions, 1 deletions
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 new file mode 100644 index 000000000000..e0e9d39204f2 --- /dev/null +++ b/x11-terms/gnome-terminal/files/3.42.2-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,39 @@ +https://github.com/GNOME/gnome-terminal/commit/9a168cc23962ce9fa106dc8a40407d381a3db403 +https://bugs.gentoo.org/831940 + +From: Christian Persch <chpe@src.gnome.org> +Date: Fri, 14 Jan 2022 11:33:32 +0100 +Subject: [PATCH] build: Fix for newer meson +--- a/data/meson.build ++++ b/data/meson.build +@@ -18,7 +18,6 @@ + metainfodir = gt_datadir / 'metainfo' + + i18n.merge_file( +- gt_dns_name + '.metainfo.xml', + input: gt_dns_name + '.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -27,7 +26,6 @@ i18n.merge_file( + ) + + i18n.merge_file( +- gt_dns_name + '.Nautilus.metainfo.xml', + input: gt_dns_name + '.Nautilus.metainfo.xml.in', + output: '@BASENAME@', + po_dir: po_dir, +@@ -40,7 +38,6 @@ i18n.merge_file( + desktopdatadir = gt_datadir / 'applications' + + i18n.merge_file( +- gt_dns_name + '.desktop', + input: gt_dns_name + '.desktop.in', + output: '@BASENAME@', + type: 'desktop', +@@ -57,4 +54,4 @@ meson.add_install_script( + + # Subdirs + +-subdir('icons') +\ No newline at end of file ++subdir('icons') diff --git a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild index 066ebe755cd7..f47df2f66e01 100644 --- a/x11-terms/gnome-terminal/gnome-terminal-3.42.2.ebuild +++ b/x11-terms/gnome-terminal/gnome-terminal-3.42.2.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=7 @@ -40,6 +40,10 @@ BDEPEND=" virtual/pkgconfig " +PATCHES=( + "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch +) + DOC_CONTENTS="To get previous working directory inherited in new opened tab, or notifications of long-running commands finishing, you will need to add the following line to your ~/.bashrc:\n |