Here is the updated patch.

I could try to make dpf a separate package but pretty much every package that uses dpf as a submodule uses a different version/commit of it.
-- 
 Secured with Tuta Mail: 
 https://tuta.com/free-email