diff options
Diffstat (limited to 'src/3rdparty/zlib/qtpatches.diff')
| -rw-r--r-- | src/3rdparty/zlib/qtpatches.diff | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/src/3rdparty/zlib/qtpatches.diff b/src/3rdparty/zlib/qtpatches.diff index 07018605a2..b94f131f9c 100644 --- a/src/3rdparty/zlib/qtpatches.diff +++ b/src/3rdparty/zlib/qtpatches.diff @@ -5,13 +5,13 @@ diff -ruN orig/ChangeLog src/ChangeLog ChangeLog file for zlib -+Changes in 1.2.12 (Qt) (28 Mar 2022) ++Changes in 1.2.13 (Qt) (14 Nov 2022) +- This is a stripped down copy of zlib that contains patches to + make it compile as part of Qt. See also "qtpatches.diff". + - Changes in 1.2.12 (27 Mar 2022) - - Cygwin does not have _wopen(), so do not create gzopen_w() there - - Permit a deflateParams() parameter change as soon as possible + Changes in 1.2.13 (13 Oct 2022) + - Fix configure issue that discarded provided CC definition + - Correct incorrect inputs provided to the CRC functions diff -ruN orig/gzguts.h src/gzguts.h --- orig/gzguts.h +++ src/gzguts.h @@ -54,7 +54,17 @@ diff -ruN orig/zconf.h src/zconf.h /* * If you *really* need a unique prefix for all types and library functions, * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. -@@ -136,6 +139,7 @@ +@@ -38,6 +41,9 @@ + # define crc32 z_crc32 + # define crc32_combine z_crc32_combine + # define crc32_combine64 z_crc32_combine64 ++# define crc32_combine_gen z_crc32_combine_gen ++# define crc32_combine_gen64 z_crc32_combine_gen64 ++# define crc32_combine_op z_crc32_combine_op + # define crc32_z z_crc32_z + # define deflate z_deflate + # define deflateBound z_deflateBound +@@ -136,6 +142,7 @@ # endif # define zlibCompileFlags z_zlibCompileFlags # define zlibVersion z_zlibVersion @@ -62,7 +72,7 @@ diff -ruN orig/zconf.h src/zconf.h /* all zlib typedefs in zlib.h and zconf.h */ # define Byte z_Byte -@@ -431,7 +435,7 @@ +@@ -431,7 +438,7 @@ typedef unsigned long z_crc_t; #endif @@ -86,8 +96,8 @@ diff -ruN orig/zlib.h src/zlib.h extern "C" { #endif --#define ZLIB_VERSION "1.2.12" -+#define ZLIB_VERSION "1.2.12 (Qt)" +-#define ZLIB_VERSION "1.2.13" ++#define ZLIB_VERSION "1.2.13 (Qt)" #define ZLIB_VERNUM 0x12c0 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2 |