[arch-commits] Commit in fbida/trunk (PKGBUILD ida-PrintGifError.patch)

[Eric Bélanger]

    Date: Wednesday, October 21, 2015 @ 22:50:55
  Author: eric
Revision: 249602

upgpkg: fbida 2.10-1

Upstream update, Remove old patch

Modified:
  fbida/trunk/PKGBUILD
Deleted:
  fbida/trunk/ida-PrintGifError.patch

-------------------------+
 PKGBUILD                |   13 +++----
 ida-PrintGifError.patch |   83 ----------------------------------------------
 2 files changed, 6 insertions(+), 90 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-21 19:32:34 UTC (rev 249601)
+++ PKGBUILD	2015-10-21 20:50:55 UTC (rev 249602)
@@ -2,8 +2,8 @@
 # Maintainer: Eric Bélanger <eric at archlinux.org>
 
 pkgname=fbida
-pkgver=2.09
-pkgrel=4
+pkgver=2.10
+pkgrel=1
 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
 arch=('i686' 'x86_64')
 url="http://www.kraxel.org/blog/linux/fbida/"
@@ -13,11 +13,10 @@
 optdepends=('ghostscript: to use fbgs')
 install=fbida.install
 source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-        ida-desktop.patch ida-PrintGifError.patch)
-sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7'
+        ida-desktop.patch)
+sha1sums=('127d80f258d429ff8f2474949b1cf0ab78682ff7'
           'SKIP'
-          'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717'
-          'a5644d75e868bfc23bc462c3b4bc84c1a168146c')
+          'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717')
 validpgpkeys=('A0328CFFB93A17A79901FE7D4CB6D8EED3E87138')
 
 prepare() {
@@ -24,7 +23,7 @@
   cd ${pkgname}-${pkgver}
   sed -i 's/ungif/gif/' GNUmakefile
   patch -p0 -i "${srcdir}/ida-desktop.patch"
-  patch -p1 -i "${srcdir}/ida-PrintGifError.patch"
+  echo 2.10 > VERSION
 }
 
 build() {

Deleted: ida-PrintGifError.patch
===================================================================
--- ida-PrintGifError.patch	2015-10-21 19:32:34 UTC (rev 249601)
+++ ida-PrintGifError.patch	2015-10-21 20:50:55 UTC (rev 249602)
@@ -1,83 +0,0 @@
-diff -Naur fbida-2.09-orig/rd/read-gif.c fbida-2.09/rd/read-gif.c
---- fbida-2.09-orig/rd/read-gif.c	2013-07-29 16:43:26.949362012 -0400
-+++ fbida-2.09/rd/read-gif.c	2013-07-29 16:43:43.669166969 -0400
-@@ -13,6 +13,14 @@
-     int w,h;
- };
- 
-+static void
-+localPrintGifError(void)
-+{
-+    int ErrorCode=0;
-+    GifErrorString(ErrorCode);
-+    fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode);
-+}
-+
- static GifRecordType
- gif_fileread(struct gif_state *h)
- {
-@@ -25,7 +33,7 @@
- 	if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) {
- 	    if (debug)
- 		fprintf(stderr,"gif: DGifGetRecordType failed\n");
--	    PrintGifError();
-+	    localPrintGifError();
- 	    return -1;
- 	}
- 	switch (RecordType) {
-@@ -42,7 +50,7 @@
- 		if (rc == GIF_ERROR) {
- 		    if (debug)
- 			fprintf(stderr,"gif: DGifGetExtension failed\n");
--		    PrintGifError();
-+		    localPrintGifError();
- 		    return -1;
- 		}
- 		if (debug) {
-@@ -93,12 +101,13 @@
-     struct gif_state *h;
-     GifRecordType RecordType;
-     int i, image = 0;
--    
-+    int Error;
-+
-     h = malloc(sizeof(*h));
-     memset(h,0,sizeof(*h));
- 
-     h->infile = fp;
--    h->gif = DGifOpenFileHandle(fileno(fp));
-+    h->gif = DGifOpenFileHandle(fileno(fp), &Error);
-     h->row = malloc(h->gif->SWidth * sizeof(GifPixelType));
- 
-     while (0 == image) {
-@@ -108,7 +117,7 @@
- 	    if (GIF_ERROR == DGifGetImageDesc(h->gif)) {
- 		if (debug)
- 		    fprintf(stderr,"gif: DGifGetImageDesc failed\n");
--		PrintGifError();
-+		localPrintGifError();
- 	    }
- 	    if (NULL == h->gif->SColorMap &&
- 		NULL == h->gif->Image.ColorMap) {
-@@ -165,7 +165,7 @@
-  oops:
-     if (debug)
- 	fprintf(stderr,"gif: fatal error, aborting\n");
--    DGifCloseFile(h->gif);
-+    DGifCloseFile(h->gif, &Error);
-     fclose(h->infile);
-     free(h->row);
-     free(h);
-@@ -202,10 +202,11 @@
- gif_done(void *data)
- {
-     struct gif_state *h = data;
-+    int Error;
- 
-     if (debug)
- 	fprintf(stderr,"gif: done, cleaning up\n");
--    DGifCloseFile(h->gif);
-+    DGifCloseFile(h->gif, &Error);
-     fclose(h->infile);
-     if (h->il)
- 	free(h->il);