Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=bmf.git;a=commitdiff;h=7d921468cd6d81dfd7638ff03d7ea6317cda2db2
commit 7d921468cd6d81dfd7638ff03d7ea6317cda2db2
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Wed Jul 2 20:35:40 2008 +0200
openoffice.org-3.0dev300_m21-1-i686
- update to pre-3.0 snapshot
- use xulrunner instead of firefox
- update Fsplit calls for the recent basis3.0 directory structure
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index 725b3d0..002f361 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -14,14 +14,14 @@ if ! Fuse $USE_DEVEL; then
pkgrel=1
snapshot=r12728
else
- upstream=2.4.1
- branch=-2-4-1
- tree=ooh680
+ upstream=3.0
+ branch=
+ tree=dev300
dir=`echo $tree|tr [a-z] [A-Z]`
- milestone=17
+ milestone=21
pkgver=$upstream${tree}_m$milestone
pkgrel=1
- snapshot=r12728
+ snapshot=r13010
fi
pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
@@ -33,7 +33,7 @@ depends=('libxml2' 'libart_lgpl' 'libsndfile'
'libgcj-awt>=4.1.1-6' 'nas' 'fontc
'unixodbc' 'libxaw' 'libxslt' 'startup-notification' 'libwpd>=0.8.13')
# this is here as gstreamer is only a makedepend
rodepends=('flac' 'dejavu-ttf')
-makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'firefox' 'apache-ant'
'gcc-gcj' 'kdelibs>=3.5.5' \
+makedepends=('curl' 'intltool' 'tcsh' 'pam-headers' 'apache-ant' 'gcc-gcj'
'kdelibs>=3.5.5' \
'evolution-data-server-ldap' 'boost' 'icu' 'hunspell' 'imake' 'gccmakedep'
'xalan-j' \
'patch>=2.5.9' 'openclipart' 'xorg-server' 'gstreamer' 'gst-plugins-base'
'gnome-vfs' \
'libbonobo' 'procps' 'openldap' 'mono' 'gperf' 'xulrunner' \
@@ -48,8 +48,9 @@ fi
source=(http://ftp.frugalware.org/pub/other/sources/ooo-build/ooo-build$branch-$snapshot.tar.bz2
\
http://download.go-oo.org/$dir/$tree-m$milestone-core.tar.bz2 \
http://download.go-oo.org/$dir/$tree-m$milestone-lang.tar.bz2 \
- http://download.go-oo.org/$dir/$tree-m$milestone-system.tar.bz2)
-signatures=($source.asc '' '' '')
+ http://download.go-oo.org/$dir/$tree-m$milestone-system.tar.bz2 \
+ xulrunner.diff)
+signatures=($source.asc '' '' '' '')
NOEXTRACT=1
options=([EMAIL PROTECTED] 'scriptlet')
@@ -122,7 +123,7 @@ build() {
# SMP build
if [ ! -z "$MAKEFLAGS" ]; then
# Comment this out if you think the build failed because of being SMP.
- Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}"
+ #Fconfopts="$Fconfopts --with-num-cpus=${MAKEFLAGS/-j}"
unset MAKEFLAGS
fi
@@ -166,20 +167,22 @@ build() {
Fln /usr/lib/openoffice.org/program/libnpsoplugin.so /usr/lib/mozilla/plugins/
# Remove some dicts, our separate package is more recent
- Frm usr/lib/openoffice.org/share/dict/ooo/*hu_HU*
+ Frm usr/lib/openoffice.org/basis3.0/share/dict/ooo/*hu_HU*
# Split out the i18n stuff
for i in "[EMAIL PROTECTED]"
do
spkg=`echo $i|tr [A-Z] [a-z]`
- for j in usr/lib/$pkgname/share/registry/res/$i/
usr/lib/$pkgname/share/template/$i/ \
- usr/lib/$pkgname/help/$i/
usr/lib/$pkgname/program/resource/*680$i.res \
- usr/lib/openoffice.org/licenses/LICENSE_$i*
usr/lib/openoffice.org/presets/config/*_$i.* \
- usr/lib/openoffice.org/readmes/README_$i*
usr/lib/openoffice.org/share/autocorr/acor_$i*.dat \
- usr/lib/openoffice.org/share/autotext/$i/
usr/lib/openoffice.org/share/readme/LICENSE_$i* \
- usr/lib/openoffice.org/share/readme/README_$i*
sr/lib/openoffice.org/share/samples/$i/ \
-
usr/lib/openoffice.org/share/registry/modules/org/openoffice/Setup/Langpack-$i.xcu
\
- usr/lib/openoffice.org/share/template/wizard/letter/$i/
usr/lib/openoffice.org/share/wordbook/$i/
+ for j in usr/lib/$pkgname/basis3.0/share/registry/res/$i/
usr/lib/$pkgname/basis3.0/share/template/$i/ \
+ usr/lib/$pkgname/basis3.0/help/$i/
usr/lib/$pkgname/basis3.0/program/resource/*680$i.res \
+ usr/lib/openoffice.org/basis3.0/presets/config/*_$i.* \
+
usr/lib/openoffice.org/basis3.0/share/autocorr/acor_$i*.dat \
+ usr/lib/openoffice.org/basis3.0/share/autotext/$i/
usr/lib/openoffice.org/share/readme/LICENSE_$i* \
+ usr/lib/openoffice.org/basis3.0/share/samples/$i/ \
+
usr/lib/openoffice.org/basis3.0/share/registry/modules/org/openoffice/Setup/Langpack-$i.xcu
\
+
usr/lib/openoffice.org/basis3.0/share/template/wizard/letter/$i/ \
+ usr/lib/openoffice.org/basis3.0/share/wordbook/$i/ \
+
usr/lib/openoffice.org/basis3.0/share/config/soffice.cfg/modules/*/accelerator/$i/
do
if ls $Fdestdir/$j &>/dev/null; then
Fsplit openoffice.org-i18n-$spkg $j
@@ -191,14 +194,14 @@ build() {
for kde in fps_kde.uno.so kdebe*.uno.so kdefilepicker kde-open-url
libvclplug_kde*.so \
libkabdrv*.so
do
- Fsplit $pkgname-kde usr/lib/openoffice.org/program/$kde
+ Fsplit $pkgname-kde usr/lib/openoffice.org/basis3.0/program/$kde
done
## Split GNOME stuff
- for gnome in gnome-open-ur* fps_gnome.uno.so gnome-set-default-* \
+ for gnome in gnome-open-ur* fps_gnome.uno.so \
libvclplug_gtk*.so libeggtray* libqstart_gtk* ucpgvfs1.uno.so \
gconfbe* libevoab*.so
do
- Fsplit $pkgname-gnome usr/lib/openoffice.org/program/$gnome
+ Fsplit $pkgname-gnome
usr/lib/openoffice.org/basis3.0/program/$gnome
done
Fbuild_gnome_scriptlet
diff --git a/source/xapps/openoffice.org/xulrunner.diff
b/source/xapps/openoffice.org/xulrunner.diff
new file mode 100644
index 0000000..8e42356
--- /dev/null
+++ b/source/xapps/openoffice.org/xulrunner.diff
@@ -0,0 +1,10 @@
+diff --git a/distro-configs/Frugalware.conf.in
b/distro-configs/Frugalware.conf.in
+index 34e9246..eeb0436 100644
+--- a/distro-configs/Frugalware.conf.in
++++ b/distro-configs/Frugalware.conf.in
+@@ -31,4 +31,4 @@
+ --with-system-libxslt
+ --with-system-libwpd
+ --without-fonts
+---with-system-mozilla=firefox
++--with-system-mozilla=xulrunner
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
