This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch Pilot-Pirx-zlib
in repository https://gitbox.apache.org/repos/asf/openoffice.git


The following commit(s) were added to refs/heads/Pilot-Pirx-zlib by this push:
     new 943a11922e Additional changes
943a11922e is described below

commit 943a11922ea42b098e7adb04fc47520546b4440d
Author: mseidel <[email protected]>
AuthorDate: Sat Mar 7 22:25:39 2026 +0100

    Additional changes
---
 main/zlib/makefile.mk                            | 5 +++--
 main/zlib/prj/d.lst                              | 1 +
 main/zlib/{zlib-1.3.1.patch => zlib-1.3.2.patch} | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/main/zlib/makefile.mk b/main/zlib/makefile.mk
index cd4bbe06bd..d45b17290d 100644
--- a/main/zlib/makefile.mk
+++ b/main/zlib/makefile.mk
@@ -38,8 +38,8 @@ 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
 ADDITIONAL_FILES=makefile.mk
@@ -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..3a39d07be0 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\ioapi.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
 +#*************************************************************************

Reply via email to