From cmt@burggraben.net  Sun Mar 28 11:18:32 2010
Return-Path: <cmt@burggraben.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5676F1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2010 11:18:32 +0000 (UTC)
	(envelope-from cmt@burggraben.net)
Received: from smtp.burggraben.net (ns.exwg.net [88.198.69.35])
	by mx1.freebsd.org (Postfix) with ESMTP id 12F648FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2010 11:18:31 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by smtp.burggraben.net (Postfix) with ESMTP id 2D9C0600098
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2010 13:18:31 +0200 (CEST)
Received: from smtp.burggraben.net ([127.0.0.1])
	by localhost (ns.burggraben.net [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id PnhUGCT6nD-4 for <FreeBSD-gnats-submit@freebsd.org>;
	Sun, 28 Mar 2010 13:18:30 +0200 (CEST)
Received: from elch.exwg.net (p5798775F.dip.t-dialin.net [87.152.119.95])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "elch.exwg.net", Issuer "Christoph Moench-Tegeder" (verified OK))
	by smtp.burggraben.net (Postfix) with ESMTPS
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 28 Mar 2010 13:18:30 +0200 (CEST)
Received: by elch.exwg.net (Postfix, from userid 1000)
	id 69E91AC827; Sun, 28 Mar 2010 13:18:30 +0200 (CEST)
Message-Id: <20100328111830.69E91AC827@elch.exwg.net>
Date: Sun, 28 Mar 2010 13:18:30 +0200 (CEST)
From: Christoph Moench-Tegeder <cmt@burggraben.net>
Reply-To: Christoph Moench-Tegeder <cmt@burggraben.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] unbreak graphics/xli (libpng upgrade fallout)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         145106
>Category:       ports
>Synopsis:       [PATCH] unbreak graphics/xli (libpng upgrade fallout)
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 28 11:20:02 UTC 2010
>Closed-Date:    Sun Mar 28 14:51:10 CEST 2010
>Last-Modified:  Sun Mar 28 13:20:02 UTC 2010
>Originator:     Christoph Moench-Tegeder
>Release:        FreeBSD 8.0-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD elch.exwg.net 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #8: Sat Feb 20 21:36:50 CET 2010 cmt@elch.exwg.net:/usr/obj/usr/src/sys/CMT amd64

	png-1.4.1
	xli-1.17.0_8 (upgrading to xli-1.17.0_9)
>Description:
	Build of graphics/xli fails because libpng 1.4 forces use of
	png_sig_cmp() instead of the old png_check_sig() ("undefined reference"
	linker error)
>How-To-Repeat:
	run portupgrade
>Fix:

	Add graphics/xli/files/patch-png.c
	(also available at http://burggraben.net/hacks/patch-png.c )

--- png.c.orig	2010-03-28 13:05:30.000000000 +0200
+++ png.c	2010-03-28 13:06:28.000000000 +0200
@@ -11,7 +11,7 @@
 
 #define TITLE_KEYWORD "Title"
 
-/* check to see if a file is a png file using png_check_sig() */
+/* check to see if a file is a png file using png_sig_cmp() */
 static int check_png(char *file_name)
 {
 	ZFILE *zfp;
@@ -27,7 +27,7 @@
 	if (ret != 8)
 		return 0;
 
-	ret = png_check_sig(buf, 8);
+	ret = png_sig_cmp(buf, 0, 8);
 
 	return (ret);
 }


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->dinoex 
Responsible-Changed-By: dinoex 
Responsible-Changed-When: Sun Mar 28 14:43:43 CEST 2010 
Responsible-Changed-Why:  
I will take care of it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=145106 
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Sun Mar 28 14:51:00 CEST 2010 
State-Changed-Why:  
committed, thanks. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/145106: commit references a PR
Date: Sun, 28 Mar 2010 12:51:00 +0000 (UTC)

 dinoex      2010-03-28 12:50:51 UTC
 
   FreeBSD ports repository
 
   Added files:
     graphics/xli/files   patch-png.c 
   Log:
   - fix build for png-1.4.1
   PR:             145106
   Submitted by:   Christoph Moench-Tegeder
   
   Revision  Changes    Path
   1.1       +20 -0     ports/graphics/xli/files/patch-png.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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/145106: commit references a PR
Date: Sun, 28 Mar 2010 13:10:29 +0000 (UTC)

 dinoex      2010-03-28 13:10:14 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/xli         Makefile 
     graphics/xli/files   patch-png.c 
   Log:
   - fix logic of new png function
   PR:             145106
   
   Revision  Changes    Path
   1.36      +1 -1      ports/graphics/xli/Makefile
   1.2       +1 -1      ports/graphics/xli/files/patch-png.c
 _______________________________________________
 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"
 
>Unformatted:
