| 1 |
commit: cb0e78639dd45ee18eec18826a4f4d104a62dd4e |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 25 02:19:06 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 25 02:31:30 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0e7863 |
| 7 |
|
| 8 |
app-emulation/virt-viewer: fix build with meson-0.61 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/831963 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../virt-viewer-10.0_p20210730-meson-0.61.patch | 36 ++++++++++++++++++++++ |
| 14 |
.../virt-viewer/virt-viewer-10.0_p20210730.ebuild | 6 +++- |
| 15 |
2 files changed, 41 insertions(+), 1 deletion(-) |
| 16 |
|
| 17 |
diff --git a/app-emulation/virt-viewer/files/virt-viewer-10.0_p20210730-meson-0.61.patch b/app-emulation/virt-viewer/files/virt-viewer-10.0_p20210730-meson-0.61.patch |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..46c708b9d342 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-emulation/virt-viewer/files/virt-viewer-10.0_p20210730-meson-0.61.patch |
| 22 |
@@ -0,0 +1,36 @@ |
| 23 |
+https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117.patch |
| 24 |
+https://bugs.gentoo.org/831963 |
| 25 |
+ |
| 26 |
+From 41cc016278e713d3db156761fce6437dff81a53a Mon Sep 17 00:00:00 2001 |
| 27 |
+From: Michal Vasilek <michal@×××××××.cz> |
| 28 |
+Date: Sat, 22 Jan 2022 23:28:20 +0100 |
| 29 |
+Subject: [PATCH] meson: fix build with meson 0.61 |
| 30 |
+ |
| 31 |
+i18n.merge_file doesn't accept positional arguments |
| 32 |
+--- a/data/meson.build |
| 33 |
++++ b/data/meson.build |
| 34 |
+@@ -2,7 +2,6 @@ if host_machine.system() != 'windows' |
| 35 |
+ desktop = 'remote-viewer.desktop' |
| 36 |
+ |
| 37 |
+ i18n.merge_file ( |
| 38 |
+- desktop, |
| 39 |
+ type: 'desktop', |
| 40 |
+ input: desktop + '.in', |
| 41 |
+ output: desktop, |
| 42 |
+@@ -14,7 +13,6 @@ if host_machine.system() != 'windows' |
| 43 |
+ mimetypes = 'virt-viewer-mime.xml' |
| 44 |
+ |
| 45 |
+ i18n.merge_file ( |
| 46 |
+- mimetypes, |
| 47 |
+ type: 'xml', |
| 48 |
+ input: mimetypes + '.in', |
| 49 |
+ output: mimetypes, |
| 50 |
+@@ -27,7 +25,6 @@ if host_machine.system() != 'windows' |
| 51 |
+ metainfo = 'remote-viewer.appdata.xml' |
| 52 |
+ |
| 53 |
+ i18n.merge_file ( |
| 54 |
+- metainfo, |
| 55 |
+ type: 'xml', |
| 56 |
+ input: metainfo + '.in', |
| 57 |
+ output: metainfo, |
| 58 |
+GitLab |
| 59 |
|
| 60 |
diff --git a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild |
| 61 |
index 628627555ce9..cf637aba0caa 100644 |
| 62 |
--- a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild |
| 63 |
+++ b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild |
| 64 |
@@ -1,4 +1,4 @@ |
| 65 |
-# Copyright 1999-2021 Gentoo Authors |
| 66 |
+# Copyright 1999-2022 Gentoo Authors |
| 67 |
# Distributed under the terms of the GNU General Public License v2 |
| 68 |
|
| 69 |
EAPI=7 |
| 70 |
@@ -38,6 +38,10 @@ BDEPEND="${PYTHON_DEPS} |
| 71 |
|
| 72 |
REQUIRED_USE="|| ( spice vnc )" |
| 73 |
|
| 74 |
+PATCHES=( |
| 75 |
+ "${FILESDIR}"/${PN}-10.0_p20210730-meson-0.61.patch |
| 76 |
+) |
| 77 |
+ |
| 78 |
src_prepare() { |
| 79 |
default |
Archives