summaryrefslogtreecommitdiff
path: root/wm/windowmaker
diff options
context:
space:
mode:
authortron <tron>2013-07-06 10:19:31 +0000
committertron <tron>2013-07-06 10:19:31 +0000
commit216ab0f99531f62ff8ac7091d25d28905b3c31b1 (patch)
tree6893c3bb230fcb7f84817d01745092e30aeeaee5 /wm/windowmaker
parentc7642776d3e3c50036e903e1238d674fa1e02dfe (diff)
downloadpkgsrc-216ab0f99531f62ff8ac7091d25d28905b3c31b1.tar.gz
Fix build with GIFLIB 5.0 and newer.
Diffstat (limited to 'wm/windowmaker')
-rw-r--r--wm/windowmaker/distinfo3
-rw-r--r--wm/windowmaker/patches/patch-wrlib_gif.c36
2 files changed, 38 insertions, 1 deletions
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index 49347aee96d..16cf3cd7c7e 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -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-aj) = 248d7088ee2ce861898a7474cde8a08f4b879ee9
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 --git a/wm/windowmaker/patches/patch-wrlib_gif.c b/wm/windowmaker/patches/patch-wrlib_gif.c
new file mode 100644
index 00000000000..210403b369e
--- /dev/null
+++ b/wm/windowmaker/patches/patch-wrlib_gif.c
@@ -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;