Date: Monday, December 28, 2009 @ 09:47:05
Author: andyrtr
Revision: 61941
prepare 3.2.0 build
Modified:
go-openoffice/trunk/ChangeLog
go-openoffice/trunk/PKGBUILD
-----------+
ChangeLog | 7 +++++
PKGBUILD | 79 ++++++++++++++++++++++--------------------------------------
2 files changed, 37 insertions(+), 49 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-12-28 11:58:57 UTC (rev 61940)
+++ ChangeLog 2009-12-28 14:47:05 UTC (rev 61941)
@@ -1,3 +1,10 @@
+2009-12-28 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.2.0.1-1 :
+ new upstream release = 3.2.0rc1
+ change how source is now downloaded via git/rsync
+ build with more system libs
+
2009-11-28 Andreas Radke <andyrtr at archlinux.org>
* 3.1.1.5-1 :
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-12-28 11:58:57 UTC (rev 61940)
+++ PKGBUILD 2009-12-28 14:47:05 UTC (rev 61941)
@@ -2,19 +2,20 @@
# Maintainer: AndyRTR <andy...@archlinux.org>
pkgname=go-openoffice
-_GOver=3.1.1.5 # = OOo 3.1.1 final + fixes
+_GOver=3.2.0.1 # = OOo 3.2 RC1
pkgver=${_GOver}
pkgrel=1
pkgdesc="OpenOffice.org - go-oo.org enhanced version of SUN's office suite"
arch=('i686' 'x86_64')
-_go_tree="OOO310"
-_ootag=ooo310-m19 # m19 = OOo 3.1.1 RC2 = final
+_go_tree="OOO320"
+_ootag=ooo320-m8 # m8 = OOo 3.2.0 RC1
license=('LGPL3')
url="http://go-oo.org/";
install=${pkgname}.install
depends=("curl>=7.19.6" "hunspell>=1.2.8" "python>=2.6.2-6" 'libwpd'
'redland>=1.0.9-4'
'libxaw' "neon>=0.28.6" "icu>=4.2.1" 'hsqldb-java' 'libxslt'
'libxtst' 'lpsolve'
- 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils')
+ 'beanshell' 'saxon' 'vigra' 'hyphen' 'libmspack' 'libldap'
+ 'hicolor-icon-theme' 'shared-mime-info' 'desktop-file-utils') #
'lucene' 'libmythes' 'libgraphite'
optdepends=('java-runtime: adds java support'
'libcups: adds printing support'
'gconf: adds additional gnome support'
@@ -28,17 +29,17 @@
makedepends=('automake' 'autoconf' 'wget' 'bison' 'findutils' 'flex' 'gawk'
'gcc-libs' 'libart-lgpl'
'pam' 'sane' 'perl-archive-zip' 'pkgconfig' 'unzip'
"xulrunner>=1.9.1.3" 'apache-ant' 'cairo'
'gperf' 'libcups' 'pstoedit' 'gconf' "openjdk6>=1.5.2" 'unixodbc'
'mesa>=7.5' 'poppler>=0.10.7'
- 'gstreamer0.10-base>=0.10.24' 'mono>=2.4.2.3' 'kdelibs>=4.3.1'
'libjpeg') # 'boost'
+ 'gstreamer0.10-base>=0.10.24' 'mono>=2.4.2.3' 'kdelibs>=4.3.1'
'libjpeg' 'boost' 'git' 'rsync')
backup=(usr/lib/go-openoffice/program/sofficerc)
provides=('openoffice-base')
conflicts=('openoffice-base')
_mirror="http://download.go-oo.org/";
source=(${_mirror}/${_go_tree}/ooo-build-${_GOver}.tar.gz
ArchLinux.patch
- http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.1.1.tar.bz2
+ ${_ootag}.tar.gz
+ http://download.go-oo.org//DEV300/ooo-cli-prebuilt-3.2.tar.bz2
http://cairographics.org/releases//cairo-1.4.10.tar.gz
http://download.go-oo.org//SRC680/mdbtools-0.6pre1.tar.gz
-
${_mirror}/${_go_tree}/${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
http://download.go-oo.org//SRC680/extras-3.tar.bz2
http://download.go-oo.org//SRC680/biblio.tar.bz2
http://tools.openoffice.org/unowinreg_prebuild/680//unowinreg.dll
@@ -47,51 +48,16 @@
http://download.go-oo.org//SRC680/libwps-0.1.2.tar.gz
http://download.go-oo.org//SRC680/libwpg-0.1.3.tar.gz
http://download.go-oo.org//DEV300/ooo_oxygen_images-2009-06-17.tar.gz
- buildfix_64bit_system_libjpeg.diff
- openoffice.org-3.0.1.oooXXXXX.extensions.npapi.diff)
+ buildfix_64bit_system_libjpeg.diff)
#options=('!distcc' '!ccache' '!makeflags')
-noextract=(ooo-cli-prebuilt-3.1.1.tar.bz2 cairo-1.4.10.tar.gz
mdbtools-0.6pre1.tar.gz
-
${_ootag}-{artwork,base,bootstrap,calc,components,extras,filters,help,impress,libs-gui,libs-core,libs-extern,postprocess,sdk,testing,ure,writer,libs-extern-sys,extensions}.tar.bz2
- extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll
scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz libwps-0.1.2.tar.gz
libwpg-0.1.3.tar.gz ooo_oxygen_images-2009-06-17.tar.gz)
-md5sums=('c1303e19302c087ce6dab43be42695df'
- 'a1ff3d64d0ca95c62a15c07e7f19f193'
- '222a42af5b874ea15dbafd07b2381aee'
- '5598a5e500ad922e37b159dee72fc993'
- '246e8f38b2a1af1bcff60ee0da59300b'
- '092ce8212b591f8090a408631f0f3b5d'
- '1cc6e2e31fbcc9b2e936e700235f5b1c'
- 'c2552c5b91054317806502fa5bd28087'
- 'da748a39c9d83a09badd8bd9604d4489'
- 'e5e3825fac16609c810fab3fbe2eb9d5'
- '257ac5758245c2ee1590273489b19048'
- '5b78c271a6f8a8b95c15fb4689646e5b'
- '2e0c32bbd34959999cf8aaa6b628cf44'
- '8695921e8d5153de7bb2002caea9e0a4'
- '99fa052555499b06c78d9dd95cd84ce2'
- 'a346c28a07c633cdb5e23fc38ba994c1'
- 'ef63e0ad73e1819e65ccfdb242408cde'
- '83ac184404a5e940f11b15e191f0414a'
- 'e4cd8de5ac4eed15792b9e4f45c4a789'
- 'dbb7b4c748664cc1c369f2c88b4072c9'
- 'f01114677484b4e008a4c0dde44282ab'
- '5aa48153b1de6988bc5ca21f5800e8c4'
- 'df12331498c6ee810e8f768670bdf2a7'
- 'c0d5a2510c0a177d922f2027fbe983a2'
- '36f323a55ee83e9dc968e1b92569b62a'
- '1948e39a68f12bfa0b7eb309c14d940c'
- 'e3a0b76dcd876f3d721ee7183729153d'
- '04181e5ef82973eb349d3122a19d2274'
- '64d66018897d759358f454010b6e75d2'
- '799fc3b835a79adce8c88a3fee0150c1'
- 'db556b750bf3eac8481a4cc5e29e5af1'
- '0b3ffc43231c525db1798495a6676902'
- 'b005c4cf9f8e586539ca98c9cfe9bb77'
- '6573ab0f3893806b366b06d575c4f547')
+noextract=(ooo-cli-prebuilt-3.2.tar.bz2 cairo-1.4.10.tar.gz
mdbtools-0.6pre1.tar.gz extras-3.tar.bz2 biblio.tar.bz2 unowinreg.dll
+ scsolver.2008-10-30.tar.bz2 libwpd-0.8.14.tar.gz
libwps-0.1.2.tar.gz libwpg-0.1.3.tar.gz ooo_oxygen_images-2009-06-17.tar.gz)
build() {
unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH
[ -z "${JAVA_HOME}" ] && . /etc/profile.d/openjdk6.sh
[ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
+ [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
cd ${srcdir}/ooo-build-${_GOver}
@@ -101,7 +67,6 @@
# hotfixes not yet upstream
# cp ${srcdir}/*.diff ${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
cp ${srcdir}/buildfix_64bit_system_libjpeg.diff
${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
- cp ${srcdir}/openoffice.org-3.0.1.oooXXXXX.extensions.npapi.diff
${srcdir}/ooo-build-${_GOver}/patches/hotfixes/
# export C(XX)FLAGS
# http://www.openoffice.org/issues/show_bug.cgi?id=103205
@@ -123,7 +88,7 @@
--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
--with-docdir=/usr/share/doc/packages/"${pkgname}" \
--mandir=/usr/share/man \
- --with-lang="en-US" \
+ --with-lang="" \
--with-dict=ALL\
--with-binsuffix=no \
--disable-ldap \
@@ -131,6 +96,7 @@
--disable-kde\
--enable-kde4\
--enable-lockdown\
+ --with-system-boost\
--with-system-cairo\
--enable-crashdump\
--without-gpc\
@@ -141,14 +107,29 @@
--enable-wiki-publisher \
--enable-ogltrans \
--with-ant-home="/usr/share/java/apache-ant"\
+ --with-system-saxon\
+ --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
+ --with-system-beanshell\
+ --with-system-vigra\
+ --with-system-altlinuxhyph\
+ --with-system-lpsolve\
$EXTRAOPTS || return 1
+# --with-system-lucene\
+# --with-lucene-core-jar=/usr/share/java/lucene-core.jar\
+#
--with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
+# --with-system-mythes\
+# --with-system-graphite\
+
# --with-tag=${_ootag}
# --enable-report-builder \
# --with-additional-sections="OOXMLExport"
unset MAKEFLAGS
./download
+ # compress the sources after first run
+# tar -cvzf ${SRCDEST}/${_ootag}.tar.gz ../clone && return 1
+
make || return 1
make DESTDIR=${pkgdir} install || return 1
@@ -160,7 +141,7 @@
popd
# install all other built extensions
- pushd
${srcdir}/ooo-build-${_GOver}/build/${_ootag}/solver/310/unxlng?6.pro/bin/
+ pushd
${srcdir}/ooo-build-${_GOver}/build/${_ootag}/solver/320/unxlng?6.pro/bin/
install -m644 pdfimport/pdfimport.oxt
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/pdfimport.oxt || return 1
install -m644 swext/wiki-publisher.oxt
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/wiki-publisher.oxt ||
return 1
install -m644 minimizer/sun-presentation-minimizer.oxt
${pkgdir}/usr/lib/"${pkgname}"/share/extension/install/sun-presentation-minimizer.oxt
|| return 1
