From lichray@gmail.com  Tue May 17 06:16:30 2011
Return-Path: <lichray@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 65FB310656D3
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 May 2011 06:16:30 +0000 (UTC)
	(envelope-from lichray@gmail.com)
Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D3748FC12
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 17 May 2011 06:16:29 +0000 (UTC)
Received: by iwn33 with SMTP id 33so209028iwn.13
        for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 May 2011 23:16:29 -0700 (PDT)
Received: by 10.42.178.133 with SMTP id bm5mr210270icb.487.1305612989374;
        Mon, 16 May 2011 23:16:29 -0700 (PDT)
Received: from compaq.yuetime (c-98-228-191-105.hsd1.il.comcast.net [98.228.191.105])
        by mx.google.com with ESMTPS id xe5sm112664icb.10.2011.05.16.23.16.26
        (version=TLSv1/SSLv3 cipher=OTHER);
        Mon, 16 May 2011 23:16:28 -0700 (PDT)
Received: by compaq.yuetime (sSMTP sendmail emulation); Tue, 17 May 2011 01:16:23 -0500
Message-Id: <4dd212bc.853f2b0a.6f05.0b54@mx.google.com>
Date: Tue, 17 May 2011 01:16:23 -0500
From: Zhihao Yuan <lichray@gmail.com>
Reply-To: Zhihao Yuan <lichray@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: graphics/xli: Adds support for XPM "None" color
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         157102
>Category:       ports
>Synopsis:       graphics/xli: Adds support for XPM "None" color
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    wen
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 17 06:20:08 UTC 2011
>Closed-Date:    Wed May 18 08:31:03 UTC 2011
>Last-Modified:  Wed May 18 08:31:03 UTC 2011
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->wen 
Responsible-Changed-By: wen 
Responsible-Changed-When: Wed May 18 03:29:30 UTC 2011 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157102 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157102: commit references a PR
Date: Wed, 18 May 2011 08:18:53 +0000 (UTC)

 wen         2011-05-18 08:18:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/xli         Makefile 
   Added files:
     graphics/xli/files   patch-xpixmap.c 
   Log:
   - Adds support for XPM "None" color
   
   PR:             ports/157102
   Submitted by:   Zhihao Yuan <lichray@gmail.com> (maintainer)
   
   Revision  Changes    Path
   1.40      +1 -1      ports/graphics/xli/Makefile
   1.1       +14 -0     ports/graphics/xli/files/patch-xpixmap.c (new)
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: wen 
State-Changed-When: Wed May 18 08:31:00 UTC 2011 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157102 
>Unformatted:
