Skip to content

Update zlib #474

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Pilot-Pirx merged 4 commits into from
Mar 8, 2026
Merged

Update zlib #474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c15d66
Update zlib
Pilot-Pirx Feb 17, 2026
943a119
Additional changes
Pilot-Pirx Mar 7, 2026
9e1a63a
Typo
Pilot-Pirx Mar 7, 2026
92e83df
Update makefile.mk
Pilot-Pirx Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions main/external_deps.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ if (SYSTEM_REDLAND != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)

if (GUI!=UNX || SYSTEM_ZLIB!=YES)
MD5 = 9855b6d802d7fe5b7bd5b196a2271655
name = zlib-1.3.1.tar.gz
MD5 = a1e6c958597af3c67d162995a342138a
name = zlib-1.3.2.tar.gz
URL1 = https://www.zlib.net/fossils/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)

Expand Down
7 changes: 4 additions & 3 deletions main/zlib/makefile.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ all:

# --- Files --------------------------------------------------------

TARFILE_NAME=zlib-1.3.1
TARFILE_MD5=9855b6d802d7fe5b7bd5b196a2271655
TARFILE_NAME=zlib-1.3.2
TARFILE_MD5=a1e6c958597af3c67d162995a342138a

PATCH_FILES=zlib-1.3.1.patch
PATCH_FILES=zlib-1.3.2.patch
ADDITIONAL_FILES=makefile.mk

#relative to CONFIGURE_DIR
Expand All @@ -53,6 +53,7 @@ OUT2INC= \
zlib.h \
zconf.h \
contrib$/minizip$/unzip.h \
contrib$/minizip$/ints.h \
contrib$/minizip$/ioapi.h

PATCHED_HEADERS=$(INCCOM)$/patched$/zlib.h
Expand Down
1 change: 1 addition & 0 deletions main/zlib/prj/d.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ mkdir: %_DEST%\lib%_EXT%\x64
..\%__SRC%\inc\patched\zlib.h %_DEST%\inc%_EXT%\external\zlib\zlib.h
..\%__SRC%\inc\unzip.h %_DEST%\inc%_EXT%\external\zlib\unzip.h
..\%__SRC%\inc\ioapi.h %_DEST%\inc%_EXT%\external\zlib\ioapi.h
..\%__SRC%\inc\ints.h %_DEST%\inc%_EXT%\external\zlib\ints.h
..\%__SRC%\inc\zconf.h %_DEST%\inc%_EXT%\external\zlib\zconf.h

..\%__SRC%\lib\libzlib.a %_DEST%\lib%_EXT%\libzlib.a
Expand Down
4 changes: 2 additions & 2 deletions main/zlib/zlib-1.3.1.patch → main/zlib/zlib-1.3.2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- misc/zlib-1.3.1/makefile.mk Fri Mar 14 10:17:06 2008
+++ misc/build/zlib-1.3.1/makefile.mk Fri Mar 14 10:16:56 2008
--- misc/zlib-1.3.2/makefile.mk Fri Mar 14 10:17:06 2008
+++ misc/build/zlib-1.3.2/makefile.mk Fri Mar 14 10:16:56 2008
@@ -1 +1,82 @@
-dummy
+#*************************************************************************
Expand Down