Christoph Cullmann authored Aug 02, 2021 and Christoph Cullmann committed Aug 02, 2021

incooperate the sole patches needed there from
haikuports


(cherry picked from commit 84f9368e)