[zlib] Update zlib to 1.2.11

Fix opening of xlsx created by NPOI(bad-zip.xlsx)
This commit is contained in:
Sergey Konovalov
2018-10-10 18:42:45 +03:00
parent 13900daf08
commit b7c8bc2769
3 changed files with 43 additions and 33 deletions

View File

@ -11,43 +11,47 @@ build_zlib_as_sources {
}
INCLUDEPATH += \
$$PWD/src/zlib-1.2.3/contrib/minizip \
$$PWD/src/zlib-1.2.3
$$PWD/src/zlib-1.2.11/contrib/minizip \
$$PWD/src/zlib-1.2.11
SOURCES += \
$$PWD/src/OfficeUtils.cpp \
$$PWD/src/ZipUtilsCP.cpp \
$$PWD/src/zlib-1.2.3/contrib/minizip/ioapi.c \
$$PWD/src/zlib-1.2.3/contrib/minizip/miniunz.c \
$$PWD/src/zlib-1.2.3/contrib/minizip/minizip.c \
$$PWD/src/zlib-1.2.3/contrib/minizip/mztools.c \
$$PWD/src/zlib-1.2.3/contrib/minizip/unzip.c \
$$PWD/src/zlib-1.2.3/contrib/minizip/zip.c
$$PWD/src/zlib-1.2.11/contrib/minizip/ioapi.c \
$$PWD/src/zlib-1.2.11/contrib/minizip/miniunz.c \
$$PWD/src/zlib-1.2.11/contrib/minizip/minizip.c \
$$PWD/src/zlib-1.2.11/contrib/minizip/mztools.c \
$$PWD/src/zlib-1.2.11/contrib/minizip/unzip.c \
$$PWD/src/zlib-1.2.11/contrib/minizip/zip.c
core_windows {
SOURCES += \
$$PWD/src/zlib-1.2.11/contrib/minizip/iowin32.c
}
build_all_zlib {
SOURCES += \
$$PWD/src/zlib-1.2.3/adler32.c \
$$PWD/src/zlib-1.2.3/compress.c \
$$PWD/src/zlib-1.2.3/crc32.c \
$$PWD/src/zlib-1.2.3/deflate.c \
$$PWD/src/zlib-1.2.3/example.c \
$$PWD/src/zlib-1.2.3/gzio.c \
$$PWD/src/zlib-1.2.3/infback.c \
$$PWD/src/zlib-1.2.3/inffast.c \
$$PWD/src/zlib-1.2.3/inflate.c \
$$PWD/src/zlib-1.2.3/inftrees.c \
$$PWD/src/zlib-1.2.3/minigzip.c \
$$PWD/src/zlib-1.2.3/trees.c \
$$PWD/src/zlib-1.2.3/uncompr.c \
$$PWD/src/zlib-1.2.3/zutil.c
$$PWD/src/zlib-1.2.11/adler32.c \
$$PWD/src/zlib-1.2.11/compress.c \
$$PWD/src/zlib-1.2.11/crc32.c \
$$PWD/src/zlib-1.2.11/deflate.c \
$$PWD/src/zlib-1.2.11/gzclose.c \
$$PWD/src/zlib-1.2.11/gzlib.c \
$$PWD/src/zlib-1.2.11/gzread.c \
$$PWD/src/zlib-1.2.11/gzwrite.c \
$$PWD/src/zlib-1.2.11/infback.c \
$$PWD/src/zlib-1.2.11/inffast.c \
$$PWD/src/zlib-1.2.11/inflate.c \
$$PWD/src/zlib-1.2.11/inftrees.c \
$$PWD/src/zlib-1.2.11/trees.c \
$$PWD/src/zlib-1.2.11/uncompr.c \
$$PWD/src/zlib-1.2.11/zutil.c
}
HEADERS += \
$$PWD/src/OfficeUtilsCommon.h \
$$PWD/src/OfficeUtils.h \
$$PWD/src/ZipUtilsCP.h \
$$PWD/src/zlib-1.2.3/contrib/minizip/crypt.h \
$$PWD/src/zlib-1.2.3/contrib/minizip/ioapi.h \
$$PWD/src/zlib-1.2.3/contrib/minizip/mztools.h \
$$PWD/src/zlib-1.2.3/contrib/minizip/unzip.h \
$$PWD/src/zlib-1.2.3/contrib/minizip/zip.h
$$PWD/src/zlib-1.2.11/contrib/minizip/crypt.h \
$$PWD/src/zlib-1.2.11/contrib/minizip/ioapi.h \
$$PWD/src/zlib-1.2.11/contrib/minizip/mztools.h \
$$PWD/src/zlib-1.2.11/contrib/minizip/unzip.h \
$$PWD/src/zlib-1.2.11/contrib/minizip/zip.h