Updated libpng to 1.6.29

diff --git a/packages/packages.current b/packages/packages.current
index f56bf547f427d7ea30a3241f3a5d912b6b8378b9..c46d6e89d12af84ed1b6a58b1aaa78730822d670 100644 (file)
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -205,8 +205,8 @@ chk  d063e705812e1ee7feb8f35d51b3cad04ca13b0d
 # libpng
 
 server ftp://ftp.simplesystems.org/pub/png/src
-file libpng14/libpng-1.4.20.tar.xz
-chk  b2f9c1e62c8b0b535d8ef8853ccaf6f865263348
+file libpng16/libpng-1.6.29.tar.xz
+chk 7dbe6a5088b938545fc0857c507d4e0cf5d9023e
 
 #
 # LibFFI

diff --git a/src/Makefile.am b/src/Makefile.am
index 406277d1528004fc54921afaf9da366e9ca8b4b5..2bdabc0105bfdd12f006559c3730542e0f3189e6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -211,7 +211,9 @@ cm_pkg_libgcrypt_configure = \
        --disable-tests \
   --disable-aesni-support
 
-cm_pkg_libpng_configure = HAVE_SOLARIS_LD_FALSE=yes CPPFLAGS=\"-I$(idir)/include -DPNG_BUILD_DLL\" LDFLAGS=\"-L$(idir)/lib\" LIBPNG_DEFINES=\"-DPNG_BUILD_DLL\"
+cm_pkg_libpng_configure = \
+       CPPFLAGS=\"-I$(idir)/include\" \
+       LDFLAGS=\"-L$(idir)/lib\"
 
 cm_pkg_enchant_configure = \
        --enable-ispell \

diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index c16c4ef1b7129f2dc9f31485e53a968da1664c28..ca28fad3125368a9f4a63ec846121b5ea483867b 100644 (file)
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -89,7 +89,7 @@ File /oname=intl.dll ${prefix}/bin/libintl-9.dll
 #######################################
 ### libpng
 !insertmacro SetPrefix libpng
-File ${prefix}/bin/libpng14-14.dll
+File ${prefix}/bin/libpng16-16.dll
 
 #######################################
 ### enchant

diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index f10becc6d20efdd1d647fafcb2c3ff6f1f64fdc5..f91fe2ceb6f7ace0104ca0e9ac8dd349d40618c1 100644 (file)
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -384,7 +384,7 @@ RMDir "$INSTDIR\share"
 
 #######################################
 ### libpng
-Delete /REBOOTOK "$INSTDIR\libpng14-14.dll"
+Delete /REBOOTOK "$INSTDIR\libpng16-16.dll"
 
 #######################################
 ### gettext