Update to minizip 1.2.13#515
Merged
kristelmerilain merged 3 commits intoopen-eid:masterfrom Jan 10, 2023
Merged
Conversation
https://github.com/madler/zlib/releases/tag/v1.2.13 Noticed by building libdigidocpp 3.14.11 on OpenBSD where we still have to pass `CFLAGS += -DIOAPI_NO_64` as off_t is always 64-bit. 1.2.13 contains a fix for this but libdigidocpp would fail to build, i.e. it still ships an old version.
Contributor
Author
|
But now the build fails, I'll update with a fix shortly. |
zip.h's `struct zip_fileinfo` member `tm_zip tmz_date` changed member
types from to `int`, so drop the cast as all `struct tm` members are
`int` already.
Fixes the following:
```
/usr/ports/pobj/libdigidocpp-3.14.11/libdigidocpp-3.14.11/src/util/ZipSerialize.cpp:186:11: error: non-constant-expression cannot be narrowed from type 'uInt' (aka 'unsigned int') to 'int' in initializer list [-Wc++11-narrowing]
{ uInt(time.tm_sec), uInt(time.tm_min), uInt(time.tm_hour),
^~~~~~~~~~~~~~~~~
/usr/ports/pobj/libdigidocpp-3.14.11/libdigidocpp-3.14.11/src/util/ZipSerialize.cpp:186:11: note: insert an explicit cast to silence this issue
{ uInt(time.tm_sec), uInt(time.tm_min), uInt(time.tm_hour),
^~~~~~~~~~~~~~~~~
static_cast<int>()
```
metsma
requested changes
Jan 4, 2023
Spotted by Raul Metsma during review.
metsma
approved these changes
Jan 5, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
https://github.com/madler/zlib/releases/tag/v1.2.13
Noticed by building libdigidocpp 3.14.11 on OpenBSD where we still have
to pass
CFLAGS += -DIOAPI_NO_64as off_t is always 64-bit.1.2.13 contains a fix for this but libdigidocpp would fail to build, i.e.
it still ships an old version.