diff options
Diffstat (limited to 'Build/source/libs/libpng/libpng-PATCHES')
3 files changed, 8 insertions, 38 deletions
diff --git a/Build/source/libs/libpng/libpng-PATCHES/ChangeLog b/Build/source/libs/libpng/libpng-PATCHES/ChangeLog index 110b1f99e15..d0829f44f6b 100644 --- a/Build/source/libs/libpng/libpng-PATCHES/ChangeLog +++ b/Build/source/libs/libpng/libpng-PATCHES/ChangeLog @@ -1,3 +1,9 @@ +2016-06-09 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + Import libpng-1.6.23. + Forgot to remove patch-02-backport-20160314-12e63e9 in 1.6.22. + Here really remove patch-02-backport-20160314-12e63e9. + 2016-05-26 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Remove patch-02-backport-20160314-12e63e9, since it is now diff --git a/Build/source/libs/libpng/libpng-PATCHES/TL-Changes b/Build/source/libs/libpng/libpng-PATCHES/TL-Changes index 2e80e7bd09d..2a688891687 100644 --- a/Build/source/libs/libpng/libpng-PATCHES/TL-Changes +++ b/Build/source/libs/libpng/libpng-PATCHES/TL-Changes @@ -1,5 +1,5 @@ -Changes applied to the libpng-1.6.22/ tree as obtained from: - http://www.libpng.org/ libpng-1.6.22.tar.xz +Changes applied to the libpng-1.6.23/ tree as obtained from: + http://www.libpng.org/ libpng-1.6.23.tar.xz Copied: scripts/pnglibconf.h.prebuilt -> pnglibconf.h diff --git a/Build/source/libs/libpng/libpng-PATCHES/patch-02-backport-20160314-12e63e9 b/Build/source/libs/libpng/libpng-PATCHES/patch-02-backport-20160314-12e63e9 deleted file mode 100644 index 6941ae0019f..00000000000 --- a/Build/source/libs/libpng/libpng-PATCHES/patch-02-backport-20160314-12e63e9 +++ /dev/null @@ -1,36 +0,0 @@ -https://github.com/glennrp/libpng/commit/12e63e91af1378225993b36e25ce3252b54e751a.patch - -From 12e63e91af1378225993b36e25ce3252b54e751a Mon Sep 17 00:00:00 2001 -From: Dagobert Michelsen <dam@opencsw.org> -Date: Mon, 14 Mar 2016 16:21:06 +0100 -Subject: [PATCH] Force back to C89 if needed. This fixes #245 - ---- - configure.ac | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 3b8746a..ee3ea05 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -114,6 +114,20 @@ AC_ARG_ENABLE(werror, - CFLAGS="$sav_CFLAGS" - fi],) - -+# For GCC 5 the default mode for C is -std=gnu11 instead of -std=gnu89 -+# In pngpriv.h we request just the POSIX 1003.1 and C89 APIs by defining _POSIX_SOURCE to 1 -+# This is incompatible with the new default mode, so we test for that and force the -+AC_MSG_CHECKING([if we need to force back C standard to C89]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#define _POSIX_SOURCE 1 -+#include <stdio.h> -+])],AC_MSG_RESULT(no),[ -+if test "x$GCC" != "xyes"; then -+ AC_MSG_ERROR([Forcing back to C89 is required but the flags are unknown for other compilers than GCC]) -+fi -+AC_MSG_RESULT(yes) -+CFLAGS="$CFLAGS -std=c89" -+]) -+ - # Checks for header files. - AC_HEADER_STDC - |