diff --git a/x11-packages/libxkbcommon/disable_tests.patch b/x11-packages/libxkbcommon/disable_tests.patch
index 68f88aece..e6219d9d5 100644
--- a/x11-packages/libxkbcommon/disable_tests.patch
+++ b/x11-packages/libxkbcommon/disable_tests.patch
@@ -1,7 +1,7 @@
-diff -uNr libxkbcommon-xkbcommon-0.8.2/meson.build libxkbcommon-xkbcommon-0.8.2.mod/meson.build
---- libxkbcommon-xkbcommon-0.8.2/meson.build	2018-08-05 08:55:39.000000000 +0300
-+++ libxkbcommon-xkbcommon-0.8.2.mod/meson.build	2018-09-28 17:13:05.819072368 +0300
-@@ -263,205 +263,6 @@
+diff -uNr libxkbcommon-xkbcommon-0.8.4/meson.build libxkbcommon-xkbcommon-0.8.4.mod/meson.build
+--- libxkbcommon-xkbcommon-0.8.4/meson.build	2019-02-22 22:26:49.000000000 +0200
++++ libxkbcommon-xkbcommon-0.8.4.mod/meson.build	2019-05-19 01:12:00.106498199 +0300
+@@ -273,170 +273,6 @@
      )
  endif
  
@@ -15,14 +15,14 @@ diff -uNr libxkbcommon-xkbcommon-0.8.2/meson.build libxkbcommon-xkbcommon-0.8.2.
 -test_env.set('MallocPreScribble', '1')
 -test_env.set('MallocScribble', '1')
 -# Some tests need to use unexported symbols, so we link them against
--# the internal copy of libxkbcommon with all symbols exposed.
+-# an internal copy of libxkbcommon with all symbols exposed.
 -libxkbcommon_test_internal = static_library(
 -    'xkbcommon-test-internal',
 -    'test/common.c',
 -    'test/test.h',
 -    'test/evdev-scancodes.h',
+-    libxkbcommon_sources,
 -    include_directories: include_directories('src'),
--    link_with: libxkbcommon_internal,
 -)
 -test_dep = declare_dependency(
 -    include_directories: include_directories('src'),
@@ -132,6 +132,7 @@ diff -uNr libxkbcommon-xkbcommon-0.8.2/meson.build libxkbcommon-xkbcommon-0.8.2.
 -
 -# Demo programs.
 -executable('rmlvo-to-kccgst', 'test/rmlvo-to-kccgst.c', dependencies: test_dep)
+-executable('rmlvo-to-keymap', 'test/rmlvo-to-keymap.c', dependencies: test_dep)
 -executable('print-compiled-keymap', 'test/print-compiled-keymap.c', dependencies: test_dep)
 -if cc.has_header('linux/input.h')
 -    executable('interactive-evdev', 'test/interactive-evdev.c', dependencies: test_dep)
@@ -168,6 +169,13 @@ diff -uNr libxkbcommon-xkbcommon-0.8.2/meson.build libxkbcommon-xkbcommon-0.8.2.
 -    executable('interactive-wayland', 'test/interactive-wayland.c', xdg_shell_sources, dependencies: [test_dep, wayland_client_dep])
 -endif
 -
+ # xkeyboard-config "verifier"
+ xkct_config = configuration_data()
+ xkct_config.set('MESON_BUILD_ROOT', meson.build_root())
+@@ -446,42 +282,6 @@
+                configuration: xkct_config,
+                install: false)
+ 
 -
 -# Benchmarks.
 -libxkbcommon_bench_internal = static_library(