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);
2a0a514bab'>tree</a><a href='/guix/commit/gnu/image.scm?id=884714c030b33c7579d55a18c12cb42a0a514bab'>commit</a><a href='/guix/diff/gnu/image.scm?id=884714c030b33c7579d55a18c12cb42a0a514bab'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/image.scm'>
<input type='hidden' name='id' value='884714c030b33c7579d55a18c12cb42a0a514bab'/><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=884714c030b33c7579d55a18c12cb42a0a514bab'>root</a>/<a href='/guix/log/gnu?id=884714c030b33c7579d55a18c12cb42a0a514bab'>gnu</a>/<a href='/guix/log/gnu/image.scm?id=884714c030b33c7579d55a18c12cb42a0a514bab'>image.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/image.scm?id=884714c030b33c7579d55a18c12cb42a0a514bab&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-09-30 10:47:59 +0200'>2020-09-30</span></td><td><a href='/guix/commit/gnu/image.scm?id=99d036ce8402326352c8aa181d89c6d0c7ce85a8'>image: Add image-type support.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/image.scm (&lt;image-type&gt;): New record,
(image-type, image-type?, image-type-name,
image-type-constructor, os-&gt;image): new procedures.

Signed-off-by: Mathieu Othacehe &lt;othacehe@gnu.org&gt;
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-06-24 20:24:34 +0200'>2020-06-24</span></td><td><a href='/guix/commit/gnu/image.scm?id=b904b59ce592c89dfb4675a8c06757afed6738a0'>image: Move hurd image definition to a dedicated file.</a><span class='msg-avail'>...<span class='msg-tooltip'>This moves hurd-disk-image to a dedicated file. It also defines a default
operating-system so that the image can be built standalone.

* gnu/system/images/hurd.scm: New file,
* gnu/local.mk (GNU_SYSTEM_MODULES): add it,
* gnu/system/image.scm (root-offset, root-label): Export it,
(hurd-disk-image): remove it as this is now defined in the new, Hurd dedicated
file above,
(find-image): adapt to avoid loop dependency.
</span></span></td><td>Mathieu Othacehe</td></tr>
<tr><td><span title='2020-06-13 15:20:52 +0200'>2020-06-13</span></td><td><a href='/guix/commit/gnu/image.scm?id=f292d4719dead6a615187f325fbc0bb0e99d10b4'>image: Add 'target' support.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/image.scm (&lt;image&gt;)[target]: New field,
(image-target): new public method.
* gnu/system/image.scm (hurd-disk-image): Set "i586-pc-gnu" as image 'target'
field,
(maybe-with-target): new procedure,
(system-image): honor image 'target' field using the above procedure.
</span></span></td><td>Mathieu Othacehe</td></tr>