From 44e9e0e14166749573afb6cd222e186add2652a8 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Thu, 17 Sep 2015 22:46:24 +0100
Subject: graphics/fbv: Fixed build with giflib-5.1.

Signed-off-by: David Spencer <baildon.research@googlemail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/fbv/fbv.SlackBuild   |  4 +++
 graphics/fbv/giflib-5.1.patch | 62 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 graphics/fbv/giflib-5.1.patch

(limited to 'graphics/fbv')

diff --git a/graphics/fbv/fbv.SlackBuild b/graphics/fbv/fbv.SlackBuild
index 90252b9f35..5a38877d22 100644
--- a/graphics/fbv/fbv.SlackBuild
+++ b/graphics/fbv/fbv.SlackBuild
@@ -77,6 +77,10 @@ patch -p1 < $CWD/manhelp.diff
 # have to do this instead, to use our CFLAGS:
 sed -i "s,-O2,$SLKCFLAGS," Makefile
 
+# Fix build with giflib-5.1 and libpng16 (thanks to Arch)
+patch -p1 < $CWD/giflib-5.1.patch
+sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c
+
 make
 strip $PRGNAM
 mkdir -p $PKG/usr/bin $PKG/usr/man/man1
diff --git a/graphics/fbv/giflib-5.1.patch b/graphics/fbv/giflib-5.1.patch
new file mode 100644
index 0000000000..1d819124f3
--- /dev/null
+++ b/graphics/fbv/giflib-5.1.patch
@@ -0,0 +1,62 @@
+diff -wbBur fbv-1.0b/gif.c fbv-1.0b.my/gif.c
+--- fbv-1.0b/gif.c	2003-08-25 00:23:02.000000000 +0400
++++ fbv-1.0b.my/gif.c	2014-05-29 18:39:41.337332872 +0400
+@@ -31,10 +31,10 @@
+ #include <string.h>
+ #define min(a,b) ((a) < (b) ? (a) : (b))
+ #define gflush return(FH_ERROR_FILE);
+-#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
+-#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
++#define grflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
++#define mgrflush { free(lb); free(slb); DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
+ #define agflush return(FH_ERROR_FORMAT);
+-#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); }
++#define agrflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); }
+ 
+ 
+ int fh_gif_id(char *name)
+@@ -81,7 +81,7 @@
+     ColorMapObject *cmap;
+     int cmaps;
+ 
+-    gft=DGifOpenFileName(name);
++    gft=DGifOpenFileName(name, NULL);
+     if(gft==NULL){printf("err5\n"); gflush;} //////////
+     do
+     {
+@@ -170,7 +170,7 @@
+ 	}
+     }
+     while( rt!= TERMINATE_RECORD_TYPE );
+-    DGifCloseFile(gft);
++    DGifCloseFile(gft, NULL);
+     return(FH_ERROR_OK);
+ }
+ 
+@@ -184,7 +184,7 @@
+     int extcode;
+     GifRecordType rt;
+ 
+-    gft=DGifOpenFileName(name);
++    gft=DGifOpenFileName(name, NULL);
+     if(gft==NULL) gflush;
+     do
+     {
+@@ -197,7 +197,7 @@
+ 		px=gft->Image.Width;
+ 		py=gft->Image.Height;
+ 		*x=px; *y=py;
+-		DGifCloseFile(gft);
++		DGifCloseFile(gft, NULL);
+ 		return(FH_ERROR_OK);
+ 		break;
+ 	    case EXTENSION_RECORD_TYPE:
+@@ -210,7 +210,7 @@
+ 	}  
+     }
+     while( rt!= TERMINATE_RECORD_TYPE );
+-    DGifCloseFile(gft);
++    DGifCloseFile(gft, NULL);
+     return(FH_ERROR_FORMAT);
+ }
+ #endif
-- 
cgit v1.2.3