From 6b5ff24bd9930880a6a7e7af069fc72481c0f78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 2 Aug 2022 13:55:34 +0100
Subject: [PATCH] Fix meson parameter error (rhbz #2113755)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 ...ogus-param-for-meson-i18n.merge_file.patch | 50 +++++++++++++++++++
 virt-viewer.spec                              |  6 ++-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch

diff --git a/0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch b/0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch
new file mode 100644
index 0000000..c9ceb9e
--- /dev/null
+++ b/0001-data-remove-bogus-param-for-meson-i18n.merge_file.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@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@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,
+-- 
+2.37.1
+
diff --git a/virt-viewer.spec b/virt-viewer.spec
index b91609a..5bbbbab 100644
--- a/virt-viewer.spec
+++ b/virt-viewer.spec
@@ -10,11 +10,12 @@
 
 Name: virt-viewer
 Version: 11.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Virtual Machine Viewer
 License: GPLv2+
 URL: https://gitlab.com/virt-viewer/virt-viewer
 Source0: https://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.xz
+Patch: 0001-data-remove-bogus-param-for-meson-i18n.merge_file.patch
 Requires: openssh-clients
 
 # Our bash completion script uses virsh to list domains
@@ -87,6 +88,9 @@ the display, and libvirt for looking up VNC/SPICE server details.
 %{_datadir}/bash-completion/completions/virt-viewer
 
 %changelog
+* Tue Aug  2 2022 Daniel P. Berrangé <berrange@redhat.com> - 11.0-4
+- Fix meson parameter error (rhbz #2113755)
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 11.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild