Merge pull request #313 from anoek/master

Build fixes for arch linux

src/Image.cc

@@ -487,8 +487,14 @@ Image::loadGIFFromBuffer(uint8_t *buf, unsigned len) {
 
   gif_data_t gifd = { buf, len, 0 };
 
+#if GIFLIB_MAJOR >= 5
+  int errorcode;
+  if ((gif = DGifOpen((void*) &gifd, read_gif_from_memory, &errorcode)) == NULL)
+    return CAIRO_STATUS_READ_ERROR; 
+#else
   if ((gif = DGifOpen((void*) &gifd, read_gif_from_memory)) == NULL)
     return CAIRO_STATUS_READ_ERROR; 
+#endif
 
   if (GIF_OK != DGifSlurp(gif)) {
     DGifCloseFile(gif);

src/PNG.h

@@ -4,6 +4,7 @@
 #include <pngconf.h>
 #include <cairo.h>
 #include <stdlib.h>
+#include <string.h>
 #include "closure.h"
 
 #if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__)