[arch-commits] CVS update of extra/office/openoffice-base (FontOOo_1.7.1.sxw PKGBUILD)
andyrtr at archlinux.org
andyrtr at archlinux.org
Tue Sep 11 16:54:22 UTC 2007
Date: Tuesday, September 11, 2007 @ 12:54:22
Author: andyrtr
Path: /home/cvs-extra/extra/office/openoffice-base
Added: FontOOo_1.7.1.sxw (1.1)
Modified: PKGBUILD (1.50 -> 1.51)
updatepkg 2.3.0-m5/RC3 build, wizards are fixed now
-------------------+
FontOOo_1.7.1.sxw | <<Binary file>>
PKGBUILD | 46 +++++++++++++++-------------------------------
2 files changed, 16 insertions(+), 31 deletions(-)
Index: extra/office/openoffice-base/FontOOo_1.7.1.sxw
<<Binary file>>
Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.50 extra/office/openoffice-base/PKGBUILD:1.51
--- extra/office/openoffice-base/PKGBUILD:1.50 Mon Sep 3 14:30:57 2007
+++ extra/office/openoffice-base/PKGBUILD Tue Sep 11 12:54:22 2007
@@ -3,10 +3,10 @@
pkgname=openoffice-base
pkgver=2.3.0
-pkgrel=0.16
+pkgrel=0.22
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=(i686 x86_64)
-_OO_milestone=oog680-m3
+_OO_milestone=oog680-m5
license=('LGPL')
url="http://www.openoffice.org"
install=openoffice.install
@@ -41,7 +41,8 @@
#$MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter}.tar.bz2
#$MIRROR/devel/build/Sources/OOo_${pkgver}_src_{core,binfilter}.tar.bz2
#$MIRROR/SRC680_m223/OOo-Dev_SRC680_m224_src_{core,binfilter}.tar.bz2
- $MIRROR/${_OO_milestone}-{core,binfilter}.tar.bz2
+ #$MIRROR/${_OO_milestone}-{core,binfilter,sdk_oo,system,lang}.tar.bz2
+ $MIRROR/${_OO_milestone}-{core,binfilter,system}.tar.bz2
intro.bmp
template.desktop
default-no-startup-wizard_oog680_m1.diff
@@ -59,9 +60,13 @@
gui-insensitive_oog680_m2.diff
neon27-oog680_m3.diff
buildfix-agg_2_5_oog680_m3.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)
-md5sums=('7653db8b5e2f73f299b4cc2f38527243'
- 'bad5f30c661a7118768675b2d58bed57'
+options=('!distcc' 'ccache' '!strip')
+md5sums=('eb0bce2625e182db1470b7cebfbcdc17'
+ '8ebfe5ead84524f38c23911805142c4d'
+ '35cc875dd83712ee1eb43b0b974220ff'
'18e281491eadda03ed661b0261be0c22'
'd9475c3aaf879c294bd9bc692071bd41'
'0faab33566196ddc9c405d68cf614663'
@@ -79,9 +84,8 @@
'4c76c07e867d51c416ea258220a90a6a'
'5fe090550df3ce4a3a6f203ab50d07b5'
'4f0da68601120267be643c9cdaca2772'
+ '1fc1ca5205730655eab2d2e119aa06fe'
'83bb5e235c4e4062eed404829d760c14')
-options=('!distcc' 'ccache' '!strip')
-
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
build() {
@@ -114,8 +118,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 for database connection failure(requires and extra sed hack to work).
-# patch -Np0 -i ../fix-dba-connectivity-i80338_oog680_m1.diff || return 1
# fix font hinting
patch -Np0 -i ../fix-font-hinting_oog680_m2.diff || return 1
@@ -126,8 +128,6 @@
# remove the startup wizard
patch -Np0 -i ../default-no-startup-wizard_oog680_m1.diff || return 1
- # remove broken wizards (install dictionaries/fonts
-# patch -Np0 -i ../remove-broken-wizards_oog680_m1.diff || return 1
# enables the default system-file-picker in case we have that built
patch -Np0 -i ../default-system-fpicker_oog680_m1.diff || return 1
@@ -141,12 +141,11 @@
if [ "$CARCH" = "x86_64" ]; then
EXTRAOPTS="--with-arch=x86_64"
-
# 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
+ # sed -i "s:lib64\/libjpeg.so:lib\/libjpeg.so:g" $startdir/src/${_OO_milestone}/solenv/inc/libs.mk
# http://qa.openoffice.org/issues/show_bug.cgi?id=74751
-# patch -Np0 -i ../awt_x86_64.diff || return 1
+ # patch -Np0 -i ../awt_x86_64.diff || return 1
fi
cd $startdir/src/${_OO_milestone}/config_office
@@ -163,7 +162,6 @@
--with-binfilter\
--disable-ldap\
--with-lang="en-US"\
- --disable-fontooo\
--disable-gnome-vfs\
--disable-mono\
--disable-odk\
@@ -223,16 +221,6 @@
--with-gcc-speedup=ccache \
$EXTRAOPTS || return 1
-# --without-stlport4\ # broken
-# --enable-debug\
-# --enable-dbgutil\ # breaks build
-# --enable-symbols\
-
- #--enable-gcjaot\
-# --without-ppds\ # some user want it back
-
-# --with-system-boost\ # break jfreereport
-
cd ..
# Setup environment for build
@@ -314,15 +302,11 @@
rmdir $startdir/pkg/opt/openoffice/presets/psprint/{driver,fontmetric}
rmdir $startdir/pkg/opt/openoffice/presets/uno_packages/cache
rmdir $startdir/pkg/opt/openoffice/presets/{autocorr,store,Scripts,wordbook,backup,temp,psprint,uno_packages}
-# rmdir $startdir/pkg/opt/openoffice/share/samples/en-US - needed for starting the templates.desktop
-# rmdir -rf $startdir/pkg/opt/openoffice/share/uno_packages/cache
rm -rf $startdir/pkg/opt/openoffice/share/uno_packages
-# rmdir $startdir/pkg/opt/openoffice/share/{samples,uno_packages}
# remove unecessary temp files if they exist
rm -f $startdir/pkg/opt/openoffice/program/root*.dat
rm -f $startdir/pkg/opt/openoffice/program/root*.dat.*
- ## CRITICAL ## Fix before 2.3.0
- # Workaround for system hsqldb.jar until a new hsqldb version is released
-# sed -i -e 's|jar file|jar;file|g' $startdir/pkg/opt/openoffice/program/jvmfwk3rc
+ # fix font wizard not installed by default (from http://qa.openoffice.org/issues/show_bug.cgi?id=81102)
+ install -D -m644 $startdir/src/FontOOo_1.7.1.sxw $startdir/pkg/opt/openoffice/share/dict/ooo/FontOOo.sxw
}
More information about the arch-commits
mailing list