Date: Tue, 17 May 2011 01:16:23 -0500 From: Zhihao Yuan <lichray@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/157102: graphics/xli: Adds support for XPM "None" color Message-ID: <4dd212bc.853f2b0a.6f05.0b54@mx.google.com> Resent-Message-ID: <201105170620.p4H6K8kv030632@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 157102
>Category: ports
>Synopsis: graphics/xli: Adds support for XPM "None" color
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue May 17 06:20:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: Zhihao Yuan
>Release: FreeBSD 8.2-STABLE amd64
>Organization:
Northern Illinois University
>Environment:
System: FreeBSD compaq.yuetime 8.2-STABLE FreeBSD 8.2-STABLE #1 r221793M: Wed May 11 21:44:19 CDT 2011 lichray@compaq.yuetime:/home/lichray/temp/obj/home/lichray/devel/freebsd-stable/sys/HOUKAGO amd64
>Description:
xli does not recognize the "None" color in XPM, while xli supports to use the background color to fill the transparent part in images like PNG.
>How-To-Repeat:
>Fix:
Fills XPM "None" color with background (defaults to black).
--- xli_12-xpm-None.patch begins here ---
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;
+ }
--- xli_12-xpm-None.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4dd212bc.853f2b0a.6f05.0b54>