move to actual patch filename
add a proper patch for type1 fonts
update to newer patch for type1
Merge divergent branches