Re: [PATCH] gdk-pixbuf: Fix libpng determinism issues

[Colin Walters <walters@verbum.org>]

[-- Attachment #1: Type: text/plain, Size: 358 bytes --]

On Mon, 2013-04-15 at 12:31 +0100, Richard Purdie wrote:

> It will make our builds work again for now until the next time someone
> upgrades libpng and and then it will potentially silently start using an
> old version in some builds :(.

So something like the attached on top of the previous patch?

If this looks good I'll push both to master.


[-- Attachment #2: 0001-build-drop-libpng-from-detected-list.patch --]
[-- Type: text/x-patch, Size: 1071 bytes --]

From 91074d01a0e2b4508f7f253f1e0a7669363cb128 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 15 Apr 2013 08:06:45 -0400
Subject: [PATCH] build: drop "libpng" from detected list

This gives us an arbitrary version depending on the build root, and we
may not be upwards compatible with future versions.  Or it's possible
that the ancient (but LSB mandated) 1.2 claims the "libpng.pc" name.

Signed-off-by: Colin Walters <walters@verbum.org>
---
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 106fab1..5efc1b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,7 +586,7 @@ fi
 
 dnl Test for libpng
   if test x$with_libpng != xno && test -z "$LIBPNG"; then
-    for l in libpng16 libpng15 libpng14 libpng12 libpng13 libpng10 libpng; do
+    for l in libpng16 libpng15 libpng14 libpng12 libpng13 libpng10; do
       AC_MSG_CHECKING(for $l)
       if $PKG_CONFIG --exists $l ; then
         AC_MSG_RESULT(yes)
-- 
1.7.1