sync back with AUR upstream
sync patches with upstream