From c208ec8c2e029611315909922b800ed964a162d2 Mon Sep 17 00:00:00 2001 From: Olivier MEDOC Date: Tue, 2 Jun 2020 10:39:28 +0200 Subject: [PATCH] archlinux: set dependencies on xorg server ABI version instead of the server version itself Following suggestion here: https://github.com/QubesOS/qubes-issues/issues/3908#issuecomment-563715196 Tracking issue: https://github.com/QubesOS/qubes-issues/issues/3908 (cherry picked from commit 35b0f3c4bcccfceef6000a8749e52ddc7c82ba13) --- archlinux/PKGBUILD | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 9ad4c588..3b35f0a5 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -50,7 +50,12 @@ make appvm package_qubes-vm-gui() { -depends=('xorg-xinit' 'libxcomposite' 'zenity' 'qubes-libvchan-xen' 'python-xcffib' 'xorg-server>=1.20' 'xorg-server<1.21') +depends=('xorg-xinit' 'libxcomposite' 'zenity' 'qubes-libvchan-xen' 'python-xcffib' + # Xorg dependencies are on specific ABI versions: https://www.x.org/wiki/XorgModuleABIVersions/ + # These can also be verified with pacman -Qi xorg-server (Provides) + # There is however a discrepency if verifying via pkg-config --variable abi_videodrv xorg-server + 'X-ABI-VIDEODRV_VERSION=24.0' 'X-ABI-XINPUT_VERSION=24.1' 'X-ABI-EXTENSION_VERSION=10.0' + ) install=PKGBUILD.install make install-rh-agent DESTDIR=$pkgdir LIBDIR=/usr/lib USRLIBDIR=/usr/lib SYSLIBDIR=/usr/lib