add patches from debian package
Merge branch 'master' into debian-patches
fix compile error