You need the second patch. I am still struggling with Mercurial to - add - one - file.
Okay if I apply both, I see that it runs now. The first patch includes apple noise like this:
diff -r a95a7ce22722 -r 8339092e3580 chirp/drivers/.DS_Store Binary file chirp/drivers/.DS_Store has changed
The second one removes the tox.ini file from the tree and includes some just random whitespace damage to the code the first one adds.
Since the first one is untestable, I don't really want to apply it even with the second one behind it. Squashing them together would mean I'm just re-writing the commit message for you and removing the damage to other files in the tree. I try to stick to the process of applying whole patches from people unless they really can't do it themselves.
Can you squash them together and re-send as a unified patch that works? I'll handle getting the image into it before I push.
Thanks!
--Dan