From 2be49f3d73f003433aeaeea6d08eaebdb0b7624b Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Wed, 1 May 2024 17:11:23 +0100
Subject: [PATCH] Update CI dependencies

The xrdp-genkeymap utility now requires the libxkbfile-dev
package (or equivalent) to be able to log the setxkbmap
command used to create a keymap file
---
 .cirrus.yml                                         | 2 +-
 scripts/install_xrdp_build_dependencies_with_apt.sh | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 624d50f2..8e9e28e3 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -6,7 +6,7 @@ FreeBSD_task:
     freebsd_instance:
       image_family: freebsd-13-2
   prepare_script:
-    - pkg install -y $SSL git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr nasm fusefs-libs check imlib2 freetype2 cmocka ibus
+    - pkg install -y $SSL git autoconf automake libtool pkgconf opus jpeg-turbo fdk-aac pixman libX11 libXfixes libXrandr libxkbfile nasm fusefs-libs check imlib2 freetype2 cmocka ibus
     - git submodule update --init --recursive
   configure_script:
     - ./bootstrap
diff --git a/scripts/install_xrdp_build_dependencies_with_apt.sh b/scripts/install_xrdp_build_dependencies_with_apt.sh
index ff1a081a..e4f685b9 100755
--- a/scripts/install_xrdp_build_dependencies_with_apt.sh
+++ b/scripts/install_xrdp_build_dependencies_with_apt.sh
@@ -78,7 +78,8 @@ in
             libssl-dev \
             libx11-dev \
             libxrandr-dev \
-            libxfixes-dev"
+            libxfixes-dev \
+            libxkbfile-dev"
 
         case "$FEATURE_SET"
         in
@@ -129,6 +130,7 @@ in
             libx11-dev:i386 \
             libxext-dev:i386 \
             libxfixes-dev:i386 \
+            libxkbfile-dev:i386 \
             libxrandr-dev:i386 \
             libxrender-dev:i386 \
             libsubunit-dev:i386 \