3652cdf6c7
zlib 1.3 has been available since August 18, 2023. Version 1.3 now defines the following: # define crc32_combine_gen z_crc32_combine_gen # define crc32_combine_gen64 z_crc32_combine_gen64 # define crc32_combine_op z_crc32_combine_op We patched those in manually with qtpatches.diff, so we update it to reflect these changes. Updated the diff with 'git diff --relative > qtpatches.diff' from within the 3rdparty/zlib directory. Since updating zlib always requires some manual intervention add a minimal guide that will be printed on using import_from_zlib_tarball.sh. As a drive-by fix an error in import_from_zlib_tarball.sh where passing in a path already containing a backslash as: import_from_zlib_tarball.sh zlib-1.x/ ./ would append another backshlash to that path (zlib-1.x//). Furthermore add the '-v' flag to the copy command to make it more verbose. [ChangeLog][Third-Party Code] zlib was updated to version 1.3. Task-number: QTBUG-116236 Pick-to: 6.6 6.5 6.2 5.15 Change-Id: Ib7c8698035e1e049b455308c5774fcaf88b7622a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> |
||
---|---|---|
.github/workflows | ||
bin | ||
cmake | ||
coin | ||
config.tests | ||
dist | ||
doc | ||
examples | ||
lib | ||
libexec | ||
LICENSES | ||
mkspecs | ||
qmake | ||
src | ||
tests | ||
util | ||
.cmake.conf | ||
.gitattributes | ||
.gitignore | ||
.lgtm.yml | ||
.tag | ||
CMakeLists.txt | ||
config_help.txt | ||
configure | ||
configure.bat | ||
configure.cmake | ||
dependencies.yaml | ||
qt_cmdline.cmake |