[arch-commits] Commit in fbv/repos (3 files)

[Felix Yan]

    Date: Tuesday, July 7, 2020 @ 17:50:31
  Author: felixonmars
Revision: 659880

archrelease: copy trunk to community-staging-x86_64

Added:
  fbv/repos/community-staging-x86_64/
  fbv/repos/community-staging-x86_64/PKGBUILD
    (from rev 659878, fbv/trunk/PKGBUILD)
  fbv/repos/community-staging-x86_64/giflib-5.1.patch
    (from rev 659879, fbv/trunk/giflib-5.1.patch)

------------------+
 PKGBUILD         |   36 ++++++++++++++++++++++++++++++
 giflib-5.1.patch |   62 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 98 insertions(+)

Copied: fbv/repos/community-staging-x86_64/PKGBUILD (from rev 659878, fbv/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2020-07-07 17:50:31 UTC (rev 659880)
@@ -0,0 +1,36 @@
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Aectann <aectann at infoline.su>
+
+pkgname=fbv
+pkgver=1.0b
+pkgrel=11
+pkgdesc="FrameBuffer image viewer"
+arch=('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.1.patch')
+md5sums=('3e466375b930ec22be44f1041e77b55d'
+         'f91404fb82f0b6b9fc0e0716f0c182c0')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c
+  patch -Np1 -i ../giflib-5.1.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --mandir=/usr/share/man
+  sed -i 's|LIBS.*|LIBS=-lpng -ljpeg -lgif|' Make.conf
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  install -d "$pkgdir/usr/bin"
+  install -d "$pkgdir/usr/share/man/man1"
+  make DESTDIR="$pkgdir" install
+}

Copied: fbv/repos/community-staging-x86_64/giflib-5.1.patch (from rev 659879, fbv/trunk/giflib-5.1.patch)
===================================================================
--- community-staging-x86_64/giflib-5.1.patch	                        (rev 0)
+++ community-staging-x86_64/giflib-5.1.patch	2020-07-07 17:50:31 UTC (rev 659880)
@@ -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