diff --git a/config/redbear-full.toml b/config/redbear-full.toml index cb81e51923..7a145dcc65 100644 --- a/config/redbear-full.toml +++ b/config/redbear-full.toml @@ -291,6 +291,7 @@ libxfixes = {} libxi = {} libxrender = {} libxft = {} +libxkbfile = {} util-macros = {} xcb-util = {} xcb-util-image = {} diff --git a/local/recipes/kde/plasma-desktop/recipe.toml b/local/recipes/kde/plasma-desktop/recipe.toml index fc94706b7f..e1ce343caf 100644 --- a/local/recipes/kde/plasma-desktop/recipe.toml +++ b/local/recipes/kde/plasma-desktop/recipe.toml @@ -23,6 +23,8 @@ dependencies = [ # recipe's sysroot cmake reports X11 as missing even though the libraries # exist -- the same gap libxcb had. "libx11", + # kcms/keyboard links X11::xkbfile (CMakeLists.txt:37) + "libxkbfile", "libxext", "libxfixes", "libxi", diff --git a/recipes/wip/x11/libxkbfile/recipe.toml b/recipes/x11/libxkbfile/recipe.toml similarity index 79% rename from recipes/wip/x11/libxkbfile/recipe.toml rename to recipes/x11/libxkbfile/recipe.toml index 12babbf4ce..25228ddeb8 100644 --- a/recipes/wip/x11/libxkbfile/recipe.toml +++ b/recipes/x11/libxkbfile/recipe.toml @@ -10,7 +10,9 @@ autotools_recursive_regenerate """ [build] -dependencies =[ +dependencies = [ + # XORG_MACROS_VERSION() in configure.ac -- autoreconf fails without it. + "util-macros", "libpthread-stubs", "libx11", "libxau",