diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2016-01-24 23:46:47 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-26 18:58:51 +0700 |
| commit | 84b1edf00df4116d57ed32054c10a3b0297ceb29 (patch) | |
| tree | 1f2cef70b5c9ac5257717cd890201d54b070802a | |
| parent | b996d855ce15548f534707471aeea4b57423a7f5 (diff) | |
| download | slackbuilds-84b1edf00df4116d57ed32054c10a3b0297ceb29.tar.gz | |
graphics/fbv: Revert 44e9e0e "Fixed build with giflib-5.1".
This duplicated 3c1c6ee "Fix compile issue" and caused the build
to fail.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | graphics/fbv/fbv.SlackBuild | 4 | ||||
| -rw-r--r-- | graphics/fbv/giflib-5.1.patch | 62 |
2 files changed, 0 insertions, 66 deletions
diff --git a/graphics/fbv/fbv.SlackBuild b/graphics/fbv/fbv.SlackBuild index 5a38877d22..90252b9f35 100644 --- a/graphics/fbv/fbv.SlackBuild +++ b/graphics/fbv/fbv.SlackBuild @@ -77,10 +77,6 @@ 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 deleted file mode 100644 index 1d819124f3..0000000000 --- a/graphics/fbv/giflib-5.1.patch +++ /dev/null @@ -1,62 +0,0 @@ -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 |