Origin: $NetBSD: patch-src_libimage_gif.c,v 1.4 2019/11/16 17:36:28 ng0 Exp $

Modified by: R Veera Kumar <vkor@vkten.in> 2020-03-28; change to patch -p1

diff -uNr xplanet-1.3.1/src/libimage/gif.c xplanet-1.3.1.new/src/libimage/gif.c
--- xplanet-1.3.1/src/libimage/gif.c	2013-02-17 01:07:47.000000000 +0530
+++ xplanet-1.3.1.new/src/libimage/gif.c	2020-03-28 22:15:24.444309199 +0530
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-
+#include <stdbool.h>
 #include <gif_lib.h>
 
 /*
@@ -178,8 +178,12 @@
 	    *BufferP++ = ColorMapEntry->Blue;
 	}
     }
-    
+
+#if GIFLIB_MAJOR >= 5
+    if (DGifCloseFile(GifFile, NULL) == GIF_ERROR) {
+#else
     if (DGifCloseFile(GifFile) == GIF_ERROR) {
+#endif
 	return(0);
     }
 
@@ -493,7 +497,11 @@
 static void QuitGifError(GifFileType *GifFile)
 {
     fprintf(stderr, "Error writing GIF file\n");
+#if GIFLIB_MAJOR >= 5
+    if (GifFile != NULL) EGifCloseFile(GifFile, NULL);
+#else
     if (GifFile != NULL) EGifCloseFile(GifFile);
+#endif
 }
 
 int 
@@ -589,7 +597,11 @@
 	Ptr += width;
     }
 
+#if GIFLIB_MAJOR >= 5
+    if (EGifCloseFile(GifFile, NULL) == GIF_ERROR)
+#else
     if (EGifCloseFile(GifFile) == GIF_ERROR)
+#endif
 
     {
 	QuitGifError(GifFile);
d=bcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9'>tree</a><a href='/guix/commit/gnu/build/install.scm?id=bcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9'>commit</a><a href='/guix/diff/gnu/build/install.scm?id=bcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/install.scm'>
<input type='hidden' name='id' value='bcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=bcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9'>root</a>/<a href='/guix/log/gnu?id=bcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9'>gnu</a>/<a href='/guix/log/gnu/build?id=bcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9'>build</a>/<a href='/guix/log/gnu/build/install.scm?id=bcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9'>install.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/build/install.scm?id=bcd131dafbaf61ae823c0a3ba1b886f5b0c15ea9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-12-10 14:34:35 +0100'>2022-12-10</span></td><td><a href='/guix/commit/gnu/build/install.scm?id=61b7e9687757aff013b99e4ab15669a950c8b222'>install: 'umount-cow-store' retries upon EBUSY.</a><span class='msg-avail'>...<span class='msg-tooltip'>Possibly fixes &lt;https://issues.guix.gnu.org/59884&gt;.

* gnu/build/install.scm (umount*): New procedure.
(unmount-cow-store): Use it instead of 'umount'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-11-15 14:15:11 -0500'>2022-11-15</span></td><td><a href='/guix/commit/gnu/build/install.scm?id=0bb872b379a98e4523c8f8d946e581bad1c4c323'>install: Validate symlink target in evaluate-populate-directive.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/install.scm (evaluate-populate-directive): By default, error when
the target of a symlink doesn't exist.  Always ensure TARGET ends with "/".
(populate-root-file-system): Call evaluate-populate-directive with
 #:error-on-dangling-symlink #t and add comment.
</span></span></td><td>Maxim Cournoyer</td></tr>