diff options
| author |   Marcin Szychowski | 2024-01-04 17:38:46 +0100 |
|---|---|---|
| committer |   Matteo Bernardini | 2024-04-27 10:53:52 +0200 |
| commit | a2d7b2e74972b0b9b4f23ad1687e06c18f25701f (patch) | |
| tree | 6cce803072bca48dbf5ec3d7e771c0dd869ccbf7 | |
| parent | 68ac93024440c1dcb61e579018ce241a1ab44180 (diff) | |
| download | slackbuilds-virt-viewer.tar.gz | |
system/virt-viewer: Patch for the newer meson in current.virt-viewer
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
| -rw-r--r-- | system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch | 36 | ||||
| -rw-r--r-- | system/virt-viewer/virt-viewer.SlackBuild | 2 |
2 files changed, 38 insertions, 0 deletions
diff --git a/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch b/system/virt-viewer/virt-viewer-10.0_p20210730-meson-0.61.patch new file mode 100644 index 0000000000..46c708b9d3 --- /dev/null +++ b/system/virt-viewer/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/system/virt-viewer/virt-viewer.SlackBuild b/system/virt-viewer/virt-viewer.SlackBuild index c0601c673f..01d6ef5068 100644 --- a/system/virt-viewer/virt-viewer.SlackBuild +++ b/system/virt-viewer/virt-viewer.SlackBuild @@ -68,6 +68,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +patch -p1 < $CWD/virt-viewer-10.0_p20210730-meson-0.61.patch + mkdir build cd build CFLAGS="$SLKCFLAGS" \ |