From 24ad87d59e89d02b9c3e150ec70e99ad774f94c2 Mon Sep 17 00:00:00 2001
From: gujie <jie.gu@leica-geosystems.com.cn>
Date: Wed, 21 May 2025 10:04:27 +0800
Subject: [PATCH] Add libxkbcommon

Since we need to use keyboard process in "Add navigation for clickable menu"
(https://github.com/dunst-project/dunst/pull/1480), add libxkbcommon.

Signed-off-by: gujie <jie.gu@leica-geosystems.com.cn>
---
 Dockerfile                    | 4 +++-
 ci/Dockerfile.alpine          | 1 +
 ci/Dockerfile.alpine-edge     | 1 +
 ci/Dockerfile.archlinux       | 1 +
 ci/Dockerfile.debian-bookworm | 1 +
 ci/Dockerfile.debian-bullseye | 1 +
 ci/Dockerfile.debian-buster   | 1 +
 ci/Dockerfile.fedora          | 3 ++-
 ci/Dockerfile.ubuntu-focal    | 1 +
 ci/Dockerfile.ubuntu-jammy    | 1 +
 ci/Dockerfile.ubuntu-noble    | 1 +
 11 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b52db8c..2829479 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,8 @@ RUN apk add --no-cache \
         libxinerama \
         libxrandr \
         libxscrnsaver \
-        pango
+        pango \
+        libxkbcommon
 
 # Build and install dunst
 RUN apk add --no-cache --virtual dunstbuild \
@@ -30,6 +31,7 @@ RUN apk add --no-cache --virtual dunstbuild \
         musl-dev \
         pango-dev \
         perl \
+        libxkbcommon-dev \
  && git clone https://github.com/dunst-project/dunst /tmp/dunst \
  && sed -i 's/-g//g' /tmp/dunst/config.mk \
  && make -C /tmp/dunst -j all install test \
diff --git a/ci/Dockerfile.alpine b/ci/Dockerfile.alpine
index af0b60f..97922cf 100644
--- a/ci/Dockerfile.alpine
+++ b/ci/Dockerfile.alpine
@@ -40,6 +40,7 @@ RUN apk add --no-cache \
         wayland-libs-cursor \
         wayland-libs-server \
         wayland-protocols \
+        libxkbcommon-dev \
  && true
 
 RUN set -ex; \
diff --git a/ci/Dockerfile.alpine-edge b/ci/Dockerfile.alpine-edge
index 1aec840..771c1f5 100644
--- a/ci/Dockerfile.alpine-edge
+++ b/ci/Dockerfile.alpine-edge
@@ -40,6 +40,7 @@ RUN apk add --no-cache \
         wayland-libs-cursor \
         wayland-libs-server \
         wayland-protocols \
+        libxkbcommon-dev \
  && true
 
 RUN set -ex; \
diff --git a/ci/Dockerfile.archlinux b/ci/Dockerfile.archlinux
index f481fa2..057365f 100644
--- a/ci/Dockerfile.archlinux
+++ b/ci/Dockerfile.archlinux
@@ -19,6 +19,7 @@ RUN pacman -Syu --needed --noconfirm \
       # work - otherwise valgrind complains about jumps depending on
       # uninitialized values
       ttf-dejavu \
+      libxkbcommon \
  && true
 
 RUN ln -sT /usr/bin/core_perl/pod2man /usr/bin/pod2man
diff --git a/ci/Dockerfile.debian-bookworm b/ci/Dockerfile.debian-bookworm
index abd2925..c1cd0f4 100644
--- a/ci/Dockerfile.debian-bookworm
+++ b/ci/Dockerfile.debian-bookworm
@@ -27,6 +27,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         libxss-dev \
         valgrind \
         wayland-protocols \
+        libxkbcommon-dev \
  && apt-get clean \
  && true
 
diff --git a/ci/Dockerfile.debian-bullseye b/ci/Dockerfile.debian-bullseye
index 4cc593f..704d64e 100644
--- a/ci/Dockerfile.debian-bullseye
+++ b/ci/Dockerfile.debian-bullseye
@@ -26,6 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         libxss-dev \
         valgrind \
         wayland-protocols \
+        libxkbcommon-dev \
  && apt-get clean \
  && true
 
diff --git a/ci/Dockerfile.debian-buster b/ci/Dockerfile.debian-buster
index b6d7f68..b24e11e 100644
--- a/ci/Dockerfile.debian-buster
+++ b/ci/Dockerfile.debian-buster
@@ -26,6 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         libxss-dev \
         valgrind \
         wayland-protocols \
+        libxkbcommon-dev \
  && apt-get clean \
  && true
 
diff --git a/ci/Dockerfile.fedora b/ci/Dockerfile.fedora
index c0e15aa..0e39377 100644
--- a/ci/Dockerfile.fedora
+++ b/ci/Dockerfile.fedora
@@ -19,7 +19,8 @@ RUN dnf install -y \
         pango-devel \
         valgrind \
         wayland-devel \
-        wayland-protocols-devel
+        wayland-protocols-devel \
+        libxkbcommon-devel \
 
 ADD entrypoint.sh /srv/entrypoint
 
diff --git a/ci/Dockerfile.ubuntu-focal b/ci/Dockerfile.ubuntu-focal
index ac9496d..76ed593 100644
--- a/ci/Dockerfile.ubuntu-focal
+++ b/ci/Dockerfile.ubuntu-focal
@@ -26,6 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         libxss-dev \
         valgrind \
         wayland-protocols \
+        libxkbcommon-dev \
  && apt-get clean \
  && true
 
diff --git a/ci/Dockerfile.ubuntu-jammy b/ci/Dockerfile.ubuntu-jammy
index 994e25b..b35dc71 100644
--- a/ci/Dockerfile.ubuntu-jammy
+++ b/ci/Dockerfile.ubuntu-jammy
@@ -26,6 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         libxss-dev \
         valgrind \
         wayland-protocols \
+        libxkbcommon-dev \
  && apt-get clean \
  && true
 
diff --git a/ci/Dockerfile.ubuntu-noble b/ci/Dockerfile.ubuntu-noble
index 24a9d9b..aea19ea 100644
--- a/ci/Dockerfile.ubuntu-noble
+++ b/ci/Dockerfile.ubuntu-noble
@@ -26,6 +26,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
         libxss-dev \
         valgrind \
         wayland-protocols \
+        libxkbcommon-dev \
  && apt-get clean
 
 ADD entrypoint.sh /srv/entrypoint