Date: Friday, October 28, 2022 @ 11:51:58
Author: heftig
Revision: 1338385
11.0-2: patch to use rest-1.0 (soup3, libgovirt 0.3.9)
Added:
virt-viewer/trunk/rest.diff
Modified:
virt-viewer/trunk/PKGBUILD
-----------+
PKGBUILD | 33 +++++++++++++++++++++------------
rest.diff | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 12 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-28 11:45:28 UTC (rev 1338384)
+++ PKGBUILD 2022-10-28 11:51:58 UTC (rev 1338385)
@@ -5,7 +5,7 @@
pkgname=virt-viewer
pkgver=11.0
-pkgrel=1
+pkgrel=2
pkgdesc='A lightweight interface for interacting with the graphical display of
virtualized guest OS.'
arch=('x86_64')
url='https://gitlab.com/virt-viewer/virt-viewer'
@@ -13,27 +13,36 @@
depends=('gtk-vnc' 'libvirt' 'spice-gtk' 'libvirt-glib' 'libgovirt' 'vte3')
makedepends=('meson' 'intltool' 'spice-protocol' 'gobject-introspection'
'bash-completion')
replaces=('virtviewer')
-source=("https://virt-manager.org/download/sources/virt-viewer/virt-viewer-${pkgver}.tar.xz"{,.asc})
+options=('debug')
+source=("https://virt-manager.org/download/sources/virt-viewer/virt-viewer-${pkgver}.tar.xz"{,.asc}
+ 'rest.diff')
b2sums=('41914a60361f0a47a0b0b54962d228ffaec67c6b69c664bb6fe683b7074dd5e2136d2bf3528b6e1b6b785cc4e337125fe16fdd94dd603dd42e8fde543931241a'
- 'SKIP')
+ 'SKIP'
+
'354ef316ad07df3273333cf4fad77671cfc0ce74be32bae92ae4d18dacc07402c15185ad7be01bae23bdd087ed1c56b2565c2ac53e1280726337a0fc0107108e')
validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF') # Daniel P. Berrange
+prepare() {
+ cd virt-viewer-${pkgver}
+ patch -Np1 -i ../rest.diff
+}
+
build() {
arch-meson virt-viewer-${pkgver} build \
- -Dlibvirt=enabled \
- -Dvnc=enabled \
- -Dspice=enabled \
- -Dovirt=enabled \
- -Dvte=enabled \
- -Dbash_completion=enabled
+ -D libvirt=enabled \
+ -D vnc=enabled \
+ -D spice=enabled \
+ -D ovirt=enabled \
+ -D vte=enabled \
+ -D bash_completion=enabled \
+ -D git_werror=disabled
- ninja -C build
+ meson compile -C build
}
check() {
- ninja -C build test
+ meson test -C build --print-errorlogs
}
package() {
- DESTDIR="${pkgdir}" ninja -C build install
+ meson install -C build --destdir "${pkgdir}"
}
Added: rest.diff
===================================================================
--- rest.diff (rev 0)
+++ rest.diff 2022-10-28 11:51:58 UTC (rev 1338385)
@@ -0,0 +1,59 @@
+diff --git i/data/meson.build w/data/meson.build
+index d718491..4325108 100644
+--- i/data/meson.build
++++ w/data/meson.build
+@@ -2,32 +2,29 @@ if host_machine.system() != 'windows'
+ desktop = 'remote-viewer.desktop'
+
+ i18n.merge_file (
+- desktop,
+ type: 'desktop',
+ input: desktop + '.in',
+ output: desktop,
+ po_dir: po_dir,
+ install: true,
+ install_dir: join_paths(datadir, 'applications')
+ )
+
+ mimetypes = 'virt-viewer-mime.xml'
+
+ i18n.merge_file (
+- mimetypes,
+ type: 'xml',
+ input: mimetypes + '.in',
+ output: mimetypes,
+ data_dirs: i18n_itsdir,
+ po_dir: po_dir,
+ install: true,
+ install_dir: join_paths(datadir, 'mime', 'packages')
+ )
+
+ metainfo = 'remote-viewer.appdata.xml'
+
+ i18n.merge_file (
+- metainfo,
+ type: 'xml',
+ input: metainfo + '.in',
+ output: metainfo,
+diff --git i/meson.build w/meson.build
+index 800d15a..eae1116 100644
+--- i/meson.build
++++ w/meson.build
+@@ -39,7 +39,7 @@ gtk_vnc_min_version='>=0.4.0'
+ spice_gtk_min_version='>=0.35'
+ spice_protocol_min_version='>=0.12.7'
+ govirt_min_version='>=0.3.7'
+-rest_min_version='>=0.8'
++rest_min_version='>=0.9'
+ vte_min_version='>=0.46.0'
+ bash_completion_version='2.0'
+
+@@ -436,7 +436,7 @@ if spice_gtk_dep.found()
+ endif
+
+ govirt_dep = dependency('govirt-1.0', version: govirt_min_version, required:
get_option('ovirt'))
+-rest_dep = dependency('rest-0.7', version: rest_min_version, required:
get_option('ovirt'))
++rest_dep = dependency('rest-1.0', version: rest_min_version, required:
get_option('ovirt'))
+ if get_option('ovirt').auto()
+ if govirt_dep.found() and not rest_dep.found()
+ govirt_dep = dependency('', required: false)
