systray patch - 2 or 28 hunks failed