Attachment 115329 Details for Bug 157102 – xli_12-xpm-None.patch

[patch] xli_12-xpm-None.patch

xli_12-xpm-None.patch (text/plain), 1.30 KB, created by lichray on 2011-05-17 07:20:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lichray

Created: 2011-05-17 07:20:08 UTC

Size: 1.30 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/graphics/xli.orig/Makefile /usr/ports/graphics/xli/Makefile
>--- /usr/ports/graphics/xli.orig/Makefile	2011-05-12 22:49:07.000000000 -0500
>+++ /usr/ports/graphics/xli/Makefile	2011-05-17 00:44:23.770432008 -0500
>@@ -7,7 +7,7 @@
> 
> PORTNAME=	xli
> PORTVERSION=	1.17.0
>-PORTREVISION=	11
>+PORTREVISION=	12
> CATEGORIES=	graphics
> MASTER_SITES=	${MASTER_SITE_DEBIAN}
> MASTER_SITE_SUBDIR=	pool/main/x/${PORTNAME}
>diff -ruN --exclude=CVS /usr/ports/graphics/xli.orig/files/patch-xpixmap.c /usr/ports/graphics/xli/files/patch-xpixmap.c
>--- /usr/ports/graphics/xli.orig/files/patch-xpixmap.c	1969-12-31 18:00:00.000000000 -0600
>+++ /usr/ports/graphics/xli/files/patch-xpixmap.c	2011-05-17 01:08:16.811636955 -0500
>@@ -0,0 +1,14 @@
>+--- xpixmap.c.orig	2006-11-10 23:52:14.000000000 -0600
>++++ xpixmap.c	2011-05-17 01:08:15.566413745 -0500
>+@@ -463,7 +463,10 @@ Image *xpixmapLoad(char *fullname, Image
>+ 			} else
>+ 				p = buf;
>+ 
>+-			if (!xliParseXColor(&globals.dinfo, p, &xcolor)) {
>++			if (!strcmp(p, "None"))
>++				xliParseXColor(&globals.dinfo,
>++						image_ops->bg ? image_ops->bg : "black", &xcolor);
>++			else if (!xliParseXColor(&globals.dinfo, p, &xcolor)) {
>+ 				fprintf(stderr, "xpixmapLoad: %s - Bad color name '%s'\n", name, p);
>+ 				xcolor.red = xcolor.green = xcolor.blue = 0;
>+ 			}

Actions: View | Diff

Attachments on bug 157102: 115329