summaryrefslogtreecommitdiff
path: root/community/fbv
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2014-06-17 03:27:11 +0000
committerNicolás Reynolds <fauno@endefensadelsl.org>2014-06-17 03:27:11 +0000
commit6459b84bf754eda5323f40eb7af76dde65b63251 (patch)
tree81947a270848520d4cf2f9d1c5ce91ced54fcdff /community/fbv
parent942111e62628e9a5c4729563215b1cfb8911735e (diff)
Tue Jun 17 03:23:47 UTC 2014
Diffstat (limited to 'community/fbv')
-rw-r--r--community/fbv/PKGBUILD10
-rw-r--r--community/fbv/giflib-5.0.patch21
-rw-r--r--community/fbv/giflib-5.1.patch62
3 files changed, 67 insertions, 26 deletions
diff --git a/community/fbv/PKGBUILD b/community/fbv/PKGBUILD
index aef9871e8..a9535a81f 100644
--- a/community/fbv/PKGBUILD
+++ b/community/fbv/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 98028 2013-10-04 09:54:24Z spupykin $
+# $Id: PKGBUILD 113159 2014-06-14 19:22:12Z andyrtr $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Aectann <aectann@infoline.su>
pkgname=fbv
pkgver=1.0b
-pkgrel=8
+pkgrel=9
pkgdesc="FrameBuffer image viewer"
arch=('i686' 'x86_64')
url="http://s-tech.elsat.net.pl/fbv/"
license=('GPL')
depends=('libpng' 'giflib' 'libjpeg')
source=(http://s-tech.elsat.net.pl/fbv/$pkgname-$pkgver.tar.gz
- giflib-5.0.patch)
+ giflib-5.1.patch)
md5sums=('3e466375b930ec22be44f1041e77b55d'
- '6310899c97c4226352ad409c1c7fefb3')
+ 'f91404fb82f0b6b9fc0e0716f0c182c0')
build() {
cd $srcdir/$pkgname-$pkgver
./configure --prefix=/usr --mandir=/usr/share/man
sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lgif|' Make.conf
sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c
- patch -Np1 -i ../giflib-5.0.patch
+ patch -Np1 -i ../giflib-5.1.patch
make
}
diff --git a/community/fbv/giflib-5.0.patch b/community/fbv/giflib-5.0.patch
deleted file mode 100644
index 462e2fb04..000000000
--- a/community/fbv/giflib-5.0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN a/gif.c b/gif.c
---- a/gif.c 2003-08-24 22:23:02.000000000 +0200
-+++ b/gif.c 2013-07-30 10:27:55.851099159 +0200
-@@ -81,7 +81,7 @@ int fh_gif_load(char *name,unsigned char
- ColorMapObject *cmap;
- int cmaps;
-
-- gft=DGifOpenFileName(name);
-+ gft=DGifOpenFileName(name, NULL);
- if(gft==NULL){printf("err5\n"); gflush;} //////////
- do
- {
-@@ -184,7 +184,7 @@ int fh_gif_getsize(char *name,int *x,int
- int extcode;
- GifRecordType rt;
-
-- gft=DGifOpenFileName(name);
-+ gft=DGifOpenFileName(name, NULL);
- if(gft==NULL) gflush;
- do
- {
diff --git a/community/fbv/giflib-5.1.patch b/community/fbv/giflib-5.1.patch
new file mode 100644
index 000000000..1d819124f
--- /dev/null
+++ b/community/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