Thanks, applied as de1d72d86a965a53e87957d579039ef25a4f0c01.

Michael

[sent from post-receive hook]

On Mon, 08 Sep 2025 09:24:13 +0200, Christian Melki 
<[email protected]> wrote:
> Signed-off-by: Christian Melki <[email protected]>
> Message-Id: <[email protected]>
> Signed-off-by: Michael Olbrich <[email protected]>
> 
> diff --git a/rules/libxkbcommon.make b/rules/libxkbcommon.make
> index c2990132c331..2b3fe4c35bf4 100644
> --- a/rules/libxkbcommon.make
> +++ b/rules/libxkbcommon.make
> @@ -34,21 +34,21 @@ LIBXKBCOMMON_LICENSE_FILES := 
> file://LICENSE;md5=70eff33050c59f900f5b83275dcf121
>  LIBXKBCOMMON_CONF_TOOL       := meson
>  LIBXKBCOMMON_CONF_OPT        := \
>       $(CROSS_MESON_USR) \
> -     -Ddefault-layout='us' \
> -     -Ddefault-model='pc105' \
> -     -Ddefault-options='' \
> +     -Dxkb-config-root=$(XORG_DATADIR)/X11/xkb \
> +     -Dxkb-config-extra-path=/etc/xkb \
> +     -Dx-locale-root=$(XORG_DATADIR)/X11/locale \
>       -Ddefault-rules='evdev' \
> +     -Ddefault-model='pc105' \
> +     -Ddefault-layout='us' \
>       -Ddefault-variant='' \
> -     -Denable-bash-completion=true \
> -     -Denable-cool-uris=false \
> -     -Denable-docs=false \
> +     -Ddefault-options='' \
>       -Denable-tools=false \
> -     -Denable-wayland=false \
>       -Denable-x11=$(call ptx/truefalse, PTXCONF_LIBXKBCOMMON_X11) \
> +     -Denable-docs=false \
> +     -Denable-cool-uris=false \
> +     -Denable-wayland=false \
>       -Denable-xkbregistry=false \
> -     -Dx-locale-root=$(XORG_DATADIR)/X11/locale \
> -     -Dxkb-config-extra-path=/etc/xkb \
> -     -Dxkb-config-root=$(XORG_DATADIR)/X11/xkb \
> +     -Denable-bash-completion=true
>  
>  # 
> ----------------------------------------------------------------------------
>  # Target-Install

Reply via email to