From owner-freebsd-ports-bugs@FreeBSD.ORG Tue May 17 06:20:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 319CF1065670 for ; Tue, 17 May 2011 06:20:09 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 0ABDA8FC15 for ; Tue, 17 May 2011 06:20:09 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p4H6K8Aj030633 for ; Tue, 17 May 2011 06:20:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p4H6K8kv030632; Tue, 17 May 2011 06:20:08 GMT (envelope-from gnats) Resent-Date: Tue, 17 May 2011 06:20:08 GMT Resent-Message-Id: <201105170620.p4H6K8kv030632@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Zhihao Yuan Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65FB310656D3 for ; 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 ; Tue, 17 May 2011 06:16:29 +0000 (UTC) Received: by iwn33 with SMTP id 33so209028iwn.13 for ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/157102: graphics/xli: Adds support for XPM "None" color X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Zhihao Yuan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 May 2011 06:20:09 -0000 >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: