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 ca03ca98d6 Update zlib to 1.3
ca03ca98d6 is described below
commit ca03ca98d64235205a217ade890a02ebe8198903
Author: mseidel <msei...@apache.org>
AuthorDate: Fri Aug 18 21:08:39 2023 +0200
Update zlib to 1.3
(cherry picked from commit 9a23d2507d420bd0af4e02a94eca3c33abc55067)
---
main/external_deps.lst | 4 ++--
main/zlib/makefile.mk | 6 +++---
main/zlib/{zlib-1.2.13.patch => zlib-1.3.patch} | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/main/external_deps.lst b/main/external_deps.lst
index 5041642119..71264e9070 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 = 9b8aa094c4e5765dabf4da391f00d15c
- name = zlib-1.2.13.tar.gz
+ MD5 = 60373b133d630f74f4a1f94c1185a53f
+ name = zlib-1.3.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 9c9b89c72e..fb59a42f35 100644
--- a/main/zlib/makefile.mk
+++ b/main/zlib/makefile.mk
@@ -40,10 +40,10 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=zlib-1.2.13
-TARFILE_MD5=9b8aa094c4e5765dabf4da391f00d15c
+TARFILE_NAME=zlib-1.3
+TARFILE_MD5=60373b133d630f74f4a1f94c1185a53f
-PATCH_FILES=zlib-1.2.13.patch
+PATCH_FILES=zlib-1.3.patch
ADDITIONAL_FILES=makefile.mk
#relative to CONFIGURE_DIR
diff --git a/main/zlib/zlib-1.2.13.patch b/main/zlib/zlib-1.3.patch
similarity index 95%
rename from main/zlib/zlib-1.2.13.patch
rename to main/zlib/zlib-1.3.patch
index a82ce589b6..29d94ed2ba 100644
--- a/main/zlib/zlib-1.2.13.patch
+++ b/main/zlib/zlib-1.3.patch
@@ -1,5 +1,5 @@
---- misc/zlib-1.2.13/makefile.mk Fri Mar 14 10:17:06 2008
-+++ misc/build/zlib-1.2.13/makefile.mk Fri Mar 14 10:16:56 2008
+--- misc/zlib-1.3/makefile.mk Fri Mar 14 10:17:06 2008
++++ misc/build/zlib-1.3/makefile.mk Fri Mar 14 10:16:56 2008
@@ -1 +1,82 @@
-dummy
+#*************************************************************************
