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

[Daniel Isenmann]

    Date: Sunday, September 28, 2014 @ 19:57:07
  Author: daniel
Revision: 223666

upgpkg: windowmaker 0.95.6-1

New upstream release

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

-----------------+
 PKGBUILD        |   10 ++++------
 giflib_510.diff |   42 ++++--------------------------------------
 2 files changed, 8 insertions(+), 44 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-28 17:43:00 UTC (rev 223665)
+++ PKGBUILD	2014-09-28 17:57:07 UTC (rev 223666)
@@ -3,8 +3,8 @@
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
 
 pkgname=windowmaker
-pkgver=0.95.5
-pkgrel=4
+pkgver=0.95.6
+pkgrel=1
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=('i686' 'x86_64')
 url="http://www.windowmaker.org/"
@@ -12,12 +12,10 @@
 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
         giflib_510.diff)
-md5sums=('19e9cc256ccb7075ff82f4b809df3a0a'
+md5sums=('5b3cf9e6cd1f4066ffa5f2f22c25aee3'
          '2fba97bebfd691836b92b8f0db79ff13'
-         '05d8e98fb579f2fa5a097b629374e6b8'
-         '9eee694ecec55a5185e421bac9170344')
+         'ac51e22a9d6a8d653cfa8cbcc6fea96e')
 
 prepare() {
   cd WindowMaker-$pkgver

Modified: giflib_510.diff
===================================================================
--- giflib_510.diff	2014-09-28 17:43:00 UTC (rev 223665)
+++ giflib_510.diff	2014-09-28 17:57:07 UTC (rev 223666)
@@ -1,31 +1,6 @@
-$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 @@
+--- wrlib/load_gif.c.orig	2013-09-12 22:43:54.000000000 +0100
++++ wrlib/load_gif.c	2014-05-16 10:10:04.000000000 +0100
+@@ -81,7 +81,7 @@ RImage *RLoadGIF(const char *file, int i
  	}
  
  	if (gif->SWidth < 1 || gif->SHeight < 1) {
@@ -34,16 +9,7 @@
  		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 @@
+@@ -216,7 +216,7 @@ RImage *RLoadGIF(const char *file, int i
  		free(buffer);
  
  	if (gif)