[arch-commits] Commit in fbv/trunk (PKGBUILD giflib-5.0.patch giflib-5.1.patch)

[Sergej Pupykin]

    Date: Thursday, May 29, 2014 @ 17:07:07
  Author: spupykin
Revision: 112180

upgpkg: fbv 1.0b-9

upd

Added:
  fbv/trunk/giflib-5.1.patch
    (from rev 112172, fbv/trunk/giflib-5.0.patch)
Modified:
  fbv/trunk/PKGBUILD
Deleted:
  fbv/trunk/giflib-5.0.patch

------------------+
 PKGBUILD         |    8 +++---
 giflib-5.0.patch |   21 -----------------
 giflib-5.1.patch |   62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-29 15:06:03 UTC (rev 112179)
+++ PKGBUILD	2014-05-29 15:07:07 UTC (rev 112180)
@@ -4,7 +4,7 @@
 
 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/"
@@ -11,9 +11,9 @@
 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
@@ -20,7 +20,7 @@
   ./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
 }
 

Deleted: giflib-5.0.patch
===================================================================
--- giflib-5.0.patch	2014-05-29 15:06:03 UTC (rev 112179)
+++ giflib-5.0.patch	2014-05-29 15:07:07 UTC (rev 112180)
@@ -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
-     {

Copied: fbv/trunk/giflib-5.1.patch (from rev 112172, fbv/trunk/giflib-5.0.patch)
===================================================================
--- giflib-5.1.patch	                        (rev 0)
+++ giflib-5.1.patch	2014-05-29 15:07:07 UTC (rev 112180)
@@ -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