From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Mar 28 10:40:03 2010 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 E5691106564A for ; Sun, 28 Mar 2010 10:40:02 +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 BA0ED8FC0A for ; Sun, 28 Mar 2010 10:40:02 +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 o2SAe20O032513 for ; Sun, 28 Mar 2010 10:40:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2SAe2Eb032512; Sun, 28 Mar 2010 10:40:02 GMT (envelope-from gnats) Resent-Date: Sun, 28 Mar 2010 10:40:02 GMT Resent-Message-Id: <201003281040.o2SAe2Eb032512@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, Christoph Moench-Tegeder Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 44290106564A for ; Sun, 28 Mar 2010 10:38:11 +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 0074E8FC13 for ; Sun, 28 Mar 2010 10:38:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp.burggraben.net (Postfix) with ESMTP id 1081A6002EB for ; Sun, 28 Mar 2010 12:38:10 +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 hV+GgW4pAgAf for ; Sun, 28 Mar 2010 12:38:09 +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 ; Sun, 28 Mar 2010 12:38:09 +0200 (CEST) Received: by elch.exwg.net (Postfix, from userid 1000) id A5E8DAC827; Sun, 28 Mar 2010 12:38:08 +0200 (CEST) Message-Id: <20100328103808.A5E8DAC827@elch.exwg.net> Date: Sun, 28 Mar 2010 12:38:08 +0200 (CEST) From: Christoph Moench-Tegeder To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/145104: [PATCH] unbreak x11/xloadimage (fallout from libpng upgrade) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Christoph Moench-Tegeder List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Mar 2010 10:40:03 -0000 >Number: 145104 >Category: ports >Synopsis: [PATCH] unbreak x11/xloadimage (fallout from libpng upgrade) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Sun Mar 28 10:40:02 UTC 2010 >Closed-Date: >Last-Modified: >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 xloadimage-4.1.16_6 (upgrading to xloadimage-4.1.16_7) >Description: Function png_set_gray_1_2_4_to_8() from libpng was renamed to png_set_expand_gray_1_2_4_to_8() (according to the libpng CHANGES file), so xloadimage bails out with a linker error. >How-To-Repeat: run portupgrade >Fix: Change xloadimage.4.1/png.c with REINPLACE_CMD (very simple): (also available at http://burggraben.net/hacks/xloadimage.patch ) --- x11/xloadimage/Makefile.orig 2010-03-28 12:28:30.000000000 +0200 +++ x11/xloadimage/Makefile 2010-03-28 12:27:22.000000000 +0200 @@ -39,6 +39,8 @@ post-patch: @${CHMOD} a+rx ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ + ${WRKSRC}/png.c @cd ${WRKSRC}; ${MV} xloadimage.man xloadimage.man.old; \ ${SED} -e s:/etc/X11/Xloadimage:${PREFIX}/etc/xloadimagerc: \ -e s:/usr/lib/xloadimagerc:${PREFIX}/etc/xloadimagerc: \ >Release-Note: >Audit-Trail: >Unformatted: