This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 06b25e5a55 Update zlib (#474)
06b25e5a55 is described below
commit 06b25e5a55fc58a0fb6a2a2aa5152468d2f3999b
Author: Matthias Seidel <[email protected]>
AuthorDate: Sun Mar 8 21:21:15 2026 +0100
Update zlib (#474)
* Update zlib
* Additional changes
* Typo
* Update makefile.mk
(cherry picked from commit 7c92c44f237b527f14f3e4a3afb4d462d6aabe1f)
---
main/external_deps.lst | 4 ++--
main/zlib/makefile.mk | 7 ++++---
main/zlib/prj/d.lst | 1 +
main/zlib/{zlib-1.3.1.patch => zlib-1.3.2.patch} | 4 ++--
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 0c0c29daa4..c33a6a0aae 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -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)
diff --git a/main/zlib/makefile.mk b/main/zlib/makefile.mk
index cd4bbe06bd..31b3fb878a 100644
--- a/main/zlib/makefile.mk
+++ b/main/zlib/makefile.mk
@@ -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
@@ -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
diff --git a/main/zlib/prj/d.lst b/main/zlib/prj/d.lst
index b6433510d6..ea35a332c6 100644
--- a/main/zlib/prj/d.lst
+++ b/main/zlib/prj/d.lst
@@ -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
diff --git a/main/zlib/zlib-1.3.1.patch b/main/zlib/zlib-1.3.2.patch
similarity index 95%
rename from main/zlib/zlib-1.3.1.patch
rename to main/zlib/zlib-1.3.2.patch
index 6b8c651db1..1322cee560 100644
--- a/main/zlib/zlib-1.3.1.patch
+++ b/main/zlib/zlib-1.3.2.patch
@@ -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
+#*************************************************************************
