Fix meson 0.61.x build error

2 files changed, 13 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be6c39b6d25d..718a718379ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = virt-viewer-no-header
 	pkgdesc = A lightweight interface for interacting with the graphical display of virtualized guest OS. This package contains a patch drop the header bar.
 	pkgver = 11.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://gitlab.com/virt-viewer/virt-viewer
 	arch = x86_64
 	license = GPL
@@ -21,10 +21,12 @@ pkgbase = virt-viewer-no-header
 	replaces = virtviewer
 	source = https://virt-manager.org/download/sources/virt-viewer/virt-viewer-11.0.tar.xz
 	source = https://virt-manager.org/download/sources/virt-viewer/virt-viewer-11.0.tar.xz.asc
+	source = https://gitlab.com/Paper_/virt-viewer/-/commit/41cc016278e713d3db156761fce6437dff81a53a.patch
 	source = drop-header.patch
 	validpgpkeys = DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
 	b2sums = 41914a60361f0a47a0b0b54962d228ffaec67c6b69c664bb6fe683b7074dd5e2136d2bf3528b6e1b6b785cc4e337125fe16fdd94dd603dd42e8fde543931241a
 	b2sums = SKIP
+	b2sums = d1b79f2bdc2749049767d7e22cf530c04438547fb3485fd0ab084222600ddcb08b8a27e104216c5da9b25d9c792d1cdf085d1c23c988194c3c6c22cf05eaa0e2
 	b2sums = 6571f7637f8328118bb4469d52a92936820ebc7a037bb9cf6e6bd257889ec43b18d4c9c952cf1d968ef4b8c4a08ea4358cec47754d869b6e59153a0f2dddf578
 
 pkgname = virt-viewer-no-header
diff --git a/PKGBUILD b/PKGBUILD
index 24900011157a..2d413c304daf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=virt-viewer
 pkgname=$_pkgname-no-header
 pkgver=11.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A lightweight interface for interacting with the graphical display of virtualized guest OS. This package contains a patch drop the header bar.'
 arch=('x86_64')
 url='https://gitlab.com/virt-viewer/virt-viewer'
@@ -15,15 +15,22 @@ provides=("$_pkgname")
 conflicts=("$_pkgname")
 source=(
     "https://virt-manager.org/download/sources/virt-viewer/virt-viewer-${pkgver}.tar.xz"{,.asc}
+    "https://gitlab.com/Paper_/virt-viewer/-/commit/41cc016278e713d3db156761fce6437dff81a53a.patch"
     "drop-header.patch")
 b2sums=('41914a60361f0a47a0b0b54962d228ffaec67c6b69c664bb6fe683b7074dd5e2136d2bf3528b6e1b6b785cc4e337125fe16fdd94dd603dd42e8fde543931241a'
         'SKIP'
+        'd1b79f2bdc2749049767d7e22cf530c04438547fb3485fd0ab084222600ddcb08b8a27e104216c5da9b25d9c792d1cdf085d1c23c988194c3c6c22cf05eaa0e2'
         '6571f7637f8328118bb4469d52a92936820ebc7a037bb9cf6e6bd257889ec43b18d4c9c952cf1d968ef4b8c4a08ea4358cec47754d869b6e59153a0f2dddf578')
 validpgpkeys=('DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF') # Daniel P. Berrange
 
+prepare() {
+  cd "${_pkgname}-${pkgver}"
+  patch -p1 < "${srcdir}/drop-header.patch"
+  patch -p1 < "${srcdir}/41cc016278e713d3db156761fce6437dff81a53a.patch"
+}
+
 build() {
-  (cd ${_pkgname}-${pkgver}; patch -p1 < "${srcdir}/drop-header.patch")
-  arch-meson virt-viewer-${pkgver} build \
+  arch-meson "${_pkgname}-${pkgver}" build \
     -Dlibvirt=enabled \
     -Dvnc=enabled \
     -Dspice=enabled \