From 099eb6261cfb4a7a674ead467a8a9dfb2ee173d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Fri, 15 Jan 2021 18:32:30 +0100
Subject: [PATCH] ci: Build xkbcomp 1.4.1 for the docker image

This is a requirement for testing meson dist in CI.
---
 .gitlab-ci.yml               | 2 +-
 .gitlab-ci/debian-install.sh | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fecb63fda..e0b4166c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ variables:
     UPSTREAM_REPO: xorg/xserver
     FDO_DISTRIBUTION_VERSION: buster-slim
     FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh'
-    FDO_DISTRIBUTION_TAG: "2020-11-16"
+    FDO_DISTRIBUTION_TAG: "2021-01-19-xkbcomp"
 
 include:
   - project: 'freedesktop/ci-templates'
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index 07f09388a..9426d09cd 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -94,7 +94,6 @@ apt-get install -y \
 	python3-mako \
 	python3-numpy \
 	python3-six \
-	x11-xkb-utils \
 	x11proto-dev \
 	xfonts-utils \
 	xkb-data \
@@ -153,6 +152,14 @@ echo 'path=/root/xts' >> piglit/piglit.conf
 find -name \*.a -o -name \*.o -o -name \*.c -o -name \*.h -o -name \*.la\* | xargs rm
 strip xts/xts5/*/.libs/*
 
+# Running meson dist requires xkbcomp 1.4.1 or newer, but Debian buster has 1.4.0 only
+git clone https://gitlab.freedesktop.org/xorg/app/xkbcomp.git --depth 1 --branch=xkbcomp-1.4.1
+cd xkbcomp
+./autogen.sh --datarootdir=/usr/share
+make -j${FDO_CI_CONCURRENT:-4} install
+cd ..
+rm -rf xkbcomp
+
 apt-get purge -y \
 	$EPHEMERAL