[arch-commits] CVS update of unstable/office/openoffice-base-devel (ChangeLog PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Nov 8 12:01:21 UTC 2007
Date: Thursday, November 8, 2007 @ 07:01:21
Author: andyrtr
Path: /home/cvs-unstable/unstable/office/openoffice-base-devel
Modified: ChangeLog (1.2 -> 1.3) PKGBUILD (1.5 -> 1.6)
updatepkg src236
-----------+
ChangeLog | 6 ++++--
PKGBUILD | 45 ++++++++++-----------------------------------
2 files changed, 14 insertions(+), 37 deletions(-)
Index: unstable/office/openoffice-base-devel/ChangeLog
diff -u unstable/office/openoffice-base-devel/ChangeLog:1.2 unstable/office/openoffice-base-devel/ChangeLog:1.3
--- unstable/office/openoffice-base-devel/ChangeLog:1.2 Fri Nov 2 04:14:19 2007
+++ unstable/office/openoffice-base-devel/ChangeLog Thu Nov 8 07:01:19 2007
@@ -1,6 +1,8 @@
+openoffice-base-devel - 2.4_src680_m236-1
+- removed 2 patches that went upstream
+- fixed smp build issues
+
openoffice-base-devel - 2.4_src680_m235-1
-- try --without-stlport4 again on i686
-- build failure in testtools due to smp on i686 -> -P1
- switched to build with internal icu due to
http://www.openoffice.org/issues/show_bug.cgi?id=83146
- added pstoedit depenency to fix #8390
Index: unstable/office/openoffice-base-devel/PKGBUILD
diff -u unstable/office/openoffice-base-devel/PKGBUILD:1.5 unstable/office/openoffice-base-devel/PKGBUILD:1.6
--- unstable/office/openoffice-base-devel/PKGBUILD:1.5 Fri Nov 2 04:14:19 2007
+++ unstable/office/openoffice-base-devel/PKGBUILD Thu Nov 8 07:01:21 2007
@@ -2,12 +2,12 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base-devel
-pkgver=2.4_src680_m235
+pkgver=2.4_src680_m236
pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=(i686 x86_64)
-_OO_milestone=src680-m235
-#_OO_milestone=SRC680_m235
+_OO_milestone=src680-m236
+#_OO_milestone=SRC680_m236
license=('LGPL')
url="http://www.openoffice.org"
install=openoffice.install
@@ -26,28 +26,6 @@
# 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.8.1.3'
# 'jdk' 'apache-ant' 'cairo')
provides=('openoffice-base')
-md5sums=('20cd5520c2dc7eaee3a3e39c2d3c2b43'
- '2484ed5f462d12b309e23739611959fe'
- '8984eb3ed21e3bbd0f7fc1d17022751d'
- '72dba5b4cd94d4439e06f75769402c6f'
- 'd9475c3aaf879c294bd9bc692071bd41'
- '0faab33566196ddc9c405d68cf614663'
- '39e4c1b1e864b22ee4650b2bff44c695'
- 'd00bba7046fe64b20f9d1884203a34bf'
- 'a411c3dd9751a7b9cc6a327992d44026'
- '753a6f760eed98764ac6432878c4935d'
- 'e68ae258f3adb37022d649a99ce00e01'
- '509697a7da6508ac9377b7750a57bfc4'
- '4c76c07e867d51c416ea258220a90a6a'
- '135f1b3c837435de504c84e4db9dc4f7'
- '7fadadecaf511bb118bc1b657192520a'
- 'a8b96e9d0ce92a8f6690f277b1cfacc9'
- '4271702d6e9e912b663d3e2d9b8a17e8'
- '1cc4e58f28093f179378dc3bd69986af'
- 'cd8ff2b60ee86f576a1e04bac8dcb51b'
- '1f61ea85e5870b4c6e9e39f86744ec38'
- '1fc1ca5205730655eab2d2e119aa06fe'
- '83bb5e235c4e4062eed404829d760c14')
#MIRROR="ftp://ftp.gwdg.de/pub/openoffice/" # has all late but is fast
#MIRROR=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/
@@ -78,15 +56,14 @@
libxmlsec-system-nss_oog_m5.diff
libxmlsec-findcerts_oog_m5.diff
soffice-detect-mozilla-certificates_oog_m5.diff
- ooo82608.vcl.gtkbadfree_oog_m5.diff
detect_db46_src233.diff
#http://oooconv.free.fr/fontooo/FontOOo.sxw
FontOOo_1.7.1.sxw # from http://www.openoffice.org/issues/show_bug.cgi?id=81102
awt_x86_64.diff)
options=('!distcc' '!ccache' '!strip')
-md5sums=('20cd5520c2dc7eaee3a3e39c2d3c2b43'
- '2484ed5f462d12b309e23739611959fe'
- '8984eb3ed21e3bbd0f7fc1d17022751d'
+md5sums=('6e5aee9ec3851e01d6da3c524bd8a446'
+ '7a837167aed4fd0f7c1b21a33cfb956a'
+ '329745ae327d6ed07bdfab3fd90051e9'
'72dba5b4cd94d4439e06f75769402c6f'
'd9475c3aaf879c294bd9bc692071bd41'
'0faab33566196ddc9c405d68cf614663'
@@ -101,12 +78,10 @@
'7fadadecaf511bb118bc1b657192520a'
'a8b96e9d0ce92a8f6690f277b1cfacc9'
'4271702d6e9e912b663d3e2d9b8a17e8'
- '1cc4e58f28093f179378dc3bd69986af'
'cd8ff2b60ee86f576a1e04bac8dcb51b'
'1fc1ca5205730655eab2d2e119aa06fe'
'83bb5e235c4e4062eed404829d760c14')
-
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
build() {
@@ -140,8 +115,6 @@
# important bugfixes
# fix for invisible text with gcc 4.2 http://www.openoffice.org/issues/show_bug.cgi?id=78417
patch -Np0 -i ../fix-invisible-text.diff || return 1
- # fix a crash related to new gtk - fixes http://bugs.archlinux.org/task/8209
- patch -Np0 -i ../ooo82608.vcl.gtkbadfree_oog_m5.diff || return 1
# fix font hinting
patch -Np0 -i ../fix-font-hinting_src231.diff || return 1
@@ -158,11 +131,13 @@
# arch related fixes & configure options
if [ "$CARCH" = "i686" ]; then
- EXTRAOPTS="--with-arch=x86 --without-stlport4"
+ EXTRAOPTS="--with-arch=x86 "
+ SMP=1
fi
if [ "$CARCH" = "x86_64" ]; then
EXTRAOPTS="--with-arch=x86_64"
+ SMP=5
# fixes to build with SUN jdk/jre
# http://qa.openoffice.org/issues/show_bug.cgi?id=74749
# sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" $startdir/src/${_OO_milestone}/solenv/inc/libs.mk
@@ -255,7 +230,7 @@
# to compile with SMP add -P2 or above, remove any -Px if your cou has only one core or if you want to fix it for non smp build
cd instsetoo_native
- build.pl -P1 --all || return 1
+ build.pl -P${SMP} --all || return 1
cd ..
# install binaries
More information about the arch-commits
mailing list