[arch-commits] Commit in windowmaker/trunk (PKGBUILD giflib_510.diff)

[Andreas Radke]

    Date: Monday, June 9, 2014 @ 22:19:09
  Author: andyrtr
Revision: 214759

upgpkg: windowmaker 0.95.5-4

giflib rebuild

Added:
  windowmaker/trunk/giflib_510.diff
Modified:
  windowmaker/trunk/PKGBUILD

-----------------+
 PKGBUILD        |   14 ++++++++++----
 giflib_510.diff |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-06-09 20:01:46 UTC (rev 214758)
+++ PKGBUILD	2014-06-09 20:19:09 UTC (rev 214759)
@@ -4,7 +4,7 @@
 
 pkgname=windowmaker
 pkgver=0.95.5
-pkgrel=3
+pkgrel=4
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=('i686' 'x86_64')
 url="http://www.windowmaker.org/"
@@ -12,14 +12,20 @@
 depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
 source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz
         wmaker.desktop
-        wm-giflib.patch)
+        wm-giflib.patch
+        giflib_510.diff)
 md5sums=('19e9cc256ccb7075ff82f4b809df3a0a'
          '2fba97bebfd691836b92b8f0db79ff13'
-         '05d8e98fb579f2fa5a097b629374e6b8')
+         '05d8e98fb579f2fa5a097b629374e6b8'
+         '9eee694ecec55a5185e421bac9170344')
 
 prepare() {
   cd WindowMaker-$pkgver
-  patch -Np0 -i ../wm-giflib.patch
+  #patch -Np0 -i ../wm-giflib.patch
+  
+  # patch taken from NetBSD
+  patch -Np0 -i ../giflib_510.diff
+  
   autoreconf -fi
   
   # fix some paths FS#3080 - ckeck also Gentoo ebuild

Added: giflib_510.diff
===================================================================
--- giflib_510.diff	                        (rev 0)
+++ giflib_510.diff	2014-06-09 20:19:09 UTC (rev 214759)
@@ -0,0 +1,54 @@
+$NetBSD: patch-wrlib_gif.c,v 1.2 2014/05/16 09:29:39 tron Exp $
+
+Fix build with giflib 5.1 and newer.
+
+--- wrlib/gif.c.orig	2013-09-12 22:43:54.000000000 +0100
++++ wrlib/gif.c	2014-05-16 10:10:04.000000000 +0100
+@@ -52,6 +52,7 @@
+ 	unsigned char rmap[256];
+ 	unsigned char gmap[256];
+ 	unsigned char bmap[256];
++	int gif_error;
+ 
+ 	if (index < 0)
+ 		index = 0;
+@@ -59,10 +60,10 @@
+ 	/* default error message */
+ 	RErrorCode = RERR_BADINDEX;
+ 
+-	gif = DGifOpenFileName(file);
++	gif = DGifOpenFileName(file, &gif_error);
+ 
+ 	if (!gif) {
+-		switch (GifLastError()) {
++		switch (gif_error) {
+ 		case D_GIF_ERR_OPEN_FAILED:
+ 			RErrorCode = RERR_OPEN;
+ 			break;
+@@ -77,7 +78,7 @@
+ 	}
+ 
+ 	if (gif->SWidth < 1 || gif->SHeight < 1) {
+-		DGifCloseFile(gif);
++		DGifCloseFile(gif, NULL);
+ 		RErrorCode = RERR_BADIMAGEFILE;
+ 		return NULL;
+ 	}
+@@ -199,7 +200,7 @@
+ 	/* yuck! */
+ 	goto did_not_get_any_errors;
+  giferr:
+-	switch (GifLastError()) {
++	switch (gif->Error) {
+ 	case D_GIF_ERR_OPEN_FAILED:
+ 		RErrorCode = RERR_OPEN;
+ 		break;
+@@ -220,7 +221,7 @@
+ 		free(buffer);
+ 
+ 	if (gif)
+-		DGifCloseFile(gif);
++		DGifCloseFile(gif, NULL);
+ 
+ 	return image;
+ }