diff options
Diffstat (limited to 'src/3rdparty/zlib/qtpatches.diff')
| -rw-r--r-- | src/3rdparty/zlib/qtpatches.diff | 60 |
1 files changed, 29 insertions, 31 deletions
diff --git a/src/3rdparty/zlib/qtpatches.diff b/src/3rdparty/zlib/qtpatches.diff index 105dda967c..681697afb0 100644 --- a/src/3rdparty/zlib/qtpatches.diff +++ b/src/3rdparty/zlib/qtpatches.diff @@ -1,21 +1,21 @@ diff -ruN orig/ChangeLog src/ChangeLog ---- orig/ChangeLog 2017-08-03 08:25:11.347386101 +0200 -+++ src/ChangeLog 2017-08-03 08:25:21.477268439 +0200 +--- orig/ChangeLog ++++ src/ChangeLog @@ -1,6 +1,10 @@ ChangeLog file for zlib -+Changes in 1.2.11 (Qt) (28 Jul 2017) ++Changes in 1.2.12 (Qt) (28 Mar 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.11 (15 Jan 2017) - - Fix deflate stored bug when pulling last block from window - - Permit immediate deflateParams changes before any deflate input + 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 diff -ruN orig/gzguts.h src/gzguts.h ---- orig/gzguts.h 2017-08-03 08:25:11.347386101 +0200 -+++ src/gzguts.h 2017-08-03 08:25:21.477268439 +0200 -@@ -3,6 +3,15 @@ +--- orig/gzguts.h ++++ src/gzguts.h +@@ -3,6 +3,25 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -26,6 +26,8 @@ diff -ruN orig/gzguts.h src/gzguts.h +# ifndef _CRT_NONSTDC_NO_DEPRECATE +# define _CRT_NONSTDC_NO_DEPRECATE +# endif ++// disable warnings like '=': conversion from 'size_t' to 'unsigned int', possible loss of data ++# pragma warning(disable: 4267; disable: 4244) +#endif + #ifdef _LARGEFILE64_SOURCE @@ -43,13 +45,12 @@ diff -ruN orig/gzguts.h src/gzguts.h +#define HAVE_HIDDEN +#endif + -+ - #ifdef HAVE_HIDDEN - # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) - #else + #ifdef _LARGEFILE64_SOURCE + # ifndef _LARGEFILE_SOURCE + # define _LARGEFILE_SOURCE 1 diff -ruN orig/README src/README ---- orig/README 2017-08-03 08:25:11.347386101 +0200 -+++ src/README 2017-08-03 08:25:21.477268439 +0200 +--- orig/README ++++ src/README @@ -6,6 +6,9 @@ http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and rfc1952 (gzip format). @@ -61,8 +62,8 @@ diff -ruN orig/README src/README (volunteer to write man pages welcome, contact zlib@gzip.org). A usage example of the library is given in the file test/example.c which also tests that diff -ruN orig/zconf.h src/zconf.h ---- orig/zconf.h 2017-08-03 08:25:11.347386101 +0200 -+++ src/zconf.h 2017-08-03 08:25:21.477268439 +0200 +--- orig/zconf.h ++++ src/zconf.h @@ -8,6 +8,9 @@ #ifndef ZCONF_H #define ZCONF_H @@ -91,9 +92,9 @@ diff -ruN orig/zconf.h src/zconf.h #endif diff -ruN orig/zlib.h src/zlib.h ---- orig/zlib.h 2017-08-03 08:25:11.347386101 +0200 -+++ src/zlib.h 2017-08-03 08:25:21.480601733 +0200 -@@ -33,12 +33,16 @@ +--- orig/zlib.h ++++ src/zlib.h +@@ -33,11 +33,15 @@ #include "zconf.h" @@ -105,17 +106,15 @@ diff -ruN orig/zlib.h src/zlib.h extern "C" { #endif --#define ZLIB_VERSION "1.2.11" --#define ZLIB_VERNUM 0x12b0 -+#define ZLIB_VERSION "1.2.11 (Qt)" -+#define ZLIB_VERNUM 0x12b0f +-#define ZLIB_VERSION "1.2.12" ++#define ZLIB_VERSION "1.2.12 (Qt)" + #define ZLIB_VERNUM 0x12c0 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2 - #define ZLIB_VER_REVISION 11 diff -ruN orig/zutil.h src/zutil.h ---- orig/zutil.h 2017-08-03 08:25:11.347386101 +0200 -+++ src/zutil.h 2017-08-03 08:30:04.490657570 +0200 -@@ -13,6 +13,15 @@ +--- orig/zutil.h ++++ src/zutil.h +@@ -13,6 +13,14 @@ #ifndef ZUTIL_H #define ZUTIL_H @@ -127,11 +126,10 @@ diff -ruN orig/zutil.h src/zutil.h +#define HAVE_HIDDEN +#endif + -+ #ifdef HAVE_HIDDEN # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) #else -@@ -136,6 +145,11 @@ +@@ -143,6 +151,11 @@ # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os # include <unix.h> /* for fdopen */ # else @@ -143,7 +141,7 @@ diff -ruN orig/zutil.h src/zutil.h # ifndef fdopen # define fdopen(fd,mode) NULL /* No fdopen() */ # endif -@@ -159,7 +173,7 @@ +@@ -166,7 +179,7 @@ # define OS_CODE 18 #endif |