You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by tr...@apache.org on 2020/10/05 15:05:00 UTC
[openoffice] branch trunk updated: Uprade bundled expat to version
2.2.10
This is an automated email from the ASF dual-hosted git repository.
truckman 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 a7d4c77 Uprade bundled expat to version 2.2.10
a7d4c77 is described below
commit a7d4c77fde6b2c03d20b3fe54d29a33f7eb604bc
Author: Don Lewis <tr...@apache.org>
AuthorDate: Sun Oct 4 20:38:13 2020 -0700
Uprade bundled expat to version 2.2.10
This is a bug fix release.
---
main/LICENSE | 2 +-
main/expat/{expat-2.2.9.patch => expat-2.2.10.patch} | 4 ++--
main/expat/makefile.mk | 4 ++--
main/expat/prj/d.lst | 4 ++--
main/external_deps.lst | 6 +++---
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/main/LICENSE b/main/LICENSE
index 6469763..057db0c 100644
--- a/main/LICENSE
+++ b/main/LICENSE
@@ -1031,7 +1031,7 @@ For integration of XML Expat - built in main/expat/
- MIT license
Copyright (c) 1998-2000 Thai Open Source Software Center Ltd and Clark Cooper
-Copyright (c) 2001-2017 Expat maintainers
+Copyright (c) 2001-2019 Expat maintainers
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
diff --git a/main/expat/expat-2.2.9.patch b/main/expat/expat-2.2.10.patch
similarity index 95%
rename from main/expat/expat-2.2.9.patch
rename to main/expat/expat-2.2.10.patch
index beb860d..ff1d16a 100644
--- a/main/expat/expat-2.2.9.patch
+++ b/main/expat/expat-2.2.10.patch
@@ -1,5 +1,5 @@
---- misc/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:33:55 2008
-+++ misc/build/expat-2.2.9/lib/makefile.mk Wed Aug 20 14:26:42 2008
+--- misc/expat-2.2.10/lib/makefile.mk Wed Aug 20 14:33:55 2008
++++ misc/build/expat-2.2.10/lib/makefile.mk Wed Aug 20 14:26:42 2008
@@ -1 +1,79 @@
-dummy
+#**************************************************************
diff --git a/main/expat/makefile.mk b/main/expat/makefile.mk
index 4d19604..20fd92b 100644
--- a/main/expat/makefile.mk
+++ b/main/expat/makefile.mk
@@ -38,8 +38,8 @@ all:
# --- Files --------------------------------------------------------
-TARFILE_NAME=expat-2.2.9
-TARFILE_MD5=875a2c2ff3e8eb9e5a5cd62db2033ab5
+TARFILE_NAME=expat-2.2.10
+TARFILE_MD5=9d60de01cc0126dfd11121b04838e154
ADDITIONAL_FILES=lib$/makefile.mk
PATCH_FILES=$(TARFILE_NAME).patch
diff --git a/main/expat/prj/d.lst b/main/expat/prj/d.lst
index fe7184e..010fdf1 100644
--- a/main/expat/prj/d.lst
+++ b/main/expat/prj/d.lst
@@ -1,7 +1,7 @@
mkdir: %_DEST%\inc%_EXT%\external\expat
mkdir: %_DEST%\lib%_EXT%\x64
-..\%__SRC%\misc\build\expat-2.2.9\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
-..\%__SRC%\misc\build\expat-2.2.9\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
+..\%__SRC%\misc\build\expat-2.2.10\lib\expat.h %_DEST%\inc%_EXT%\external\expat.h
+..\%__SRC%\misc\build\expat-2.2.10\lib\expat_external.h %_DEST%\inc%_EXT%\external\expat_external.h
..\%__SRC%\slb\expat_xmltok.lib %_DEST%\lib%_EXT%\expat_xmltok.lib
..\%__SRC%\slb\expat_xmlparse.lib %_DEST%\lib%_EXT%\expat_xmlparse.lib
..\%__SRC%\slb\ascii_expat_xmlparse.lib %_DEST%\lib%_EXT%\ascii_expat_xmlparse.lib
diff --git a/main/external_deps.lst b/main/external_deps.lst
index eb2fbb6..dc09293 100644
--- a/main/external_deps.lst
+++ b/main/external_deps.lst
@@ -217,9 +217,9 @@ if (SYSTEM_VIGRA != YES)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_EXPAT != YES)
- MD5 = 875a2c2ff3e8eb9e5a5cd62db2033ab5
- name = expat-2.2.9.tar.bz2
- URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.9/$(name)
+ MD5 = 9d60de01cc0126dfd11121b04838e154
+ name = expat-2.2.10.tar.bz2
+ URL1 = https://sourceforge.net/projects/expat/files/expat/2.2.10/$(name)
URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
if (SYSTEM_CURL != YES)