diff options
| author | tron <tron> | 2014-05-16 09:29:39 +0000 |
|---|---|---|
| committer | tron <tron> | 2014-05-16 09:29:39 +0000 |
| commit | 373cf473109a5807cfe704b0bd45c683cda442b7 (patch) | |
| tree | 495da6c4802041159e9f8754e1dc7eeaa773803c /wm/windowmaker | |
| parent | 9fb645356cb396c32a9bc4f2b610a9031e513c42 (diff) | |
| download | pkgsrc-373cf473109a5807cfe704b0bd45c683cda442b7.tar.gz | |
Fix build with giflib 5.1 and newer.
Diffstat (limited to 'wm/windowmaker')
| -rw-r--r-- | wm/windowmaker/distinfo | 4 | ||||
| -rw-r--r-- | wm/windowmaker/patches/patch-wrlib_gif.c | 32 |
2 files changed, 27 insertions, 9 deletions
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo index afbba969671..c5372fc2db9 100644 --- a/wm/windowmaker/distinfo +++ b/wm/windowmaker/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.36 2014/01/17 08:48:06 adam Exp $ +$NetBSD: distinfo,v 1.37 2014/05/16 09:29:39 tron Exp $ SHA1 (WindowMaker-0.95.5.tar.gz) = b04aef6a9076dd31a4e819275a78ece1784db28e RMD160 (WindowMaker-0.95.5.tar.gz) = 40b7782e1c86c0f850a48daad23cdcdb13f74785 @@ -15,4 +15,4 @@ SHA1 (patch-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9 SHA1 (patch-ak) = 40221313ce3456f4357082caec17991390607159 SHA1 (patch-doc_cs_Makefile.in) = ab0b42a60863fec8fba0de0e8a2ae74fa3cf8103 SHA1 (patch-doc_ru_Makefile.in) = 7c0b861c6bbe457e8e55e0265335195b95bbe031 -SHA1 (patch-wrlib_gif.c) = c050efa872151a326a2e96af16acb40c3bba4a9c +SHA1 (patch-wrlib_gif.c) = 90fc1019391846983cb5e021c4bbea1d8afb0f99 diff --git a/wm/windowmaker/patches/patch-wrlib_gif.c b/wm/windowmaker/patches/patch-wrlib_gif.c index 210403b369e..ffc6ec779b3 100644 --- a/wm/windowmaker/patches/patch-wrlib_gif.c +++ b/wm/windowmaker/patches/patch-wrlib_gif.c @@ -1,10 +1,10 @@ -$NetBSD: patch-wrlib_gif.c,v 1.1 2013/07/06 10:19:31 tron Exp $ +$NetBSD: patch-wrlib_gif.c,v 1.2 2014/05/16 09:29:39 tron Exp $ -Fix build with GIFLIB 5.0 and newer. +Fix build with giflib 5.1 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 @@ +--- wrlib/gif.c.orig 2013-09-12 22:43:54.000000000 +0100 ++++ wrlib/gif.c 2014-05-16 10:10:04.000000000 +0100 +@@ -52,6 +52,7 @@ unsigned char rmap[256]; unsigned char gmap[256]; unsigned char bmap[256]; @@ -12,7 +12,7 @@ Fix build with GIFLIB 5.0 and newer. if (index < 0) index = 0; -@@ -57,10 +58,10 @@ +@@ -59,10 +60,10 @@ /* default error message */ RErrorCode = RERR_BADINDEX; @@ -25,7 +25,16 @@ Fix build with GIFLIB 5.0 and newer. case D_GIF_ERR_OPEN_FAILED: RErrorCode = RERR_OPEN; break; -@@ -197,7 +198,7 @@ +@@ -77,7 +78,7 @@ + } + + if (gif->SWidth < 1 || gif->SHeight < 1) { +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + RErrorCode = RERR_BADIMAGEFILE; + return NULL; + } +@@ -199,7 +200,7 @@ /* yuck! */ goto did_not_get_any_errors; giferr: @@ -34,3 +43,12 @@ Fix build with GIFLIB 5.0 and newer. case D_GIF_ERR_OPEN_FAILED: RErrorCode = RERR_OPEN; break; +@@ -220,7 +221,7 @@ + free(buffer); + + if (gif) +- DGifCloseFile(gif); ++ DGifCloseFile(gif, NULL); + + return image; + } |