summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-01-25 02:19:06 +0000
committerSam James <sam@gentoo.org>2022-01-25 02:31:30 +0000
commitcb0e78639dd45ee18eec18826a4f4d104a62dd4e (patch)
tree0c330c3e1bdc593c4a22fefc1fb4c4f2e61b2a14 /app-emulation
parentnet-misc/gallery-dl: drop old 1.19.3 (diff)
downloadgentoo-cb0e78639dd45ee18eec18826a4f4d104a62dd4e.tar.gz
gentoo-cb0e78639dd45ee18eec18826a4f4d104a62dd4e.tar.bz2
gentoo-cb0e78639dd45ee18eec18826a4f4d104a62dd4e.zip
app-emulation/virt-viewer: fix build with meson-0.61
Closes: https://bugs.gentoo.org/831963 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/virt-viewer/files/virt-viewer-10.0_p20210730-meson-0.61.patch36
-rw-r--r--app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild6
2 files changed, 41 insertions, 1 deletions
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
new file mode 100644
index 000000000000..46c708b9d342
--- /dev/null
+++ b/app-emulation/virt-viewer/files/virt-viewer-10.0_p20210730-meson-0.61.patch
@@ -0,0 +1,36 @@
+https://gitlab.com/virt-viewer/virt-viewer/-/merge_requests/117.patch
+https://bugs.gentoo.org/831963
+
+From 41cc016278e713d3db156761fce6437dff81a53a Mon Sep 17 00:00:00 2001
+From: Michal Vasilek <michal@vasilek.cz>
+Date: Sat, 22 Jan 2022 23:28:20 +0100
+Subject: [PATCH] meson: fix build with meson 0.61
+
+i18n.merge_file doesn't accept positional arguments
+--- a/data/meson.build
++++ b/data/meson.build
+@@ -2,7 +2,6 @@ if host_machine.system() != 'windows'
+ desktop = 'remote-viewer.desktop'
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
+@@ -14,7 +13,6 @@ if host_machine.system() != 'windows'
+ mimetypes = 'virt-viewer-mime.xml'
+
+ i18n.merge_file (
+- mimetypes,
+ type: 'xml',
+ input: mimetypes + '.in',
+ output: mimetypes,
+@@ -27,7 +25,6 @@ if host_machine.system() != 'windows'
+ metainfo = 'remote-viewer.appdata.xml'
+
+ i18n.merge_file (
+- metainfo,
+ type: 'xml',
+ input: metainfo + '.in',
+ output: metainfo,
+GitLab
diff --git a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
index 628627555ce9..cf637aba0caa 100644
--- a/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-10.0_p20210730.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
@@ -38,6 +38,10 @@ BDEPEND="${PYTHON_DEPS}
REQUIRED_USE="|| ( spice vnc )"
+PATCHES=(
+ "${FILESDIR}"/${PN}-10.0_p20210730-meson-0.61.patch
+)
+
src_prepare() {
default