From owner-freebsd-bugs@FreeBSD.ORG Mon Mar 29 19:50:02 2010 Return-Path: Delivered-To: freebsd-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 8E41F106566B for ; Mon, 29 Mar 2010 19:50: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 5170D8FC12 for ; Mon, 29 Mar 2010 19:50: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 o2TJo2dD007127 for ; Mon, 29 Mar 2010 19:50:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o2TJo2pn007126; Mon, 29 Mar 2010 19:50:02 GMT (envelope-from gnats) Resent-Date: Mon, 29 Mar 2010 19:50:02 GMT Resent-Message-Id: <201003291950.o2TJo2pn007126@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Barbara Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 71AA5106564A for ; Mon, 29 Mar 2010 19:44:10 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 618C38FC22 for ; Mon, 29 Mar 2010 19:44:10 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o2TJiAto048931 for ; Mon, 29 Mar 2010 19:44:10 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id o2TJiA3e048930; Mon, 29 Mar 2010 19:44:10 GMT (envelope-from nobody) Message-Id: <201003291944.o2TJiA3e048930@www.freebsd.org> Date: Mon, 29 Mar 2010 19:44:10 GMT From: Barbara To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: misc/145180: graphics/imlib2: fix build for png-1.4.1 X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Mar 2010 19:50:02 -0000 >Number: 145180 >Category: misc >Synopsis: graphics/imlib2: fix build for png-1.4.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Mar 29 19:50:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Barbara >Release: >Organization: >Environment: FreeBSD satanasso.local.net 7.3-STABLE FreeBSD 7.3-STABLE #0: Thu Mar 25 09:52:40 CET 2010 root@satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO i386 >Description: Fix the build after png update. Successfully tested using graphics/feh under fluxbox with the following command: feh --bg-scale /path/to/a/file.png With the last committed I was getting: No Imlib2 loader for that file format feh ERROR: Couldn't load image in order to set bg >How-To-Repeat: >Fix: Patch attached with submission follows: --- files/patch-loader_png.c.orig 2010-03-29 14:22:41.000000000 +0200 +++ files/patch-loader_png.c 2010-03-29 21:36:48.000000000 +0200 @@ -5,7 +5,7 @@ /* if we haven't read the header before, set the header data */ fread(buf, 1, PNG_BYTES_TO_CHECK, f); - if (!png_check_sig(buf, PNG_BYTES_TO_CHECK)) -+ if (png_check_sig(buf, 0, PNG_BYTES_TO_CHECK) != 0) ++ if (png_sig_cmp(buf, 0, PNG_BYTES_TO_CHECK)) { fclose(f); return 0; >Release-Note: >Audit-Trail: >Unformatted: