Refresh mutter gcc 4.8 compile fix patch

Upstream has requested me to do some changes to this patch. This is the
updated patch based on their feedback.