diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 82a8fbee..f21fd776 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -166,12 +166,16 @@ jobs:
         with:
           path: contrib/depends/sources
           key: depends-sources-${{ hashFiles('contrib/depends/packages/*') }}
+          restore-keys: |
+            depends-sources-
       - name: restore depends built cache (mingw)
         id: cache-built
         uses: actions/cache/restore@v4
         with:
           path: contrib/depends/built
           key: depends-built-mingw32-${{ hashFiles('contrib/depends/packages/*', 'contrib/depends/hosts/*', 'contrib/depends/toolchain.cmake.in') }}
+          restore-keys: |
+            depends-built-mingw32-
       - name: build depends (static Qt6 + tor + boost + openssl for mingw)
         # -j2 not -j(nproc): the parallel static Qt6 compile OOMs the 16G runner at -j4. Slower but safe.
         run: make -C contrib/depends HOST="$HOST" -j2
@@ -276,12 +280,16 @@ jobs:
         with:
           path: contrib/depends/sources
           key: depends-sources-${{ hashFiles('contrib/depends/packages/*') }}
+          restore-keys: |
+            depends-sources-
       - name: restore depends built cache
         id: cache-built
         uses: actions/cache/restore@v4
         with:
           path: contrib/depends/built
           key: depends-built-${{ matrix.host }}-${{ hashFiles('contrib/depends/packages/*', 'contrib/depends/hosts/*', 'contrib/depends/toolchain.cmake.in') }}
+          restore-keys: |
+            depends-built-${{ matrix.host }}-
       - name: build depends (static Qt6 + tor + boost + openssl)
         run: make -C contrib/depends HOST="$HOST" -j2
       - name: save depends sources cache
diff --git a/contrib/depends/packages/libxkbcommon.mk b/contrib/depends/packages/libxkbcommon.mk
index 497dd412..ccd98e1b 100644
--- a/contrib/depends/packages/libxkbcommon.mk
+++ b/contrib/depends/packages/libxkbcommon.mk
@@ -19,7 +19,7 @@ define $(package)_preprocess_cmds
 endef
 
 define $(package)_config_cmds
-  meson setup --cross-file toolchain.txt build -Dxkb-config-root=/usr/share/X11/xkb -Dxkb-config-extra-path=/app/share/X11/xkb
+  meson setup --cross-file toolchain.txt build -Dxkb-config-root=/usr/share/X11/xkb -Dxkb-config-extra-path=/app/share/X11/xkb -Dxkb-config-unversioned-extensions-path=/usr/share/X11/xkb.d -Dxkb-config-versioned-extensions-path=/usr/share/X11/xkb.d
 endef
 
 define $(package)_build_cmds