From c4d75e7e77cb98765fbf1ee5ebdac2535509f856 Mon Sep 17 00:00:00 2001
From: Volker Grabsch <vog@notjusthosting.com>
Date: Tue, 12 Jan 2010 13:57:46 +0100
Subject: [PATCH] update version of package libpng

---
 src/cairo.mk     |  1 +
 src/libpng.mk    | 10 +++++-----
 src/wxwidgets.mk |  2 ++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/cairo.mk b/src/cairo.mk
index e166dfbe..1a90eaa6 100644
--- a/src/cairo.mk
+++ b/src/cairo.mk
@@ -38,6 +38,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    $(SED) 's,libpng12,libpng,g'                          -i '$(1)/configure'
     $(SED) 's,^\(Libs:.*\),\1 @CAIRO_NONPKGCONFIG_LIBS@,' -i '$(1)/src/cairo.pc.in'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
diff --git a/src/libpng.mk b/src/libpng.mk
index c7994a1f..1e6f1f1a 100644
--- a/src/libpng.mk
+++ b/src/libpng.mk
@@ -1,4 +1,4 @@
-# Copyright (C) 2009  Volker Grabsch
+# Copyright (C) 2009, 2010  Volker Grabsch
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,13 +22,13 @@
 # libpng
 PKG             := libpng
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.2.41
-$(PKG)_CHECKSUM := e859ce73c5344ce10576d03cab3b660459b30c13
+$(PKG)_VERSION  := 1.4.0
+$(PKG)_CHECKSUM := 886d651394024b5cab7e9cb5afac41b391f1ccd2
 $(PKG)_SUBDIR   := libpng-$($(PKG)_VERSION)
 $(PKG)_FILE     := libpng-$($(PKG)_VERSION).tar.bz2
 $(PKG)_WEBSITE  := http://www.libpng.org/
-$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libpng/00-libpng-stable/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_URL_2    := http://$(SOURCEFORGE_MIRROR)/project/libpng/libpng-stable/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/libpng/01-libpng-master/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL_2    := ftp://ftp.simplesystems.org/pub/libpng/png/src/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc zlib
 
 define $(PKG)_UPDATE
diff --git a/src/wxwidgets.mk b/src/wxwidgets.mk
index 3b431781..cd5fa1a9 100644
--- a/src/wxwidgets.mk
+++ b/src/wxwidgets.mk
@@ -37,6 +37,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
+    $(SED) 's,png_check_sig,png_sig_cmp,g'                       -i '$(1)/configure'
     $(SED) 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' -i '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
@@ -80,6 +81,7 @@ define $(PKG)_BUILD
 
     # build the wxWidgets variant without unicode support
     cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets)
+    $(SED) 's,png_check_sig,png_sig_cmp,g'                       -i '$(1)/$(wxwidgets_SUBDIR)/configure'
     $(SED) 's,wx_cv_cflags_mthread=yes,wx_cv_cflags_mthread=no,' -i '$(1)/$(wxwidgets_SUBDIR)/configure'
     cd '$(1)/$(wxwidgets_SUBDIR)' && ./configure \
         --host='$(TARGET)' \