[pkgsrc/trunk]: pkgsrc/wm/windowmaker Fix build with GIFLIB 5.0 and newer.

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0d5e1d991bfe
branches:  trunk
changeset: 621232:0d5e1d991bfe
user:      tron <tron%pkgsrc.org@localhost>
date:      Sat Jul 06 10:19:31 2013 +0000

description:
Fix build with GIFLIB 5.0 and newer.

diffstat:

 wm/windowmaker/distinfo                  |   3 +-
 wm/windowmaker/patches/patch-wrlib_gif.c |  36 ++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletions(-)

diffs (54 lines):

diff -r b1b5668a720b -r 0d5e1d991bfe wm/windowmaker/distinfo
--- a/wm/windowmaker/distinfo   Sat Jul 06 10:01:19 2013 +0000
+++ b/wm/windowmaker/distinfo   Sat Jul 06 10:19:31 2013 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2013/05/30 15:18:28 hans Exp $
+$NetBSD: distinfo,v 1.35 2013/07/06 10:19:31 tron Exp $
 
 SHA1 (WindowMaker-0.95.4.tar.gz) = 1477954668012010cf7991cb8139205768205717
 RMD160 (WindowMaker-0.95.4.tar.gz) = 9316c30d9d2ebd1080711596ec1b97158997fa3a
@@ -16,3 +16,4 @@
 SHA1 (patch-ak) = 33935c1d6192b2e3833cf1d5b3c724269cb051b3
 SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103
 SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031
+SHA1 (patch-wrlib_gif.c) = c050efa872151a326a2e96af16acb40c3bba4a9c
diff -r b1b5668a720b -r 0d5e1d991bfe wm/windowmaker/patches/patch-wrlib_gif.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/wm/windowmaker/patches/patch-wrlib_gif.c  Sat Jul 06 10:19:31 2013 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-wrlib_gif.c,v 1.1 2013/07/06 10:19:31 tron Exp $
+
+Fix build with GIFLIB 5.0 and newer.
+
+--- wrlib/gif.c.orig   2013-01-09 21:42:39.000000000 +0000
++++ wrlib/gif.c        2013-07-06 11:13:26.000000000 +0100
+@@ -50,6 +50,7 @@
+       unsigned char rmap[256];
+       unsigned char gmap[256];
+       unsigned char bmap[256];
++      int gif_error;
+ 
+       if (index < 0)
+               index = 0;
+@@ -57,10 +58,10 @@
+       /* default error message */
+       RErrorCode = RERR_BADINDEX;
+ 
+-      gif = DGifOpenFileName(file);
++      gif = DGifOpenFileName(file, &gif_error);
+ 
+       if (!gif) {
+-              switch (GifLastError()) {
++              switch (gif_error) {
+               case D_GIF_ERR_OPEN_FAILED:
+                       RErrorCode = RERR_OPEN;
+                       break;
+@@ -197,7 +198,7 @@
+       /* yuck! */
+       goto did_not_get_any_errors;
+  giferr:
+-      switch (GifLastError()) {
++      switch (gif->Error) {
+       case D_GIF_ERR_OPEN_FAILED:
+               RErrorCode = RERR_OPEN;
+               break;