[arch-commits] Commit in ekg2/trunk (PKGBUILD ekg2-0.3.1-giflib5.patch)

[Bartłomiej Piotrowski]

    Date: Saturday, August 31, 2013 @ 11:41:04
  Author: bpiotrowski
Revision: 96536

upgpkg: ekg2 0.3.1-8

- fix remaining giflib 5.0 issues (FS#36734)

Modified:
  ekg2/trunk/PKGBUILD
  ekg2/trunk/ekg2-0.3.1-giflib5.patch

--------------------------+
 PKGBUILD                 |    4 ++--
 ekg2-0.3.1-giflib5.patch |   26 ++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-31 09:38:00 UTC (rev 96535)
+++ PKGBUILD	2013-08-31 09:41:04 UTC (rev 96536)
@@ -4,7 +4,7 @@
 
 pkgname=ekg2
 pkgver=0.3.1
-pkgrel=7
+pkgrel=8
 pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client'
 arch=('i686' 'x86_64')
 url="http://ekg2.org/"
@@ -16,7 +16,7 @@
 source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz
         ekg2-0.3.1-giflib5.patch)
 md5sums=('68fc05b432c34622df6561eaabef5a40'
-         'f3b6979e9b8705b0b9c7efd3f3a808fd')
+         'e5855316bf7e9b456ebabb7cb9340e98')
 
 prepare() {
   cd $pkgname-$pkgver

Modified: ekg2-0.3.1-giflib5.patch
===================================================================
--- ekg2-0.3.1-giflib5.patch	2013-08-31 09:38:00 UTC (rev 96535)
+++ ekg2-0.3.1-giflib5.patch	2013-08-31 09:41:04 UTC (rev 96536)
@@ -1,12 +1,30 @@
 diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c
 --- a/plugins/gg/commands.c	2011-03-17 18:08:11.000000000 +0100
-+++ b/plugins/gg/commands.c	2013-07-29 18:45:51.296790942 +0200
-@@ -1034,7 +1034,7 @@ static int token_gif_load (char *fname,
++++ b/plugins/gg/commands.c	2013-08-31 11:31:42.521377436 +0200
+@@ -1029,14 +1029,15 @@ static int token_gif_load (char *fname,
+ 	GifFileType *file;
+ 	int fd;
+ 	fd = open(fname, O_RDONLY);
++	int giferror;
+ 	if (fd == -1) {
+ 		snprintf(errbuf, sizeof(errbuf), "open(%s): %m", fname);
  		goto err;
  	}
  	
 -	if (!(file = DGifOpenFileHandle(fd))) {
-+	if (!(file = DGifOpenFileHandle(fd, NULL))) {
++	if (!(file = DGifOpenFileHandle(fd, giferror))) {
  		snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", 
- 			GifLastError());
+-			GifLastError());
++			GifErrorString(giferror));
  		goto err2;
+ 	}
+ 
+@@ -1046,7 +1047,7 @@ static int token_gif_load (char *fname,
+ 	}
+ 	
+ 	if (DGifSlurp(file) != GIF_OK) {
+-		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifLastError());
++		snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifErrorString(GIF_ERROR));
+ 		goto err3;
+ 	}
+