[packaging] Update bug 1042525 patch to make it buildable