You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@openoffice.apache.org by ji...@apache.org on 2021/10/01 11:37:53 UTC

[openoffice] 01/01: Merge pull request #135 from apache/catalina

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

jim pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 7b3c4f98df5dd586d2392213bce73a8b4f725d08
Merge: bdb20b2 48a4b4e
Author: Jim Jagielski <ji...@apache.org>
AuthorDate: Fri Oct 1 07:37:45 2021 -0400

    Merge pull request #135 from apache/catalina
    
    Support compilation under macOS Catalina

 ext_libraries/apr/apr-1.5.2-darwin19.6.patch   | 106 +++++++++++++++++++++++++
 ext_libraries/apr/makefile.mk                  |   4 +
 ext_libraries/serf/makefile.mk                 |   5 +-
 main/configure.ac                              |   4 +-
 main/icu/icu-darwin.patch                      |  34 ++++++++
 main/icu/makefile.mk                           |   4 +
 main/instsetoo_native/util/makefile.mk         |   7 ++
 main/redland/raptor/makefile.mk                |   1 +
 main/redland/raptor/raptor2-2.0.15.patch.macos |  10 +++
 main/scripting/java/build.xml                  |  10 ++-
 main/solenv/bin/mkout.pl                       |   3 +-
 11 files changed, 178 insertions(+), 10 deletions(-)