Fix merge conflict issues

Signed-off-by: AnErrupTion <anerruption@disroot.org>

Remove further & all @cImport() usage in interop

Signed-off-by: AnErrupTion <anerruption@disroot.org>

[Backport] Fix buffer not resizing with no animation

Signed-off-by: AnErrupTion <anerruption@disroot.org>

[Backport] Recursively create xauth file directory if non-existent

Signed-off-by: AnErrupTion <anerruption@disroot.org>

Make delay floating point in dur format

Signed-off-by: AnErrupTion <anerruption@disroot.org>

Add FreeBSD-specific PAM file

Signed-off-by: AnErrupTion <anerruption@disroot.org>

Backport: Prevent Ly from zombifying when X.org is terminated

Signed-off-by: AnErrupTion <anerruption@disroot.org>

Backport: Fix XDG_RUNTIME_DIR not being set properly

Signed-off-by: AnErrupTion <anerruption@disroot.org>

Only support Ly v1.1.x in bug reports

Signed-off-by: AnErrupTion <anerruption@disroot.org>

Backport: Possibly fix .Xresources not being loaded

Signed-off-by: AnErrupTion <anerruption@disroot.org>