[arch-commits] Commit in openoffice-base-devel/trunk (ChangeLog PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Sep 23 04:32:18 UTC 2009
Date: Wednesday, September 23, 2009 @ 00:32:17
Author: andyrtr
Revision: 52887
upgpkg: openoffice-base-devel 3.2_dev300_m59-1
new snapshot DEV300_m59; enable more features and use more system libs. provide a sdk pkg.
Modified:
openoffice-base-devel/trunk/ChangeLog
openoffice-base-devel/trunk/PKGBUILD
-----------+
ChangeLog | 7 ++++---
PKGBUILD | 29 +++++++++++++++++++----------
2 files changed, 23 insertions(+), 13 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-09-23 03:41:26 UTC (rev 52886)
+++ ChangeLog 2009-09-23 04:32:17 UTC (rev 52887)
@@ -1,13 +1,14 @@
-2009-09-05 Andreas Radke <andyrtr at archlinux.org>
+2009-09-22 Andreas Radke <andyrtr at archlinux.org>
- * 3.2_dev300_m57-1:
+ * 3.2_dev300_m59-1:
- new snapshot
- 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
+ - don't use syste myth, currently broken
+ # - use system boost again
2009-08-19 Andreas Radke <andyrtr at archlinux.org>
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-09-23 03:41:26 UTC (rev 52886)
+++ PKGBUILD 2009-09-23 04:32:17 UTC (rev 52887)
@@ -5,7 +5,7 @@
pkgbase="openoffice-base-devel"
pkgname=('openoffice-base-devel' 'openoffice-sdk-devel')
-_OO_milestone=DEV300_m57
+_OO_milestone=DEV300_m59
pkgver=3.2_${_OO_milestone/DEV/dev}
pkgrel=1
arch=('i686' 'x86_64')
@@ -13,13 +13,14 @@
url="http://www.openoffice.org"
makedepends=(# the real makedeps
'bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
- 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1.2" 'boost'
- 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.5-5"
+ 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' "xulrunner>=1.9.1.3"
+ 'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'poppler' 'pstoedit' 'gconf' "openjdk6>=1.6.1"
# 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'
- 'lucene' 'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libmythes'
- 'libldap')
+ 'lucene' 'beanshell' 'saxon' 'vigra' 'libgraphite' 'hyphen' 'lpsolve' 'libmspack' 'libldap')
+ # boost
+ # libmythes
source=(${pkgname}-${_OO_milestone}.tar.gz
http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
startcenter.desktop
@@ -30,9 +31,10 @@
shell.patch
buildfix_FormulaMissingHeader.diff
openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
+ http://www.openoffice.org/nonav/issues/showattachment.cgi/64767/openldap.patch
openoffice.profile)
options=('!distcc' '!ccache' '!makeflags')
-md5sums=('699d90ad8de3f080ed022b0b10e3d22c'
+md5sums=('d7382448f57c8ee78f7a4999d5d61e9c'
'e3a0b76dcd876f3d721ee7183729153d'
'63209bbc64c901ef105455bda0282f45'
'71f136a31e296a04ab68932a31dd533e'
@@ -42,8 +44,9 @@
'a51200f770c635355c430cc5052db8cf'
'863a3ab2c17a3d11b8fa3ec321986366'
'75c7e5dd7cf4c266f48565fb6425f8c4'
+ 'a130ad960f76b692e34f8566e5ca3f2b'
'8d68d44c941a687813ddd968383cdf27')
-
+
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
build() {
@@ -74,6 +77,7 @@
patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
patch -Np0 -i ${srcdir}/buildfix_FormulaMissingHeader.diff || return 1
patch -Np1 -i ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch || return 1
+ patch -Np0 -i ${srcdir}/openldap.patch || return 1
# allows soffice to find the user's firefox profile so that it can read
# its digital certificates. Nss stores digital certificates in your mozilla firefox profile.
@@ -129,7 +133,6 @@
--enable-gtk\
--enable-graphite\
--enable-kde4\
- --enable-layout\
--enable-ldap\
--enable-lockdown\
--enable-mediawiki\
@@ -138,7 +141,6 @@
--enable-opengl\
--enable-pdfimport\
--enable-presenter-console\
- --enable-report-builder\
--enable-vba\
--enable-verbose\
--enable-wiki-publisher\
@@ -149,6 +151,7 @@
--without-nas\
--without-ppds\
--without-system-agg\
+ --without-system-boost\
--with-openldap\
--with-system-stdlibs\
--with-system-libs\
@@ -158,7 +161,6 @@
--with-system-headers\
--with-system-redland\
--with-alloc=system\
- --with-system-mythes\
--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\
@@ -166,6 +168,13 @@
--with-use-shell=bash\
$EXTRAOPTS || return 1
+# --enable-layout\ /bin/bash: tralay: command not found ???
+
+#--with-system-jfreereport
+# --enable-report-builder\
+
+# --with-system-mythes\
+
# we will need myspell dicts for --with-system-dicts --without-myspell-dicts
# Setup environment for build
More information about the arch-commits
mailing list