diff options
| author | Dennis Oberst <dennis.oberst@qt.io> | 2023-08-21 18:16:02 +0200 |
|---|---|---|
| committer | Dennis Oberst <dennis.oberst@qt.io> | 2023-09-05 13:42:50 +0200 |
| commit | 3652cdf6c78d22126c4f2ec363f338169330c849 (patch) | |
| tree | ea865f8d0eac6d0a73709db4ec3fa51e68c1ca73 /src/3rdparty/zlib/qt_attribution.json | |
| parent | 9c3c87f6d0d5c70b9b1f8f63e90d7162d70afd01 (diff) | |
Update bundled zlib to version 1.3
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>
Diffstat (limited to 'src/3rdparty/zlib/qt_attribution.json')
| -rw-r--r-- | src/3rdparty/zlib/qt_attribution.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/zlib/qt_attribution.json b/src/3rdparty/zlib/qt_attribution.json index ba1db3249a..0b871aa0e6 100644 --- a/src/3rdparty/zlib/qt_attribution.json +++ b/src/3rdparty/zlib/qt_attribution.json @@ -7,11 +7,11 @@ "Description": "zlib is a general purpose data compression library.", "Homepage": "https://zlib.net/", - "Version": "1.2.13", - "DownloadLocation": "https://zlib.net/zlib-1.2.13.tar.gz", + "Version": "1.3", + "DownloadLocation": "https://www.zlib.net/zlib-1.3.tar.gz", "License": "zlib License", "LicenseId": "Zlib", "LicenseFile": "LICENSE", - "Copyright": "(C) 1995-2022 Jean-loup Gailly and Mark Adler" + "Copyright": "(C) 1995-2023 Jean-loup Gailly and Mark Adler" } |