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);
onette.scm?id=6296c032a3295a5a1920d432a595897ccd99cf48'>tree</a><a href='/guix/commit/gnu/build/marionette.scm?id=6296c032a3295a5a1920d432a595897ccd99cf48'>commit</a><a href='/guix/diff/gnu/build/marionette.scm?id=6296c032a3295a5a1920d432a595897ccd99cf48'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/build/marionette.scm'>
<input type='hidden' name='id' value='6296c032a3295a5a1920d432a595897ccd99cf48'/><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=6296c032a3295a5a1920d432a595897ccd99cf48'>root</a>/<a href='/guix/log/gnu?id=6296c032a3295a5a1920d432a595897ccd99cf48'>gnu</a>/<a href='/guix/log/gnu/build?id=6296c032a3295a5a1920d432a595897ccd99cf48'>build</a>/<a href='/guix/log/gnu/build/marionette.scm?id=6296c032a3295a5a1920d432a595897ccd99cf48'>marionette.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/marionette.scm?id=6296c032a3295a5a1920d432a595897ccd99cf48&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-02-22 00:45:42 +0100'>2020-02-22</span></td><td><a href='/guix/commit/gnu/build/marionette.scm?id=b6ec284fe8b67bba4b17aab98641a91a17658133'>marionette: Provide portable US-layout keystrokes for "&lt;" and "&gt;".</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/marionette.scm (%qwerty-us-keystrokes): Use shit-comma and
shift-dot for #\&lt; and #\&gt; because the "less" key doesn't work the same
in "US intl." layouts.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-02-22 00:45:42 +0100'>2020-02-22</span></td><td><a href='/guix/commit/gnu/build/marionette.scm?id=1708ed6e9d778795558ea4a2fd949270abd79797'>marionette: 'wait-for' procedures no longer leak a port.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/marionette.scm (wait-for-tcp-port): Close SOCK upon
success.
(wait-for-unix-socket): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-15 12:18:51 +0200'>2019-05-15</span></td><td><a href='/guix/commit/gnu/build/marionette.scm?id=604b167bf27d307c5bd30145b6486f90417d0d06'>marionette: Add braces to the keystrokes.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/marionette.scm (%qwerty-us-keystrokes): Add braces.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-08-28 00:19:58 -0700'>2018-08-28</span></td><td><a href='/guix/commit/gnu/build/marionette.scm?id=cb29343940dfffe8863c0a6b1e2b3494c7836b53'>marionette: Add wait-for-unix-socket.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/marionette.scm (wait-for-unix-socket): New variable.
</span></span></td><td>Chris Marusich</td></tr>
<tr><td><span title='2018-08-28 00:14:25 -0700'>2018-08-28</span></td><td><a href='/guix/commit/gnu/build/marionette.scm?id=4dd53a83b5292d4e90ca221d6bcf03350ed8dc45'>marionette: Add support for QEMU's "quit" command.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/marionette.scm (marionette-control): Don't wait for the
monitor prompt when the command was "quit".
</span></span></td><td>Chris Marusich</td></tr>
<tr><td><span title='2018-06-01 13:50:26 +0200'>2018-06-01</span></td><td><a href='/guix/commit/gnu/build/marionette.scm?id=7a4e2eaab34f7fad6951f312203ac0d9dfa3d44a'>marionette: Add 'wait-for-tcp-port'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/build/marionette.scm (wait-for-tcp-port): New procedure.
* gnu/tests/dict.scm (run-dicod-test)["connect inside"]: Use it instead
of the inline loop.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-02-19 22:04:11 +0100'>2018-02-19</span></td><td><a href='/guix/commit/gnu/build/marionette.scm?id=27a2c9c3e071fdb380c2f4f389b7cf4008dc75f7'>marionette: Use QEMU's "VM channel" mechanism.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/tests.scm (&lt;marionette-configuration&gt;)[device]: Default to
"/dev/virtio-ports/org.gnu.guix.port.0".
* gnu/tests.scm (marionette-shepherd-service): Remove (guix build
syscalls) from 'modules'.  Remove 'tcsetattr' call from 'start'.
* gnu/build/marionette.scm (make-marionette): Use "-virtserialport"
instead of "-virtconsole".
</span></span></td><td>Ludovic Courtès</td></tr>