Sorry the patch is ofc meant to be applied on the raw upstream, not
after debian patches being applied. I was applying it directly into the
git repo so that's why I did not have any issue. If you want to keep
trying it this way, I attached a rebased version of the patch that
should apply well on top of other.