Oops, there is a problem with the first patch, the depends-bugfix. The /* other options */ code block should not have been moved.
I will re-release a correct patch soon. This is easy to fix locally. Get rid of the hunk which deletes the block, the third hunk marked @@ -730,12, +758,6 @@. Apply the patch, and then remove from the file the redundant /* other options */ block added by the second hunk.
