Skip to content

Commit

Permalink
archlinux: set dependencies on xorg server ABI version instead of the…
Browse files Browse the repository at this point in the history
… server version itself

Following suggestion here: QubesOS/qubes-issues#3908 (comment)
Tracking issue: QubesOS/qubes-issues#3908

(cherry picked from commit 35b0f3c)
  • Loading branch information
Olivier MEDOC authored and marmarek committed Jun 2, 2020
1 parent bf3dfb2 commit c208ec8
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion archlinux/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit c208ec8

Please sign in to comment.