Adapt to giflib-5.1 API change.

2 files changed, 42 insertions, 4 deletions

diff --git a/x11/gnustep-gui/distinfo b/x11/gnustep-gui/distinfo
index c6d56c2f8a3..063cbd48730 100644
--- a/x11/gnustep-gui/distinfo
+++ b/x11/gnustep-gui/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2013/08/30 22:42:18 joerg Exp $
+$NetBSD: distinfo,v 1.27 2014/05/25 07:18:44 obache 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+GIF.m) = 6615553063802931102f160571ed13ffd5c86968
 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
index ba68a984c63..5c45efd1022 100644
--- a/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+GIF.m
+++ b/x11/gnustep-gui/patches/patch-Source_NSBitmapImageRep+GIF.m
@@ -1,6 +1,8 @@
-$NetBSD: patch-Source_NSBitmapImageRep+GIF.m,v 1.1 2013/08/30 22:42:18 joerg Exp $
+$NetBSD: patch-Source_NSBitmapImageRep+GIF.m,v 1.2 2014/05/25 07:18:44 obache Exp $
 
---- Source/NSBitmapImageRep+GIF.m.orig	2013-08-30 19:58:11.000000000 +0000
+* Fixes build with giflib>5
+
+--- Source/NSBitmapImageRep+GIF.m.orig	2011-02-28 15:43:25.000000000 +0000
 +++ Source/NSBitmapImageRep+GIF.m
 @@ -140,7 +140,7 @@ static int gs_gif_output(GifFileType *fi
      }
@@ -11,6 +13,24 @@ $NetBSD: patch-Source_NSBitmapImageRep+GIF.m,v 1.1 2013/08/30 22:42:18 joerg Exp
    if (file == NULL)
      {
        /* we do not use giferror here because it doesn't
+@@ -149,7 +149,7 @@ static int gs_gif_output(GifFileType *fi
+       return NO;
+     }
+ 
+-  DGifCloseFile(file);
++  DGifCloseFile(file, NULL);
+   return YES;
+ }
+ 
+@@ -168,7 +168,7 @@ static int gs_gif_output(GifFileType *fi
+    SET_ERROR_MSG(msg); \
+    if (file != NULL) \
+      {\
+-       DGifCloseFile(file); \
++       DGifCloseFile(file, NULL); \
+      }\
+    if (imgBuffer != NULL) \
+      {\
 @@ -214,7 +214,7 @@ static int gs_gif_output(GifFileType *fi
  
    /* open the image */
@@ -20,6 +40,15 @@ $NetBSD: patch-Source_NSBitmapImageRep+GIF.m,v 1.1 2013/08/30 22:42:18 joerg Exp
    if (file == NULL)
      {
        /* we do not use giferror here because it doesn't
+@@ -376,7 +376,7 @@ static int gs_gif_output(GifFileType *fi
+           withValue: [NSNumber numberWithInt: 0]];
+ 
+   /* don't forget to close the gif */
+-  DGifCloseFile(file);
++  DGifCloseFile(file, NULL);
+ 
+   return self;
+ }
 @@ -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
@@ -69,3 +98,12 @@ $NetBSD: patch-Source_NSBitmapImageRep+GIF.m,v 1.1 2013/08/30 22:42:18 joerg Exp
    if (status == GIF_ERROR)
      {
        SET_ERROR_MSG(@"GIFRepresentation (giflib): EGifPutImageDesc() failed.");
+@@ -529,7 +529,7 @@ static int gs_gif_output(GifFileType *fi
+ 	}
+       GIFImageP += width;
+     }
+-  status = EGifCloseFile(GIFFile);
++  status = EGifCloseFile(GIFFile, NULL);
+ 
+   free(GIFImage);
+