From 26427d59ac3a984422ab1abfb8fe2a3cf44ca505 Mon Sep 17 00:00:00 2001 From: Yukikoo Date: Wed, 1 Apr 2020 18:23:05 +0000 Subject: [PATCH] Archlinux: more permissive with xorg-server update (cherry picked from commit ddedb60f0152d47aa01f9a489bd460d4ad4595a2) --- archlinux/PKGBUILD | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index cc0d3450..9ad4c588 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -1,7 +1,6 @@ -# Maintainer: Olivier Medoc pkgname=(qubes-vm-gui qubes-vm-pulseaudio) pkgver=`cat version` -pkgrel=9 +pkgrel=10 epoch= pkgdesc="The Qubes GUI Agent for AppVMs" arch=("x86_64") @@ -51,10 +50,7 @@ make appvm package_qubes-vm-gui() { -depends=('xorg-xinit' 'libxcomposite' 'zenity' 'qubes-libvchan-xen' 'python-xcffib' - 'xorg-server>=1.20.4' 'xorg-server<1.20.8' - 'qubes-vm-core>=3.0.14' - ) +depends=('xorg-xinit' 'libxcomposite' 'zenity' 'qubes-libvchan-xen' 'python-xcffib' 'xorg-server>=1.20' 'xorg-server<1.21') install=PKGBUILD.install make install-rh-agent DESTDIR=$pkgdir LIBDIR=/usr/lib USRLIBDIR=/usr/lib SYSLIBDIR=/usr/lib @@ -70,9 +66,7 @@ install -D $srcdir/PKGBUILD-z-qubes-session.sh $pkgdir/etc/X11/xinit/xinitrc.d/z package_qubes-vm-pulseaudio() { pkgdesc="Pulseaudio support for Qubes VM" -depends=( 'alsa-lib' 'alsa-utils' 'pulseaudio-alsa' - 'pulseaudio>=13.0' 'pulseaudio<14.0' -) +depends=( 'alsa-lib' 'alsa-utils' 'pulseaudio-alsa' 'pulseaudio<14.0') install=PKGBUILD-pulseaudio.install pa_ver=`(pkg-config --modversion libpulse 2>/dev/null || echo 0.0) | cut -f 1 -d "-"` @@ -81,4 +75,3 @@ make install-pulseaudio DESTDIR=$pkgdir PA_VER=$pa_ver LIBDIR=/usr/lib USRLIBDIR } # vim:set ts=2 sw=2 et: -