Remove patch parts for which a different fix was integrated upstream.
Remove patch parts which can be solved differently in the Makefile.
Bump version, per upstream.