Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=3599b90f46b2bc6621d6c68834d0e0de16266663
commit 3599b90f46b2bc6621d6c68834d0e0de16266663
Author: Miklos Vajna <[EMAIL PROTECTED]>
Date: Tue Oct 14 14:18:21 2008 +0200
openoffice.org-3.0-1-i686
- version bump
- various changes all over the buildscript, see the patch itself for
details
diff --git a/source/xapps/openoffice.org/FrugalBuild
b/source/xapps/openoffice.org/FrugalBuild
index 097b413..824cbc3 100644
--- a/source/xapps/openoffice.org/FrugalBuild
+++ b/source/xapps/openoffice.org/FrugalBuild
@@ -5,35 +5,35 @@
pkgname=openoffice.org
USE_DEVEL=${USE_DEVEL:-"n"}
if ! Fuse $USE_DEVEL; then
- upstream=2.4.1
- branch=-2-4-1
- tree=ooh680
+ upstream=3.0
+ branch=-3-0
+ tree=ooo300
dir=`echo $tree|tr [a-z] [A-Z]`
- milestone=17
+ milestone=9
pkgver=$upstream
pkgrel=1
- snapshot=r12728
+ snapshot=r14295
else
- upstream=2.4.1
- branch=-2-4-1
- tree=ooh680
+ upstream=3.0
+ branch=-3-0
+ tree=ooo300
dir=`echo $tree|tr [a-z] [A-Z]`
- milestone=17
+ milestone=9
pkgver=$upstream${tree}_m$milestone
- pkgrel=1
- snapshot=r12728
+ pkgrel=3
+ snapshot=r14231
fi
pkgdesc="OpenOffice.org, a full office productivity suite."
url="http://www.openoffice.org/";
_F_gnome_desktop="y"
Finclude gnome-scriptlet mono java
-unset install
+install=openoffice.org.install
depends=('libxml2' 'libart_lgpl' 'libsndfile' 'libgcj-awt>=4.1.1-6' 'nas'
'fontconfig' 'libpng' 'imagemagick' \
'flex' 'neon>=0.26.1' 'bison' 'zip' 'unzip' 'expat' 'cups' 'desktop-file-utils'
'perl-archive-zip' \
- 'unixodbc' 'libxaw' 'libxslt' 'startup-notification' 'libwpd>=0.8.13')
+ 'unixodbc' 'libxaw' 'libxslt' 'startup-notification' 'libwpd>=0.8.13'
'poppler')
# 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=([EMAIL PROTECTED] 'curl' 'intltool' 'tcsh' 'pam-headers'
'apache-ant' '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' \
@@ -43,29 +43,33 @@ archs=('i686' 'x86_64')
if ! Fuse $USE_DEVEL; then
up2date="lynx -dump $url |grep version:|sed 's/.*: //'"
else
- up2date="lynx -dump
http://svn.gnome.org/viewcvs/ooo-build/trunk/configure.in?view=markup |grep
^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'"
+ if [ -z "$branch" ]; then
+ path="trunk"
+ else
+ path="branches/ooo-build$branch"
+ fi
+ up2date="lynx -dump
http://svn.gnome.org/viewcvs/ooo-build/$path/configure.in?view=markup |grep
^DEFAULT_TAG|sed 's/DEFAULT_TAG=\(.*\)-\(.*\)/$upstream\1_\2/'"
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-{ure,sdk,base,calc,l10n,writer,impress,artwork,filters,testing,bootstrap,libs_gui,libs_core,libs_extern,components,postprocess,libs_extern_sys,extensions}.tar.bz2)
+signatures=($source.asc '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '' '')
NOEXTRACT=1
options=([EMAIL PROTECTED] 'scriptlet')
-subpkgs=("$pkgname-kde" "$pkgname-gnome")
-subdescs=("$pkgname kde integration" "$pkgname gnome integration")
+subpkgs=("$pkgname-kde" "$pkgname-gnome" "$pkgname-sdk")
+subdescs=("$pkgname kde integration" "$pkgname gnome integration" "The
OpenOffice.org Software Development Kit")
subdepends=("$pkgname=$pkgver kdelibs>=3.5.5" \
- "$pkgname=$pkgver gnome-vfs libbonobo evolution-data-server-ldap")
-subarchs=('i686 x86_64' 'i686 x86_64')
-subgroups=('kde-extra' 'gnome-extra')
-subinstall=("" "$_F_gnome_scriptlet")
+ "$pkgname=$pkgver gnome-vfs libbonobo evolution-data-server-ldap" \
+ "$pkgname=$pkgver java-gcj-compat ecj")
+subarchs=('i686 x86_64' 'i686 x86_64' 'i686 x86_64')
+subgroups=('kde-extra' 'gnome-extra' 'devel-extra')
+subinstall=("" "$_F_gnome_scriptlet" "")
ooosubpkgs=('de' 'es' 'fr' 'hu')
ooosubdescs=('German' 'Spanish' 'French' 'Hungarian')
if ! Fuse $USE_DEVEL; then
- ooosubpkgs=([EMAIL PROTECTED] 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD'
'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi'
'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv'
'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw'
'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn'
'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN'
'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz' 'ka' 'kn' 'sh' 'sr' 'uz')
- ooosubdescs=([EMAIL PROTECTED] 'Afrikaans' 'Arabic' 'Belarusian'
'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton'
'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English
(South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician'
'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)'
'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian
Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South'
'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)'
'Russian' 'Kinyarwanda' 'Serbian Latin' 'Slovak' 'Slovenian' 'Serbian Cyrillic'
'Swati' 'Sotho' 'Swedish' 'Swahili' 'Swahili ' 'South Georgian' 'Tamil' 'Thai'
'Tswana' 'Turkish' 'Tsonga' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)'
'Chinese (traditional)' 'Zulu' 'Persian' 'Kurdish' 'Assamese' 'Malayalam'
'Marathi' 'Oriya' 'Telugu' 'Tajik' 'Tigrinya' 'Ukrainian' 'Urdu' 'Dzongkha'
'Georgian' 'Kan
nada' 'Serbo-Croatian' 'Serbian' 'Uzbek')
+ ooosubpkgs=([EMAIL PROTECTED] 'af' 'ar' 'be-BY' 'bg' 'bn' 'bn-BD'
'bn-IN' 'br' 'bs' 'ca' 'cy' 'cs' 'da' 'el' 'en-GB' 'en-ZA' 'eo' 'et' 'eu' 'fi'
'ga' 'gl' 'gu-IN' 'he' 'hi-IN' 'hr' 'it' 'ja' 'km' 'kn-IN' 'ko' 'lo' 'lt' 'lv'
'mk' 'ms' 'nb' 'ne' 'nl' 'nn' 'nr' 'ns' 'pa-IN' 'pl' 'pt' 'pt-BR' 'ru' 'rw'
'sh-YU' 'sk' 'sl' 'sr-CS' 'ss' 'st' 'sv' 'sw' 'sw-TZ' 'sx' 'ta-IN' 'th' 'tn'
'tr' 'ts' 've' 'vi' 'xh' 'zh-CN' 'zh-TW' 'zu' 'fa' 'ku' 'as-IN' 'ml-IN' 'mr-IN'
'or-IN' 'te-IN' 'tg' 'ti-ER' 'uk' 'ur-IN' 'dz' 'ka' 'kn' 'sh' 'sr' 'uz' 'by'
'gd' 'gu' 'mn' 'my' 'oc')
+ ooosubdescs=([EMAIL PROTECTED] 'Afrikaans' 'Arabic' 'Belarusian'
'Bulgarian' 'Bengali' 'Bengali (Bangladesh)' 'Bengali (India)' 'Breton'
'Bosnian' 'Catalan' 'Welsh' 'Czech' 'Danish' 'Greek' 'English (GB)' 'English
(South Africa)' 'Esperanto' 'Estonian' 'Basque' 'Finnish' 'Irish' 'Galician'
'Gujarati' 'Hebrew' 'Hindi' 'Croatian' 'Italian' 'Japanese' 'Khmer (Cambodia)'
'Kannada' 'Korean' 'Lao' 'Lithuanian' 'Latvian' 'Macedonian' 'Malay' 'Norwegian
Bokmal' 'Nepali' 'Dutch' 'Norwegian Nynorsk' 'Ndebele, South'
'NorthernSotho/Sepedi' 'Punjabi' 'Polish' 'Portuguese' 'Brazil (Port.)'
'Russian' 'Kinyarwanda' 'Serbian Latin' 'Slovak' 'Slovenian' 'Serbian Cyrillic'
'Swati' 'Sotho' 'Swedish' 'Swahili' 'Swahili ' 'South Georgian' 'Tamil' 'Thai'
'Tswana' 'Turkish' 'Tsonga' 'Venda' 'Vietnamese' 'Xhosa' 'Chinese (simplified)'
'Chinese (traditional)' 'Zulu' 'Persian' 'Kurdish' 'Assamese' 'Malayalam'
'Marathi' 'Oriya' 'Telugu' 'Tajik' 'Tigrinya' 'Ukrainian' 'Urdu' 'Dzongkha'
'Georgian' 'Kan
nada' 'Serbo-Croatian' 'Serbian' 'Uzbek' 'Belarussian' 'Scottish Gaelic'
'Gujarati' 'Mongolian' 'Malay' 'Occitan')
fi
if [ [EMAIL PROTECTED] -ne [EMAIL PROTECTED] ]; then
@@ -116,13 +120,13 @@ build() {
done
# Remove our patches so that incremental build will be possible.
- #rm -f patches/src680/no-oc.diff
+ #rm -f patches/src680/ecj-is-gcj.diff
Fpatchall
# 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
@@ -133,11 +137,9 @@ build() {
--with-gcc-speedup=ccache \
--with-openclipart=/usr/share/openclipart \
--enable-gtk \
- --enable-hunspell \
--with-binsuffix=no \
--disable-dependency-tracking \
- --with-installed-ooo-dirname=openoffice.org \
- --with-mono-gac-root=/usr/lib"
+ --with-installed-ooo-dirname=openoffice.org"
# Set our version.
Fsed "AC_PACKAGE_VERSION" "$pkgver-$pkgrel" configure.in
@@ -149,7 +151,7 @@ build() {
if ! Fuse $USE_DEVEL; then
Fconf --with-lang=ALL
else
- Fconf --with-lang="en-US de es fr hu"
--enable-separate-helpcontent
+ Fconf --with-lang="en-US de es fr hu"
fi
./download || return 1
@@ -160,26 +162,26 @@ build() {
# Permission fixes
find $Fdestdir/usr/lib/openoffice.org/program -name "*.so" ! -perm 755 -exec
chmod 755 {} \;
+ Fsed /bin/mktemp mktemp $Fdestdir/usr/lib/openoffice.org/program/unopkg
# Enable the mozilla plugin
Fmkdir /usr/lib/mozilla/plugins
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*
-
# 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
@@ -188,21 +190,34 @@ build() {
done
## Split KDE stuff
- for kde in fps_kde.uno.so kdebe*.uno.so kdefilepicker kde-open-url
libvclplug_kde*.so \
- libkabdrv*.so
+ for kde in fps_kde.uno.so kdebe*.uno.so 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
+ Fsplit $pkgname-kde usr/lib/openoffice.org/program/kdefilepicker
## 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
+ # Split SDK
+ Fmkdir usr/share/doc/$pkgname-$pkgver/
+ Fmv usr/share/doc/packages/OpenOffice.org/sdk
usr/share/doc/$pkgname-$pkgver/
+ Frm usr/share/doc/packages/
+ for i in usr/share/openoffice.org \
+ usr/share/idl \
+ usr/share/doc/$pkgname-$pkgver/sdk \
+ usr/lib/openoffice.org/basis3.0/sdk \
+ usr/include
+ do
+ Fsplit $pkgname-sdk $i
+ done
+
# Check for missing language packs.
misslangs="`find $Fdestdir |grep registry/res/.*/org|sed
's|.*registry/res/\(.*\)/org.*|\1|'|grep -v en-US |sort -u`"
if [ -n "$misslangs" ]; then
diff --git a/source/xapps/openoffice.org/openoffice.org.install
b/source/xapps/openoffice.org/openoffice.org.install
new file mode 100644
index 0000000..7e3da69
--- /dev/null
+++ b/source/xapps/openoffice.org/openoffice.org.install
@@ -0,0 +1,29 @@
+post_install()
+{
+ for i in /usr/lib/openoffice.org/share/extension/install/*.oxt
+ do
+ unopkg add --shared $i 2>/dev/null
+ done
+}
+
+pre_upgrade()
+{
+ pre_remove
+}
+
+post_upgrade()
+{
+ post_install
+}
+
+pre_remove()
+{
+ for i in $(unopkg list --shared|grep ^Identifier|sed 's/Identifier: //')
+ do
+ unopkg remove --shared $i
+ done
+}
+
+op=$1
+shift
+$op $*
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
