diff options
| author | Christian Strømme <christian.stromme@qt.io> | 2023-08-03 11:07:36 +0200 |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> | 2023-08-08 07:02:39 +0000 |
| commit | 0bdd01b7f7c248543c3cd44509d79011f7babd8a (patch) | |
| tree | 7bafdce21f02c9e731f66710913428e59fb8983b /src/3rdparty/freetype/src/gzip | |
| parent | a2c8524ad7dd59f31b400b5da8979138dc835fcc (diff) | |
Update to Freetype 2.13.1
The build fix applied to the 2.13.0 update has also been applied to
this update.
Pick-to: 6.6 6.5 5.15
Fixes: QTBUG-115340
Change-Id: I970b560948af3472b222690019a85a79c537b7d9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/3rdparty/freetype/src/gzip')
| -rw-r--r-- | src/3rdparty/freetype/src/gzip/README.freetype | 2 | ||||
| -rw-r--r-- | src/3rdparty/freetype/src/gzip/ftgzip.c | 5 | ||||
| -rw-r--r-- | src/3rdparty/freetype/src/gzip/rules.mk | 1 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/3rdparty/freetype/src/gzip/README.freetype b/src/3rdparty/freetype/src/gzip/README.freetype index e0c8ced180..76298b06b5 100644 --- a/src/3rdparty/freetype/src/gzip/README.freetype +++ b/src/3rdparty/freetype/src/gzip/README.freetype @@ -1,7 +1,7 @@ Name: zlib Short Name: zlib URL: http://zlib.net/ -Version: 1.2.12 +Version: 1.2.13 License: see `zlib.h` Description: diff --git a/src/3rdparty/freetype/src/gzip/ftgzip.c b/src/3rdparty/freetype/src/gzip/ftgzip.c index 48da6ff9c7..ca6a2aabe6 100644 --- a/src/3rdparty/freetype/src/gzip/ftgzip.c +++ b/src/3rdparty/freetype/src/gzip/ftgzip.c @@ -70,10 +70,9 @@ /* so that configuration with `FT_CONFIG_OPTION_SYSTEM_ZLIB' might */ /* include the wrong `zconf.h' file, leading to errors. */ -#if defined( __GNUC__ ) || defined( __clang__ ) #define ZEXPORT -#define ZEXTERN static -#endif + /* prevent zlib functions from being visible outside their object files */ +#define ZEXTERN static #define HAVE_MEMCPY 1 #define Z_SOLO 1 diff --git a/src/3rdparty/freetype/src/gzip/rules.mk b/src/3rdparty/freetype/src/gzip/rules.mk index 6feb6f51ce..050e14705c 100644 --- a/src/3rdparty/freetype/src/gzip/rules.mk +++ b/src/3rdparty/freetype/src/gzip/rules.mk @@ -43,7 +43,6 @@ GZIP_DRV_SRCS := $(GZIP_DIR)/adler32.c \ $(GZIP_DIR)/crc32.c \ $(GZIP_DIR)/crc32.h \ $(GZIP_DIR)/ftzconf.h \ - $(GZIP_DIR)/infback.c \ $(GZIP_DIR)/inffast.c \ $(GZIP_DIR)/inffast.h \ $(GZIP_DIR)/inffixed.h \ |