WindowMaker: update to 0.95.6.

This commit is contained in:
Christian Neukirchen 2014-09-06 22:08:49 +02:00
parent 17110d09c8
commit d1efc392ca
2 changed files with 3 additions and 37 deletions

View file

@ -1,34 +0,0 @@
--- wrlib/gif.c.orig 2013-01-12 17:36:51.015744230 +0100
+++ wrlib/gif.c 2013-01-12 17:47:33.992447587 +0100
@@ -43,7 +43,7 @@ RImage *RLoadGIF(char *file, int index)
unsigned char *cptr;
GifFileType *gif = NULL;
GifPixelType *buffer = NULL;
- int i, j, k;
+ int i, j, k, err = 0;
int width, height;
GifRecordType recType;
ColorMapObject *colormap;
@@ -57,10 +57,10 @@ RImage *RLoadGIF(char *file, int index)
/* default error message */
RErrorCode = RERR_BADINDEX;
- gif = DGifOpenFileName(file);
+ gif = DGifOpenFileName(file, &err);
- if (!gif) {
- switch (GifLastError()) {
+ if (err) {
+ switch (err) {
case D_GIF_ERR_OPEN_FAILED:
RErrorCode = RERR_OPEN;
break;
@@ -197,7 +197,7 @@ RImage *RLoadGIF(char *file, int index)
/* yuck! */
goto did_not_get_any_errors;
giferr:
- switch (GifLastError()) {
+ switch (gif->Error) {
case D_GIF_ERR_OPEN_FAILED:
RErrorCode = RERR_OPEN;
break;

View file

@ -1,6 +1,6 @@
# Template file for 'WindowMaker'
pkgname=WindowMaker
version=0.95.5
version=0.95.6
revision=1
build_style=gnu-configure
configure_args="--enable-xinerama --with-nlsdir=/usr/share/locale
@ -20,7 +20,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-3"
homepage="http://www.windowmaker.org/"
distfiles="http://windowmaker.org/pub/source/release/${pkgname}-${version}.tar.gz"
checksum=4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0
checksum=435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4
pre_configure() {
autoreconf -fi
@ -32,7 +32,7 @@ post_configure() {
}
post_install() {
vinstall COPYING.WTFPL 644 usr/share/licenses/${pkgname}
vlicense COPYING.WTFPL
vinstall ${FILESDIR}/wmaker.desktop 644 usr/share/xsessions
}