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 2020/09/24 19:43:58 UTC
[openoffice] 01/03: test Merge branch 'bundle418' of
git://github.com/DonLewisFreeBSD/openoffice into AOO418
This is an automated email from the ASF dual-hosted git repository.
jim pushed a commit to branch AOO418
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 61fb1b541550006bdf93dd31281d4348a20af944
Merge: 0c0e82a 9510f38
Author: Jim Jagielski <ji...@gmail.com>
AuthorDate: Thu Sep 24 10:04:51 2020 -0400
test
Merge branch 'bundle418' of git://github.com/DonLewisFreeBSD/openoffice into AOO418
....1.apu.hw.patch => apr-util-1.5.4.apu.hw.patch} | 4 +-
....4.1.expat.patch => apr-util-1.5.4.expat.patch} | 4 +-
...ewin32.patch => apr-util-1.5.4.makewin32.patch} | 102 +-
ext_libraries/apr-util/aprutil_version.mk | 4 +-
ext_libraries/apr-util/makefile.mk | 2 +-
ext_libraries/apr/apr-1.4.5.patch | 173 -
ext_libraries/apr/apr-1.5.2-no-devenv.patch | 16 +
...1.4.5-windows.patch => apr-1.5.2-windows.patch} | 4 +-
ext_libraries/apr/apr_version.mk | 4 +-
ext_libraries/apr/makefile.mk | 4 +-
...verflow.patch => hunspell-1.3.3-overflow.patch} | 24 +-
ext_libraries/hunspell/hunspell-bash.patch | 4 +-
.../hunspell/hunspell-cxx11-literal.patch | 6 +-
ext_libraries/hunspell/hunspell-mingw.patch | 12 -
ext_libraries/hunspell/hunspell-solaris.patch | 4 +-
ext_libraries/hunspell/hunspell-wntconfig.patch | 4 -
ext_libraries/hunspell/makefile.mk | 8 +-
ext_libraries/ratscan/rat/makefile.mk | 12 +-
ext_libraries/ratscan/scan/makefile.mk | 2 +-
ext_libraries/ratscan/scan/rat-scan.xml | 10 +-
ext_libraries/serf/makefile.mk | 2 +-
...8eeda0e2898b0d5bf7e26a016e-raptor-1.4.18.tar.gz | Bin 1657246 -> 0 bytes
...334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz | Bin 262206 -> 0 bytes
...d908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz | Bin 522654 -> 0 bytes
...6098a9debf998510e304c8095-apr-util-1.4.1.tar.gz | Bin 774770 -> 0 bytes
...262fe54dddaf583eaaee3497a426e1-apr-1.4.5.tar.gz | Bin 994320 -> 0 bytes
...dd53d7bd0a560a870ddd0af5-openssl-0.9.8zh.tar.gz | Bin 3818524 -> 0 bytes
...6082cab8bb817185a116db809b-redland-1.0.8.tar.gz | Bin 3989935 -> 0 bytes
...4a30146aaa3001296f853b2b9-libxslt-1.1.26.tar.gz | Bin 3401513 -> 0 bytes
...433d8ff92f5e316b36ff9-dejavu-fonts-ttf-2.33.zip | Bin 5008644 -> 0 bytes
...6f2c4619e2fa3f8f42f8fc1e9d-rasqal-0.9.16.tar.gz | Bin 1117561 -> 0 bytes
main/LICENSE_category_b | 610 --
main/apache-commons/java/codec/makefile.mk | 17 +-
main/apache-commons/java/httpclient/makefile.mk | 4 +-
main/apache-commons/java/lang/makefile.mk | 14 +-
main/apache-commons/java/logging/makefile.mk | 14 +-
main/apache-commons/patches/codec.patch | 36 +-
main/apache-commons/patches/logging.patch | 6 +-
main/apache-commons/prj/d.lst | 6 +-
.../{bsh-2.0b1-src.patch => bsh-2.0b6-src.patch} | 41 +-
main/beanshell/makefile.mk | 8 +-
main/beanshell/prj/d.lst | 2 +-
main/{configure.in => configure.ac} | 27 +-
main/external_deps.lst | 198 +-
main/libxml2/libxml2-centos5.patch | 11 -
main/libxml2/libxml2-configure.patch | 84 +-
main/libxml2/libxml2-nan-inf-fix.patch | 60 -
main/libxml2/makefile.mk | 20 +-
main/libxslt/libxslt-configure.patch | 53 +-
main/libxslt/libxslt-win_manifest.patch | 15 +-
main/libxslt/libxsltversion.mk | 2 +-
main/libxslt/makefile.mk | 4 +-
main/more_fonts/fonts/fc_local.conf | 26 +-
.../{ttf_croscore => ttf_carlito}/makefile.mk | 11 +-
main/more_fonts/fonts/ttf_croscore/makefile.mk | 8 +-
.../{ttf_dejavu => ttf_crosextra}/makefile.mk | 12 +-
main/more_fonts/fonts/ttf_dejavu/makefile.mk | 6 +-
main/more_fonts/fonts/ttf_gentium/makefile.mk | 8 +-
main/more_fonts/prj/build.lst | 2 +
main/more_fonts/prj/d.lst | 13 +-
main/nss/makefile.mk | 78 +-
main/nss/nss.patch | 262 +-
main/nss/nss_bug_1348767.patch | 14 +
main/nss/nss_bug_1437734.patch | 118 +
main/nss/nss_bug_1438426.patch | 12 +
main/nss/nss_freebsd.patch | 15 +
main/nss/nss_linux.patch | 38 +-
main/nss/nss_macosx.patch | 21 +-
main/nss/prj/d.lst | 3 +-
main/nss/readme.txt | 2 +-
main/python/makefile.mk | 30 +-
main/python/prj/d.lst | 124 +-
main/python/python-2.7.17-msvs9-dir.patch | 10 +
.../python-2.7.17-msvs9-no-host-python.patch | 11 +
main/python/python-2.7.17-msvs9-python-path.patch | 11 +
main/python/python-2.7.17-msvs9-subsystem.patch | 20 +
main/python/python-2.7.17-msvs9-win64-target.patch | 60 +
...build.patch => python-2.7.17-msvs9-win64.patch} | 634 +-
...7.6-pcbuild.patch => python-2.7.17-msvs9.patch} | 270 +-
...rdlink.patch => python-2.7.17-nohardlink.patch} | 6 +-
...6-sysbase.patch => python-2.7.17-sysbase.patch} | 11 +-
main/python/python-2.7.6-mingw.patch | 7316 --------------------
main/python/python-freebsd.patch | 722 +-
main/python/python-md5.patch | 8 +-
main/python/python-solaris.patch | 6 +-
main/python/python-solver-before-std.patch | 21 +-
main/python/python-ssl.patch | 22 +-
main/python/pyversion.mk | 2 +-
main/redland/prj/d.lst | 16 +-
main/redland/raptor/makefile.mk | 44 +-
main/redland/raptor/raptor-1.4.18.patch.autotools | 46 -
main/redland/raptor/raptor-1.4.18.patch.fixes | 42 -
main/redland/raptor/raptor-1.4.18.patch.ooo_build | 43 -
main/redland/raptor/raptor-1.4.18.patch.os2 | 11 -
main/redland/raptor/raptor-1.4.18.patch.win32 | 78 -
...4.18.patch.dmake => raptor2-2.0.15.patch.dmake} | 59 +-
main/redland/raptor/raptor2-2.0.15.patch.os2 | 15 +
main/redland/raptor/raptor2-2.0.15.patch.win32 | 487 ++
main/redland/rasqal/makefile.mk | 34 +-
main/redland/rasqal/rasqal-0.9.16.patch.autotools | 38 -
main/redland/rasqal/rasqal-0.9.16.patch.ooo_build | 56 -
main/redland/rasqal/rasqal-0.9.16.patch.os2 | 5 -
main/redland/rasqal/rasqal-0.9.16.patch.win32 | 43 -
....9.16.patch.dmake => rasqal-0.9.33.patch.dmake} | 77 +-
main/redland/rasqal/rasqal-0.9.33.patch.ooo_build | 14 +
main/redland/rasqal/rasqal-0.9.33.patch.win32 | 398 ++
main/redland/redland/makefile.mk | 58 +-
.../redland/redland/redland-1.0.17.patch.autotools | 21 +
....0.8.patch.dmake => redland-1.0.17.patch.dmake} | 33 +-
.../redland/redland/redland-1.0.17.patch.ooo_build | 32 +
main/redland/redland/redland-1.0.17.patch.os2 | 44 +
main/redland/redland/redland-1.0.17.patch.win32 | 598 ++
main/redland/redland/redland-1.0.8.patch.autotools | 58 -
main/redland/redland/redland-1.0.8.patch.ooo_build | 22 -
main/redland/redland/redland-1.0.8.patch.os2 | 12 -
main/redland/redland/redland-1.0.8.patch.win32 | 154 -
main/redland/redlandversion.mk | 4 +-
main/scp2/source/ooo/file_font_ooo.scp | 49 +-
main/scp2/source/ooo/file_library_ooo.scp | 11 +-
main/solenv/gbuild/platform/macosx.mk | 4 +-
main/swext/mediawiki/build.xml | 2 +-
main/swext/mediawiki/makefile.mk | 6 +-
main/writerfilter/source/doctok/resources.xsl | 2 +-
123 files changed, 3389 insertions(+), 10797 deletions(-)