If you don't mind, can you go through the other patches and make sure that nothing similar happened? If something like this happened in a text string instead of a program variable/define, the compiler won't catch it and we'd end up shipping a regression.
Found one build error in the major packages (amarok): fixed in GIT hash 6bc5350c. Everything else built without error.
Darrell