diff options
Diffstat (limited to 'src/3rdparty/zlib/qtpatches.diff')
| -rw-r--r-- | src/3rdparty/zlib/qtpatches.diff | 96 |
1 files changed, 45 insertions, 51 deletions
diff --git a/src/3rdparty/zlib/qtpatches.diff b/src/3rdparty/zlib/qtpatches.diff index 07018605a2..28be579dc9 100644 --- a/src/3rdparty/zlib/qtpatches.diff +++ b/src/3rdparty/zlib/qtpatches.diff @@ -1,20 +1,36 @@ -diff -ruN orig/ChangeLog src/ChangeLog ---- orig/ChangeLog -+++ src/ChangeLog +diff --git a/src/ChangeLog b/src/ChangeLog +index b801a1031ec..686283a2aec 100644 +--- a/src/ChangeLog ++++ b/src/ChangeLog @@ -1,6 +1,10 @@ ChangeLog file for zlib -+Changes in 1.2.12 (Qt) (28 Mar 2022) ++Changes in 1.3.1 (Qt) (23 Jan 2024) +- 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 -diff -ruN orig/gzguts.h src/gzguts.h ---- orig/gzguts.h -+++ src/gzguts.h + Changes in 1.3.1 (22 Jan 2024) + - Reject overflows of zip header fields in minizip + - Fix bug in inflateSync() for data held in bit buffer +diff --git a/src/README b/src/README +index c5f917540b6..af6b4f32bf5 100644 +--- a/src/README ++++ b/src/README +@@ -6,6 +6,9 @@ thread safe. The data format used by the zlib library is described by RFCs + http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and + rfc1952 (gzip format). + ++This is a stripped down copy of zlib that contains patches to make it compile ++as part of Qt. See also "qtpatches.diff". ++ + All functions of the compression library are documented in the file zlib.h + (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 --git a/src/gzguts.h b/src/gzguts.h +index eba72085bb7..5bf6b7d4813 100644 +--- a/src/gzguts.h ++++ b/src/gzguts.h @@ -3,6 +3,12 @@ * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -28,22 +44,10 @@ diff -ruN orig/gzguts.h src/gzguts.h #ifdef _LARGEFILE64_SOURCE # ifndef _LARGEFILE_SOURCE # define _LARGEFILE_SOURCE 1 -diff -ruN orig/README src/README ---- orig/README -+++ src/README -@@ -6,6 +6,9 @@ - http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and - rfc1952 (gzip format). - -+This is a stripped down copy of zlib that contains patches to make it compile -+as part of Qt. See also "qtpatches.diff". -+ - All functions of the compression library are documented in the file zlib.h - (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 -+++ src/zconf.h +diff --git a/src/zconf.h b/src/zconf.h +index 62adc8d8431..4e14507a22d 100644 +--- a/src/zconf.h ++++ b/src/zconf.h @@ -8,6 +8,9 @@ #ifndef ZCONF_H #define ZCONF_H @@ -54,7 +58,7 @@ 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 @@ +@@ -139,6 +142,7 @@ # endif # define zlibCompileFlags z_zlibCompileFlags # define zlibVersion z_zlibVersion @@ -62,7 +66,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 @@ +@@ -433,7 +437,7 @@ typedef uLong FAR uLongf; typedef unsigned long z_crc_t; #endif @@ -71,9 +75,10 @@ diff -ruN orig/zconf.h src/zconf.h # define Z_HAVE_UNISTD_H #endif -diff -ruN orig/zlib.h src/zlib.h ---- orig/zlib.h -+++ src/zlib.h +diff --git a/src/zlib.h b/src/zlib.h +index 8d4b932eaf6..2cff72ee865 100644 +--- a/src/zlib.h ++++ b/src/zlib.h @@ -33,11 +33,15 @@ #include "zconf.h" @@ -86,14 +91,15 @@ 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_VERNUM 0x12c0 +-#define ZLIB_VERSION "1.3.1" ++#define ZLIB_VERSION "1.3.1 (Qt)" + #define ZLIB_VERNUM 0x1310 #define ZLIB_VER_MAJOR 1 - #define ZLIB_VER_MINOR 2 -diff -ruN orig/zutil.h src/zutil.h ---- orig/zutil.h -+++ src/zutil.h + #define ZLIB_VER_MINOR 3 +diff --git a/src/zutil.h b/src/zutil.h +index 48dd7febae6..71dd616ab8d 100644 +--- a/src/zutil.h ++++ b/src/zutil.h @@ -13,6 +13,12 @@ #ifndef ZUTIL_H #define ZUTIL_H @@ -107,19 +113,7 @@ diff -ruN orig/zutil.h src/zutil.h #ifdef HAVE_HIDDEN # define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) #else -@@ -143,6 +149,11 @@ - # if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os - # include <unix.h> /* for fdopen */ - # else -+// We need to include stdio.h here because zlib.h will include TargetConditionals.h -+// This will define TARGET_OS_MAC that leads to this check. -+// Since zutil.h will include gzguts.h and gzguts.h includes stdio.h -+// AFTER check for fdopen we need to include stdio.h directly -+# include <stdio.h> - # ifndef fdopen - # define fdopen(fd,mode) NULL /* No fdopen() */ - # endif -@@ -166,7 +177,7 @@ +@@ -157,7 +163,7 @@ extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ # define OS_CODE 18 #endif |