[arch-commits] Commit in openoffice-base-devel/trunk (ChangeLog PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sun Sep 6 20:37:26 UTC 2009
Date: Sunday, September 6, 2009 @ 16:37:26
Author: andyrtr
Revision: 51273
prepare next build, use all new system libs, split the build for OOo sdk
Modified:
openoffice-base-devel/trunk/ChangeLog
openoffice-base-devel/trunk/PKGBUILD
-----------+
ChangeLog | 3 +++
PKGBUILD | 35 ++++++++++++++++++++++-------------
2 files changed, 25 insertions(+), 13 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-09-06 19:59:41 UTC (rev 51272)
+++ ChangeLog 2009-09-06 20:37:26 UTC (rev 51273)
@@ -5,6 +5,9 @@
- integrate OOo-sdk with pkg split
- enable kde4 integration
- use system boost again
+ - make use of new system lucene, beanshell, saxon, vigra
+ lpsolve, hyphen
+ - enable openldap
2009-08-19 Andreas Radke <andyrtr at archlinux.org>
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-09-06 19:59:41 UTC (rev 51272)
+++ PKGBUILD 2009-09-06 20:37:26 UTC (rev 51273)
@@ -17,7 +17,8 @@
'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.5-5"
# from main OOo the deps
"curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland' 'libxaw' "neon>=0.28.4"
- 'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils')
+ 'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils'
+ 'lucene' 'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap')
source=(${pkgname}-${_OO_milestone}.tar.gz
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
startcenter.desktop
@@ -146,23 +147,18 @@
--without-gpc\
--without-nas\
--without-ppds\
+ --without-system-agg\
+ --with-openldap\
--with-system-stdlibs\
--with-system-libs\
--with-system-sane-header\
--with-system-mozilla=libxul\
--with-system-xrender-headers\
--with-system-headers\
- --with-jdk-home=${JAVA_HOME} \
- --with-system-xerces \
- --with-xerces-jar=/usr/share/java/xercesImpl.jar \
- --with-system-xalan \
- --with-xalan-jar=/usr/share/java/xalan.jar \
- --with-system-xml-apis\
- --with-xml-apis-jar=/usr/share/java/xml-apis.jar \
- --with-system-hsqldb \
- --with-hsqldb-jar=/usr/share/java/hsqldb.jar \
- --with-serializer-jar=/usr/share/java/serializer.jar \
- --with-ant-home="/usr/share/java/apache-ant"\
+ --with-jdk-home=${JAVA_HOME}\
+ --with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+ --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
+ --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
--with-use-shell=bash\
$EXTRAOPTS || return 1
@@ -188,7 +184,19 @@
# --with-system-zlib\
# --with-system-openssl\
+ # --with-system-hsqldb \
+# --with-hsqldb-jar=/usr/share/java/hsqldb.jar \
+# --with-system-xerces \
+# --with-xerces-jar=/usr/share/java/xercesImpl.jar \
+# --with-system-xalan \
+# --with-xalan-jar=/usr/share/java/xalan.jar \
+# --with-system-xml-apis\
+# --with-xml-apis-jar=/usr/share/java/xml-apis.jar \
+# --with-serializer-jar=/usr/share/java/serializer.jar \
+# --with-ant-home="/usr/share/java/apache-ant"\
+
+
# packages needed for system graphite --with-system-graphite
# we will need myspell dicts for --with-system-dicts --without-myspell-dicts
@@ -212,7 +220,8 @@
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
install=openoffice.install
depends=("curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.2" 'libwpd' 'redland' 'libxaw' "neon>=0.28.4"
- 'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils')
+ 'dbus-glib' "icu>=4.2.1" 'hsqldb-java' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils'
+ 'lucene' 'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap')
optdepends=('java-runtime: adds java support'
'libcups: adds printing support'
'gconf: adds additional gnome support'
More information about the arch-commits
mailing list