Fix compiler warning

* src/libgit2/cachec.c: Use forward declaration instead of include to
  fix compiler warning: "ERROR" redefined.

* patches/cache-pass-R-CMD-check-git2r.patch: Update

Signed-off-by: Stefan Widgren <stefan.widgren@gmail.com>