* update to svn 1327774. This is release candidate of Apache OpenOffice 3.4.

https://cwiki.apache.org/confluence/display/OOOUSERS/AOO+3.4+%28incubating%29+Release+Candidate
* adding newer (Oracle) Java recognition patch [1]

Submitted by: pfg@ [1]
This commit is contained in:
Maho Nakata 2012-04-25 21:27:06 +00:00
parent 03f9d8a4ab
commit 5956912649
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=295524
3 changed files with 30 additions and 5 deletions

View File

@ -56,7 +56,7 @@ FREEBSD_ENV_SET= FreeBSDX86Env.Set.sh
OOOSRC= ApacheOpenOffice.r${SVNREVISION}${EXTRACT_SUFX}
EXTSRC= ApacheOpenOffice.ext_sources.r${SVNREVISION}${EXTRACT_SUFX}
OOODIR= openoffice.org3
SVNREVISION= 1324652
SVNREVISION= 1327774
INSTALLATION_BASEDIR?= openoffice-r${SVNREVISION}
EXECBASE?= openoffice-r${SVNREVISION}
DIST_SUBDIR= openoffice

View File

@ -1,6 +1,6 @@
SHA256 (openoffice/ApacheOpenOffice.r1324652.tar.bz2) = 0d38657e31b7bcb44206ce6eb17f7881831991cc96b186cda6ca2f31829e56c6
SIZE (openoffice/ApacheOpenOffice.r1324652.tar.bz2) = 251626053
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1324652.tar.bz2) = be1e6b424dd6247a169e3ac63989a7a88fea4db6a903e4644403ae16b284d7ea
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1324652.tar.bz2) = 215141012
SHA256 (openoffice/ApacheOpenOffice.r1327774.tar.bz2) = ce5079a7bd0ca5542a04f64ebaf9e463bd03a857bfcec9145d186bfba0c25a12
SIZE (openoffice/ApacheOpenOffice.r1327774.tar.bz2) = 251624795
SHA256 (openoffice/ApacheOpenOffice.ext_sources.r1327774.tar.bz2) = 17bb70c9e16cb1d7452206a7450e3d2649e1865750e3b3776b5d55878b98d785
SIZE (openoffice/ApacheOpenOffice.ext_sources.r1327774.tar.bz2) = 215141516
SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
SIZE (openoffice/unowinreg.dll) = 6144

View File

@ -0,0 +1,25 @@
Index: jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
===================================================================
--- jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml (revision 1328451)
+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml (working copy)
@@ -23,9 +23,11 @@
<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <updated>2008-08-27</updated>
+ <updated>2011-01-07</updated>
<vendorInfos>
+ <vendor name="Oracle Corporation">
+ <minVersion>1.7.0</minVersion>
<vendor name="Sun Microsystems Inc.">
<minVersion>1.5.0</minVersion>
</vendor>
@@ -38,6 +40,7 @@
</vendorInfos>
<plugins>
+ <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
<library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>