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 19:52:39 UTC
[openoffice] branch AOO41X updated (466742980f -> 774ffdbe38)
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 466742980f #i118023# Calc: Cut-and-paste between spreadsheets causes incorrect cell reference changes
new 121b6c7516 Update makefile
new 774ffdbe38 Update zlib to 1.2.13 (#165)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/external_deps.lst | 4 ++--
main/zlib/makefile.mk | 16 ++++++++--------
main/zlib/{zlib-1.2.7.patch => zlib-1.2.13.patch} | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
rename main/zlib/{zlib-1.2.7.patch => zlib-1.2.13.patch} (95%)
[openoffice] 01/02: Update makefile
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 121b6c7516a7e331c5197b28db00725e40a2c367
Author: mseidel <ms...@apache.org>
AuthorDate: Sat Jan 14 20:51:59 2023 +0100
Update makefile
---
main/zlib/makefile.mk | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/main/zlib/makefile.mk b/main/zlib/makefile.mk
index db2ce8dd47..f72fa49247 100644
--- a/main/zlib/makefile.mk
+++ b/main/zlib/makefile.mk
@@ -1,5 +1,5 @@
#**************************************************************
-#
+#
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
@@ -7,16 +7,16 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
-#
+#
# http://www.apache.org/licenses/LICENSE-2.0
-#
+#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-#
+#
#**************************************************************
@@ -41,7 +41,7 @@ all:
# --- Files --------------------------------------------------------
TARFILE_NAME=zlib-1.2.7
-TARFILE_MD5=2ab442d169156f34c379c968f3f482dd
+TARFILE_MD5=60df6a37c56e7c1366cca812414f7b85
PATCH_FILES=zlib-1.2.7.patch
ADDITIONAL_FILES=makefile.mk
@@ -68,4 +68,4 @@ PATCHED_HEADERS=$(INCCOM)$/patched$/zlib.h
ALLTAR: $(PATCHED_HEADERS)
$(PATCHED_HEADERS) : $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
- @$(PERL) make_patched_header.pl $@ $(PRJNAME)
+ @$(PERL) make_patched_header.pl $@ $(PRJNAME)
[openoffice] 02/02: Update zlib to 1.2.13 (#165)
Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 774ffdbe38c768c5e09ca9b2a39dc3fa4bb19cb8
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
(cherry picked from commit 4e512ac1888cfc52ff2ea77d9b416f1c1c398963)
---
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 206dcd00d6..8c04dfa7ec 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -100,8 +100,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
+#*************************************************************************