Drop unneeded patches due to new upstream

* Alpha channel tests now pass
* similar htmlentities patch applied upstream

Renumbered the remaining patch accordingly.

Now the package builds!

Closes: #892183