You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2023/01/14 11:44:02 UTC
[openoffice] branch trunk updated: Update zlib to 1.2.13 (#165)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4e512ac188 Update zlib to 1.2.13 (#165)
4e512ac188 is described below
commit 4e512ac1888cfc52ff2ea77d9b416f1c1c398963
Author: Matthias Seidel <ms...@apache.org>
AuthorDate: Sat Jan 14 12:43:57 2023 +0100
Update zlib to 1.2.13 (#165)
* Update zlib to 1.2.13
Currently we use zlib 1.2.7 from 2012.
This PR updates it to the most recent version 1.2.13 from 2022.
I am no developer, but basically we only add a makefile and patch some headers.
I could build successfully with this PR on Windows, testing on other OS is welcome!
* Further changes for zlib 1.2.13
* chmod 755
---
main/external_deps.lst | 4 ++--
main/zlib/makefile.mk | 6 +++---
main/zlib/{zlib-1.2.7.patch => zlib-1.2.13.patch} | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/main/external_deps.lst b/main/external_deps.lst
index f9aa4c7c7b..4e760a1776 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 = 60df6a37c56e7c1366cca812414f7b85
- name = zlib-1.2.7.tar.gz
+ MD5 = 9b8aa094c4e5765dabf4da391f00d15c
+ name = zlib-1.2.13.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 f72fa49247..9c9b89c72e 100644
--- a/main/zlib/makefile.mk
+++ b/main/zlib/makefile.mk
@@ -40,10 +40,10 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=zlib-1.2.7
-TARFILE_MD5=60df6a37c56e7c1366cca812414f7b85
+TARFILE_NAME=zlib-1.2.13
+TARFILE_MD5=9b8aa094c4e5765dabf4da391f00d15c
-PATCH_FILES=zlib-1.2.7.patch
+PATCH_FILES=zlib-1.2.13.patch
ADDITIONAL_FILES=makefile.mk
#relative to CONFIGURE_DIR
diff --git a/main/zlib/zlib-1.2.7.patch b/main/zlib/zlib-1.2.13.patch
similarity index 95%
rename from main/zlib/zlib-1.2.7.patch
rename to main/zlib/zlib-1.2.13.patch
index 9e82ceb189..a82ce589b6 100644
--- a/main/zlib/zlib-1.2.7.patch
+++ b/main/zlib/zlib-1.2.13.patch
@@ -1,5 +1,5 @@
---- misc/zlib-1.2.7/makefile.mk Fri Mar 14 10:17:06 2008
-+++ misc/build/zlib-1.2.7/makefile.mk Fri Mar 14 10:16:56 2008
+--- 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
@@ -1 +1,82 @@
-dummy
+#*************************************************************************