Fix fallout from giflib5.

2 files changed, 73 insertions, 1 deletions

diff --git a/x11/gnustep-gui/distinfo b/x11/gnustep-gui/distinfo
index fd44e0962ed..c6d56c2f8a3 100644
--- a/x11/gnustep-gui/distinfo
+++ b/x11/gnustep-gui/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.25 2013/03/23 12:20:43 joerg Exp $
+$NetBSD: distinfo,v 1.26 2013/08/30 22:42:18 joerg Exp $
 
 SHA1 (gnustep-gui-0.22.0.tar.gz) = dc9654ea3437810a9b4bfd3d2193a25628a88b41
 RMD160 (gnustep-gui-0.22.0.tar.gz) = 20153480d712a148e9e504f09273f70e1ba2f6d2
 Size (gnustep-gui-0.22.0.tar.gz) = 2734733 bytes
 SHA1 (patch-Headers_AppKit_NSNibDeclarations.h) = 6195f4771b515b20a7bdf998c2f2eec37b5fb856
+SHA1 (patch-Source_NSBitmapImageRep+GIF.m) = 3be81ee1b9cdabc72dc843c1240d48f5b2a4c8bc
 SHA1 (patch-Source_NSBitmapImageRep+PNG.m) = 089f3bbb54f1fb3449cf34d69e09a82fb4dffc59
diff --git a/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+GIF.m b/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+GIF.m
new file mode 100644
index 00000000000..ba68a984c63
--- /dev/null
+++ b/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+GIF.m
@@ -0,0 +1,71 @@
+$NetBSD: patch-Source_NSBitmapImageRep+GIF.m,v 1.1 2013/08/30 22:42:18 joerg Exp $
+
+--- Source/NSBitmapImageRep+GIF.m.orig	2013-08-30 19:58:11.000000000 +0000
++++ Source/NSBitmapImageRep+GIF.m
+@@ -140,7 +140,7 @@ static int gs_gif_output(GifFileType *fi
+     }
+ 
+   gs_gif_init_input_source(&src, imageData);
+-  file = DGifOpen(&src, gs_gif_input);
++  file = DGifOpen(&src, gs_gif_input, NULL);
+   if (file == NULL)
+     {
+       /* we do not use giferror here because it doesn't
+@@ -214,7 +214,7 @@ static int gs_gif_output(GifFileType *fi
+ 
+   /* open the image */
+   gs_gif_init_input_source(&src, imageData);
+-  file = DGifOpen(&src, gs_gif_input);
++  file = DGifOpen(&src, gs_gif_input, NULL);
+   if (file == NULL)
+     {
+       /* we do not use giferror here because it doesn't
+@@ -457,10 +457,10 @@ static int gs_gif_output(GifFileType *fi
+   // If you have a color table, you must be certain that it is GIF format
+   colorTable = [self valueForProperty: NSImageRGBColorTable];	// nil is OK
+   colorMapSize = (colorTable)? [colorTable length]/sizeof(GifColorType) : 256;
+-  GIFColorMap = MakeMapObject(colorMapSize, [colorTable bytes]);
++  GIFColorMap = GifMakeMapObject(colorMapSize, [colorTable bytes]);
+   if (!GIFColorMap)
+     {
+-      SET_ERROR_MSG(@"GIFRepresentation (giflib): MakeMapObject() failed.");
++      SET_ERROR_MSG(@"GIFRepresentation (giflib): GifMakeMapObject() failed.");
+       free(rgbPlanes);
+       return nil;
+     }
+@@ -471,7 +471,7 @@ static int gs_gif_output(GifFileType *fi
+       SET_ERROR_MSG(@"GIFRepresentation: malloc out of memory.");
+       free(rgbPlanes);
+     }
+-  status = QuantizeBuffer(width, height, &colorMapSize,
++  status = GifQuantizeBuffer(width, height, &colorMapSize,
+ 		       redPlane, greenPlane, bluePlane,
+ 		       GIFImage, GIFColorMap->Colors);
+   if (status == GIF_ERROR)
+@@ -481,7 +481,7 @@ static int gs_gif_output(GifFileType *fi
+       return nil;
+     }
+ 
+-  // QuantizeBuffer returns an optimized colorMapSize,
++  // GifQuantizeBuffer returns an optimized colorMapSize,
+   // but we must round up to nearest power of 2
+   // otherwise MakeColorMap() fails
+   for (h = 0; h < 8; h++)
+@@ -499,7 +499,7 @@ static int gs_gif_output(GifFileType *fi
+       free(GIFImage);
+       return nil;
+     }
+-  GIFFile = EGifOpen(GIFRep, gs_gif_output);
++  GIFFile = EGifOpen(GIFRep, gs_gif_output, NULL);
+   status = EGifPutScreenDesc(GIFFile, width, height, 8, 0, NULL);
+   if (status == GIF_ERROR)
+     {
+@@ -509,7 +509,7 @@ static int gs_gif_output(GifFileType *fi
+     }
+ 
+   // note we are not supporting interlaced mode
+-  status = EGifPutImageDesc(GIFFile, 0, 0, width, height, FALSE, GIFColorMap);
++  status = EGifPutImageDesc(GIFFile, 0, 0, width, height, 0, GIFColorMap);
+   if (status == GIF_ERROR)
+     {
+       SET_ERROR_MSG(@"GIFRepresentation (giflib): EGifPutImageDesc() failed.");