[arch-commits] Commit in openoffice-base/trunk (ChangeLog PKGBUILD openoffice.install)
andyrtr at archlinux.org
andyrtr at archlinux.org
Mon Jan 26 20:52:23 UTC 2009
Date: Monday, January 26, 2009 @ 15:52:22
Author: andyrtr
Revision: 25336
upgpkg: openoffice-base 3.0.1-1
new version 3.0.1
Modified:
openoffice-base/trunk/ChangeLog
openoffice-base/trunk/PKGBUILD
openoffice-base/trunk/openoffice.install
--------------------+
ChangeLog | 7 +++++++
PKGBUILD | 41 +++++++++++++++++++++++++----------------
openoffice.install | 9 +++++----
3 files changed, 37 insertions(+), 20 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-01-26 19:46:41 UTC (rev 25335)
+++ ChangeLog 2009-01-26 20:52:22 UTC (rev 25336)
@@ -1,3 +1,10 @@
+openoffice-base 3.0.1-1
+- modify install msg
+- build with stlport for i686 and
+ without for x86_64
+- fix high cpu load in file dialog FS #11710
+- change to internal boost
+
openoffice-base 3.0.0-4
- rebuild for heimdal 1.2.1
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-01-26 19:46:41 UTC (rev 25335)
+++ PKGBUILD 2009-01-26 20:52:22 UTC (rev 25336)
@@ -2,16 +2,16 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base
-pkgver=3.0.0
-pkgrel=4
+pkgver=3.0.1
+pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=(i686 x86_64)
-_OO_milestone=OOO300_m9 # =RC4 = final
+_OO_milestone=OOO300_m15 # =RC2 = final
license=('LGPL3')
url="http://www.openoffice.org"
install=openoffice.install
-depends=('curl>=7.19.2' 'hunspell>=1.2.8' 'python>=2.6.1' 'libwpd'
- 'libxaw' 'neon>=0.28.3' 'dbus-glib' 'icu>=4.0' 'hsqldb-java' 'libxslt')
+depends=("curl>=7.19.2" "hunspell>=1.2.8" "python>=2.6.1" 'libwpd' 'redland'
+ 'libxaw' "neon>=0.28.3" 'dbus-glib' "icu>=4.0" 'hsqldb-java' 'libxslt')
optdepends=('java-runtime: adds java support'
'libcups: adds printing support'
'gconf: adds additional gnome support'
@@ -19,7 +19,7 @@
'pstoedit: translates PostScript and PDF graphics into other vector formats')
makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl'
'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.0.3'
- 'boost' 'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.3')
+ 'apache-ant' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.3') #'boost'
source=(${pkgname}-${_OO_milestone}.tar.bz2
template.desktop
default-no-startup-wizard.diff
@@ -30,9 +30,11 @@
shell.patch
system_hsqldb.diff
buildfix-openjdk-6-no-rhino.diff
- openoffice.profile)
+ openoffice.profile
+ http://www.openoffice.org/nonav/issues/showattachment.cgi/58937/workspace.fpicker8.patch
+ http://www.openoffice.org/nonav/issues/showattachment.cgi/56152/run_fpicker_in_main.patch)
options=('!distcc' '!ccache' '!makeflags')
-md5sums=('5ec5aa89277bfa9adf13ef4bf3233efd'
+md5sums=('55e19e38a14b08913586ce4fa489f959'
'ae7e00eff06bc2921d9ff184ff48556e'
'71f136a31e296a04ab68932a31dd533e'
'6c596129fb48316226ce3adfd3a4c86d'
@@ -42,15 +44,17 @@
'a51200f770c635355c430cc5052db8cf'
'4addae44d20bb2b247e429d88b66a4c1'
'4fe2810b40358b0e7dc2df3d056bde7a'
- '8d68d44c941a687813ddd968383cdf27')
+ '8d68d44c941a687813ddd968383cdf27'
+ '4d91aaa94f9e702e184ab1ce99287a73'
+ 'c835885b68a5f3ff18b74c53d9b0bea3')
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
build() {
-# mkdir ${srcdir}/${_OO_milestone}
-# cd ${srcdir}/${_OO_milestone}
-# export _MILESTONE=${_OO_milestone}
-# export 'CVSROOT=:pserver:anoncvs at anoncvs.services.openoffice.org:/cvs'
+ mkdir ${srcdir}/${_OO_milestone}
+ cd ${srcdir}/${_OO_milestone}
+ export _MILESTONE=${_OO_milestone}
+ export 'CVSROOT=:pserver:anoncvs at anoncvs.services.openoffice.org:/cvs'
# checkout snapshot
# cvs -q -z9 co -r $_MILESTONE OpenOffice3
# fetch missing modules
@@ -86,6 +90,9 @@
# important bugfixes
# try to fix non-gtk integration
patch -Np0 -i ${srcdir}/shell.patch || return 1
+ # fix high cpu load in fpicker, FS#11710
+ patch -Np1 -i ${srcdir}/workspace.fpicker8.patch || return 1
+ patch -Np1 -i ${srcdir}/run_fpicker_in_main.patch || return 1
# remove the startup wizard
patch -Np0 -i ${srcdir}/default-no-startup-wizard.diff || return 1
@@ -93,10 +100,11 @@
patch -Np0 -i ${srcdir}/default-system-fpicker.diff || return 1
if [ "$CARCH" = "x86_64" ]; then
- EXTRAOPTS="--with-stlport"
+ EXTRAOPTS="--without-stlport"
# fix to build with SUN jdk/jre and OpenJDK
# http://qa.openoffice.org/issues/show_bug.cgi?id=74749
sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" ${srcdir}/solenv/inc/libs.mk || return 1
+ else EXTRAOPTS="--with-stlport"
fi
cd ${srcdir}/config_office
@@ -129,7 +137,6 @@
--enable-crashdump=no\
--enable-vba\
--with-package-format=native\
- --with-system-boost\
--with-system-db\
--with-system-cairo\
--with-system-curl\
@@ -155,7 +162,7 @@
--without-gpc\
--without-nas\
--with-jdk-home=${JAVA_HOME}\
- --with-system-hsqldb \
+ --with-system-hsqldb\
--with-hsqldb-jar=/usr/share/java/hsqldb.jar\
--with-system-xerces\
--with-xerces-jar=/usr/share/java/xercesImpl.jar\
@@ -167,6 +174,8 @@
--with-use-shell=bash\
$EXTRAOPTS || return 1
+# --with-system-boost\
+
# --disable-qadevooo\ http://www.openoffice.org/issues/show_bug.cgi?id=91452
cd ..
Modified: openoffice.install
===================================================================
--- openoffice.install 2009-01-26 19:46:41 UTC (rev 25335)
+++ openoffice.install 2009-01-26 20:52:22 UTC (rev 25336)
@@ -3,10 +3,11 @@
gtk-update-icon-cache -f -q /usr/share/icons/hicolor
update-desktop-database -q
-echo " see http://wiki.archlinux.org/index.php/Openoffice"
-echo " how to use extensions, e.g. for spell checking"
-echo " see /opt/openoffice/share/extension/install what"
-echo " is shipped with this package"
+echo " * relogin or source /etc/profile.d/openoffice.sh"
+echo " * see http://wiki.archlinux.org/index.php/Openoffice"
+echo " how to use extensions, e.g. for spell checking"
+echo " see /opt/openoffice/share/extension/install what"
+echo " is shipped with this package"
}
post_upgrade() {
More information about the arch-commits
mailing list