patch xf86-input-keyboard：Falling back to patching base and 3-way merge...

[shzhxh]

My OS is Debian 11, when i run ./aero.py --sysroot, I encountered the error:

xbstrap: fetch xf86-input-keyboard [59/71]
Initialized empty Git repository in /home/szx/Code/os/aero/bundled/xf86-input-keyboard/.git/
remote: Enumerating objects: 28, done.
remote: Counting objects: 100% (28/28), done.
remote: Compressing objects: 100% (28/28), done.
remote: Total 28 (delta 3), reused 9 (delta 0), pack-reused 0
Unpacking objects: 100% (28/28), 51.90 KiB | 208.00 KiB/s, done.
From https://gitlab.freedesktop.org/xorg/driver/xf86-input-keyboard
 * [new tag]         xf86-input-keyboard-1.9.0 -> xf86-input-keyboard-1.9.0
xbstrap: checkout xf86-input-keyboard [60/71]
HEAD is now at 0c7f512 keyboard 1.9.0
xbstrap: patch xf86-input-keyboard [61/71]
Applying: keydev: aero specific changes
Applying: keydev: aero specific changes
Using index info to reconstruct a base tree...
M       .gitignore
M       configure.ac
M       src/Makefile.am
.git/rebase-apply/patch:100: trailing whitespace.
static int KbdOn(InputInfoPtr pInfo, int what) { 
.git/rebase-apply/patch:101: trailing whitespace.
    return Success;  
.git/rebase-apply/patch:105: trailing whitespace.
    printf("aero::kbdOff: is a stub!\n"); 
.git/rebase-apply/patch:167: trailing whitespace.
Bool xf86OSKbdPreInit(InputInfoPtr pInfo) { 
warning: 4 lines add whitespace errors.
Falling back to patching base and 3-way merge...
CONFLICT (add/add): Merge conflict in src/aero_kbd.c
Auto-merging src/aero_kbd.c
error: Failed to merge in the changes.
Patch failed at 0001 keydev: aero specific changes
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
xbstrap: Action patch of source xf86-input-keyboard failed

[Andy-Python-Programmer]

Hi @shzhxh, can you you please try to build the xf86-input-keyboard package again with the latest changes in master.

[shzhxh]

Thanks a lot! Don't report this error anymore.