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);
ices/databases.scm?id=d7e73930c004c902f78cb4b80eba88d3c057c4b8'>tree</a><a href='/guix/commit/gnu/services/databases.scm?id=d7e73930c004c902f78cb4b80eba88d3c057c4b8'>commit</a><a href='/guix/diff/gnu/services/databases.scm?id=d7e73930c004c902f78cb4b80eba88d3c057c4b8'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/databases.scm'>
<input type='hidden' name='id' value='d7e73930c004c902f78cb4b80eba88d3c057c4b8'/><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=d7e73930c004c902f78cb4b80eba88d3c057c4b8'>root</a>/<a href='/guix/log/gnu?id=d7e73930c004c902f78cb4b80eba88d3c057c4b8'>gnu</a>/<a href='/guix/log/gnu/services?id=d7e73930c004c902f78cb4b80eba88d3c057c4b8'>services</a>/<a href='/guix/log/gnu/services/databases.scm?id=d7e73930c004c902f78cb4b80eba88d3c057c4b8'>databases.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/services/databases.scm?id=d7e73930c004c902f78cb4b80eba88d3c057c4b8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-01 22:30:52 +0100'>2020-12-01</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=3cf19b83d634d7470b2478a671b0156c521ecbea'>services: MySQL: Fix indentation.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-12-01 22:30:52 +0100'>2020-12-01</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=383c51ca0ff9c2f451a9ecf0baf4081005254f23'>services: databases: Do not export record type descriptors.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-11-28 19:51:40 +0100'>2020-11-28</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=e20388ad7f94e72a7a71272a742031fb5c1fbb4b'>services: MySQL: Upgrade database schemas automatically.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-11-28 19:51:40 +0100'>2020-11-28</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=927bf98e0e35cbd6d3c8416742f695def8faf90b'>services: MySQL: Make the socket configurable.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-11-28 19:51:40 +0100'>2020-11-28</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=27d7cdbf87e7a4520f93ee3914139215abf94e68'>services: MySQL: Bind to localhost only by default.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-11-28 19:51:40 +0100'>2020-11-28</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=89b704a456ef1cdef855a6c483832a05e1117f24'>services: MySQL: Deprecate 'mysql-service'.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-10-20 22:39:43 +0100'>2020-10-20</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=bdcf4d88d58798eca7811c8b1fbd4638168d05c3'>services: databases: Don't specify a default postgresql version.</a><span class='msg-avail'>...</span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2020-10-20 22:39:43 +0100'>2020-10-20</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=a698df72d37aa5173c357b7d1e3873d2c2c64c32'>services: databases: Deprecate the postgresql-service procedure.</a><span class='msg-avail'>...</span></td><td>Christopher Baines</td></tr>
<tr><td><span title='2020-08-01 11:54:41 +0200'>2020-08-01</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=3bf4761e397ade056ebb7f5891797317768e6442'>services: postgresql: Provide postgresql commands.</a><span class='msg-avail'>...</span></td><td>Pierre Neidhardt</td></tr>
<tr><td><span title='2020-01-17 11:28:40 +0100'>2020-01-17</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=33ed8296c0837344f932d6885de41b23c2b12dd3'>gnu: services: Allow extra content in mysql configuration.</a><span class='msg-avail'>...</span></td><td>Alex Sassmannshausen</td></tr>
<tr><td><span title='2020-01-14 00:43:00 +0100'>2020-01-14</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=5c3d77c3b14a9e87b4075efa4d7a877181e25665'>gnu: services: Fix mysql service activation.</a><span class='msg-avail'>...</span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2019-07-02 18:33:51 +0200'>2019-07-02</span></td><td><a href='/guix/commit/gnu/services/databases.scm?id=334a2f4def1d4f9dc37718d847923cd941849607'>gnu: postgres service: More secure default permissions.</a><span class='msg-avail'>...</span></td><td>Robert Vollmert</td></tr>