[opencv-git] Adapt fsh.patch to upstream changes