Instead of local patch, merge upstream git version:
commit 45cc81cd7abafe61bddb3ddce9f4fb8a9aa06c12
Author: Julien Cristau <jcristau@debian.org>
Date:  Thu Sep 8 22:11:15 2011 +0200

    Include <sys/time.h> and <sys/resource.h> unconditionally

    Suggested by Mark Kettenis.

    X.Org bug#40632 <https://bugs.freedesktop.org/show_bug.cgi?id=40632>

    Signed-off-by: Julien Cristau <jcristau@debian.org>

(wiz)