From c45334c57aaa47a656bb2b386566ef5d865f2a1f Mon Sep 17 00:00:00 2001 From: Arnaud Lechevallier Date: Tue, 9 May 2023 17:16:07 +0200 Subject: [PATCH] gnu: virt-viewer: removed positional arguments Fix the building process of meson (Bug#63289) * gnu/package/spice.scm: Add a patch. Update the URI, previous URI returns 404 error. * gnu/package/patches/virt-viewer-removed-positional-argument.patch: Provide a patch. --- ...t-viewer-removed-positional-argument.patch | 40 +++++++++++++++++++ gnu/packages/spice.scm | 5 ++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/virt-viewer-removed-positional-argument.patch diff --git a/gnu/packages/patches/virt-viewer-removed-positional-argument.patch b/gnu/packages/patches/virt-viewer-removed-positional-argument.patch new file mode 100644 index 0000000000..71d3d697f1 --- /dev/null +++ b/gnu/packages/patches/virt-viewer-removed-positional-argument.patch @@ -0,0 +1,40 @@ +From 3be46931c47a83d438bc01e3260b196072fef22c Mon Sep 17 00:00:00 2001 +From: Arnaud Lechevallier +Date: Tue, 9 May 2023 15:40:59 +0200 +Subject: [PATCH] Removed positional argument from function i18n.merge_file. + +--- + 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.39.2 + diff --git a/gnu/packages/spice.scm b/gnu/packages/spice.scm index 98faaed940..87ab3bf6de 100644 --- a/gnu/packages/spice.scm +++ b/gnu/packages/spice.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019 Rutger Helling ;;; Copyright © 2019, 2020, 2022 Marius Bakke ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2023 Arnaud Lechevallier ;;; Copyright © 2023 Efraim Flashner ;;; ;;; This file is part of GNU Guix. @@ -390,8 +391,10 @@ (define-public virt-viewer (source (origin (method url-fetch) (uri (string-append - "https://virt-manager.org/download/sources/virt-viewer/" + "https://releases.pagure.org/virt-viewer/" "virt-viewer-" version ".tar.xz")) + (patches (search-patches + "virt-viewer-removed-positional-argument.patch")) (sha256 (base32 "1l5bv6x6j21l487mk3n93ai121gg62n6b069r2jpf72cbhra4gx4")))) -- 2.39.2