[packages/virt-viewer] upstream fix for build failure with recent meson versions
atler
atler at pld-linux.org
Tue Nov 8 11:52:12 CET 2022
commit 0028a915d53e550c00484af316246b0049a5039b
Author: Jan Palus <atler at pld-linux.org>
Date: Tue Nov 8 11:50:40 2022 +0100
upstream fix for build failure with recent meson versions
meson.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
virt-viewer.spec | 2 ++
2 files changed, 52 insertions(+)
---
diff --git a/virt-viewer.spec b/virt-viewer.spec
index 668237f..4ab393c 100644
--- a/virt-viewer.spec
+++ b/virt-viewer.spec
@@ -12,6 +12,7 @@ License: GPL v2+
Group: X11/Applications/Networking
Source0: https://virt-manager.org/download/sources/virt-viewer/%{name}-%{version}.tar.xz
# Source0-md5: 06b80228aaf10e614aeb8ffa4814b03a
+Patch0: meson.patch
URL: http://virt-manager.org/
BuildRequires: bash-completion-devel
BuildRequires: cmake
@@ -83,6 +84,7 @@ Bashowe uzupełnianie parametrów polecenia virt-viewer.
%prep
%setup -q
+%patch0 -p1
%build
%meson \
diff --git a/meson.patch b/meson.patch
new file mode 100644
index 0000000..f67d641
--- /dev/null
+++ b/meson.patch
@@ -0,0 +1,50 @@
+From 98d9f202ef768f22ae21b5c43a080a1aa64a7107 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange at redhat.com>
+Date: Tue, 26 Apr 2022 17:36:54 +0100
+Subject: [PATCH] data: remove bogus param for meson i18n.merge_file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The positional parameter used to be treated as 'input', but since we
+already set 'input' explicitly it is redundant. With latest meson
+versions it now generates an error
+
+data/meson.build:4:7: ERROR: Function does not take positional arguments.
+
+Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
+---
+ data/meson.build | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/data/meson.build b/data/meson.build
+index d718491..4325108 100644
+--- 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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/virt-viewer.git/commitdiff/f40b2dee7c5404b4b5140b01a0a085b4f6d70c89
More information about the pld-cvs-commit
mailing list