[arch-commits] CVS update of extra/office/openoffice-base (3 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Feb 14 22:25:59 UTC 2008
Date: Thursday, February 14, 2008 @ 17:25:59
Author: andyrtr
Path: /home/cvs-extra/extra/office/openoffice-base
Modified: ChangeLog (1.3 -> 1.4) PKGBUILD (1.64 -> 1.65)
template.desktop (1.5 -> 1.6)
update to 2.4rc1
------------------+
ChangeLog | 7 ++
PKGBUILD | 137 +++++++++++++++++++----------------------------------
template.desktop | 82 +++++++++++++++----------------
3 files changed, 98 insertions(+), 128 deletions(-)
Index: extra/office/openoffice-base/ChangeLog
diff -u extra/office/openoffice-base/ChangeLog:1.3 extra/office/openoffice-base/ChangeLog:1.4
--- extra/office/openoffice-base/ChangeLog:1.3 Thu Dec 6 14:07:21 2007
+++ extra/office/openoffice-base/ChangeLog Thu Feb 14 17:25:59 2008
@@ -1,3 +1,10 @@
+openoffice-base 2.4.0-0.1
+- ooh680-m7 = 2.4 RC1
+- remove gstreamer patch that breaks letter wizard on x86_64
+- removed Arch splash
+- removed obsolete patches
+- added gtk-printing patch to provide the nice dialog on gtk based desktops
+
openoffice-base 2.3.1-1
- remove broken --without-stlport4 option for i686
Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.64 extra/office/openoffice-base/PKGBUILD:1.65
--- extra/office/openoffice-base/PKGBUILD:1.64 Tue Dec 25 09:44:59 2007
+++ extra/office/openoffice-base/PKGBUILD Thu Feb 14 17:25:59 2008
@@ -2,25 +2,25 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base
-pkgver=2.3.1
-pkgrel=2
+pkgver=2.4.0
+pkgrel=0.1 # =RC1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
-arch=(i686 x86_64)
-_OO_milestone=oog680-m9
-#_OO_milestone=OOG680_m9
+arch=('i686' 'x86_64')
+_OO_milestone=ooh680-m7
+#_OO_milestone=OOH680_m7
license=('LGPL')
url="http://www.openoffice.org"
install=openoffice.install
-depends=('ttf-dejavu' 'curl' 'desktop-file-utils' 'fontconfig>=2.4' 'gtk2>=2.10.11'
- 'hunspell>=1.2.1-2' 'perl' 'python>=2.5' 'libwpd' 'libsndfile'
+depends=('ttf-dejavu' 'curl' 'desktop-file-utils' 'fontconfig>=2.5' 'gtk2>=2.12.7'
+ 'hunspell>=1.2.1-2' 'perl' 'python>=2.5.1' 'libwpd' 'libsndfile'
'startup-notification>=0.9' 'xalan-java' 'libxaw' 'libcups' 'hsqldb-java'
- 'gstreamer0.10-base' 'neon>=0.27.0' 'dbus-glib' 'nss' 'pstoedit')
+ 'neon>=0.27.2' 'dbus-glib' 'nss' 'pstoedit')
# 'xmlsec' - broken
# "icu>=3.8" broken
# for gnu java/ecj
makedepends=('bison' 'cvs' 'curl' 'findutils' 'flex' 'gawk' 'gcc-libs' 'kdelibs'
'libart-lgpl' 'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip'
- 'xulrunner>=1.8.1.11' 'java-gcj-compat' 'apache-ant' 'cairo' 'ccache' 'autoconf')
+ 'xulrunner>=1.8.1.11' 'java-gcj-compat' 'apache-ant' 'cairo' 'autoconf') #'ccache'
# 'boost' - we use internal one. jfreereport is broken with system-boost/has no effect on size
# for SUN Java
#makedepends=('boost' 'bison' 'ccache' 'cvs' 'curl' 'findutils'
@@ -28,14 +28,15 @@
# 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.8.1.3'
# 'jdk' 'apache-ant' 'cairo')
-MIRROR="ftp://ftp.gwdg.de/pub/openoffice/" # has all late but is fast
+#MIRROR="ftp://ftp.gwdg.de/pub/openoffice/" # has all late but is fast
#MIRROR=http://ftp.rz.tu-bs.de/pub/mirror/OpenOffice.org/
#MIRROR=ftp://ftp-1.gwdg.de/pub/openoffice/developer
#MIRROR=ftp://ftp.linux.cz/pub/localization/OpenOffice.org/
#MIRROR=http://go-oo.org/packages/SRC680/
-#MIRROR=http://download.go-oo.org/OOG680/
+MIRROR=http://download.go-oo.org/OOH680/
-source=($MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter,system}.tar.bz2
+source=(#$MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter,system}.tar.bz2
+ #$MIRROR/OOH680/OOo-Dev_${pkgver}_src_{core,binfilter,system}.tar.bz2
#$MIRROR/contrib/rc/${pkgver}/OOo_${pkgver}_${_OO_milestone}_src_{core,binfilter}.tar.bz2
#$MIRROR/contrib/rc/${pkgver}/OOo_${_OO_milestone}_src_{core,binfilter}.tar.bz2
#$MIRROR/contrib/rc/2.2.0rc3/OOo_${pkgver}rc3_src_{core,binfilter}.tar.bz2
@@ -43,56 +44,33 @@
#$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
- http://download.go-oo.org/OOG680/${_OO_milestone}-{core,binfilter,system}.tar.bz2
- intro.bmp
+ http://download.go-oo.org/OOH680/${_OO_milestone}-{core,binfilter,system}.tar.bz2
+ #$MIRROR/OOH680_m6/OOo-Dev_${_OO_milestone}_src_{core,binfilter,system}.tar.bz2
template.desktop
- default-no-startup-wizard_oog680_m1.diff
- default-system-fpicker_oog680_m1.diff
- jvmfwk-gij-paths_oog680_m9.diff
- buildfix-sc-vba_oog680_m1.diff
- fix-dba-connectivity-i80338_oog680_m1.diff
- internal-db-no-java_oog680_m9.diff
- gstreamer-support_oog680_m1.diff
- fix-font-hinting_oog680_m2.diff
- fix-invisible-text.diff
- gui-insensitive_oog680_m2.diff
- neon27-oog680_m3.diff
- ucb-no-CURL_NO_OLDIES_oog_m5.diff
- 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)
+ default-no-startup-wizard.diff
+ default-system-fpicker.diff
+ jvmfwk-gij-paths.diff
+ fix-font-hinting.diff
+ gui-insensitive.diff
+ libxmlsec-system-nss.diff
+ libxmlsec-findcerts.diff
+ soffice-detect-mozilla-certificates.diff
+ gtkunixprintdialog.diff
+ awt_x86_64.diff) # only for Sun builds needed
options=('!distcc' 'ccache' '!emptydirs')
-md5sums=('9555a2d5fae9a25c788cc732921ef57a'
- 'a56cf6ed9bd9759faec5760bacb848cd'
- '1e20befe2fdb65c00be11f1f5d9ebdca'
- '551c451f43654d928f524f2f809939a9'
- 'c26ba92425087f71531d171cf74ff687'
- '1124d841e475015b5fde8e54d2f721f7'
- '72dba5b4cd94d4439e06f75769402c6f'
- 'd9475c3aaf879c294bd9bc692071bd41'
+md5sums=('2757e74404ae800baa7b727f3f0684ae'
+ 'ff5495ee992dfd8cce27a54d1a3fbfaf'
+ '1e6de10d2481d7144e095b40cf9931f3'
+ 'a728dcd463c1aa7ca5db75146377a0d1'
'0faab33566196ddc9c405d68cf614663'
'39e4c1b1e864b22ee4650b2bff44c695'
- 'd00bba7046fe64b20f9d1884203a34bf'
- '006bd83b71d1d85ad0c75478b17fabf6'
- '777754df8f9a1d5d98a4dac2142f02d8'
- 'a411c3dd9751a7b9cc6a327992d44026'
- '7c3e7b9a3793298bee1cb774b63b93a5'
- 'cfaf776e3254123f764c31cc93621e8b'
- '509697a7da6508ac9377b7750a57bfc4'
+ 'c6a9f74aff3e474b7dd8970e7e640a38'
+ 'e5ab0c8dec93a5245d42dc7de0490b66'
'4c76c07e867d51c416ea258220a90a6a'
- '5fe090550df3ce4a3a6f203ab50d07b5'
- 'a11248bfee6486e5b9b5997c2bee7dd9'
- '3353d801d4f3560ed1f5707ab5f02e49'
+ '28f37939e38d22bb3feaac8d17215673'
'a8b96e9d0ce92a8f6690f277b1cfacc9'
- '4271702d6e9e912b663d3e2d9b8a17e8'
- '1cc4e58f28093f179378dc3bd69986af'
- 'cd8ff2b60ee86f576a1e04bac8dcb51b'
- '1fc1ca5205730655eab2d2e119aa06fe'
+ '1dc7480a04f572ad136d35923a2af66d'
+ '076d59389390afe6f1cd91a4f5cbab23'
'83bb5e235c4e4062eed404829d760c14')
# see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
@@ -111,41 +89,33 @@
# build fixes
# gcj build fix to find our gcj libs paths
- patch -Np0 -i ../jvmfwk-gij-paths_oog680_m9.diff || return 1
+ patch -Np0 -i ../jvmfwk-gij-paths.diff || return 1
# fix build with internal xmlsec
- patch -Np0 -i ../libxmlsec-system-nss_oog_m5.diff || return 1
- # fixes a build failure in scalc when vba support is enabled
- patch -Np0 -i ../buildfix-sc-vba_oog680_m1.diff || return 1
- # detect new db4.6
- patch -Np0 -i ../detect_db46_src233.diff || return 1
- # allows internal Berkely db to build without java bindings.
- patch -Np0 -i ../internal-db-no-java_oog680_m9.diff || return 1
- # allows to build against neoin 0.27
- patch -Np1 -i ../neon27-oog680_m3.diff || return 1
+ patch -Np0 -i ../libxmlsec-system-nss.diff || return 1
# allows xmlsec to be able to read the format of the digital certificates.
- patch -Np0 -i ../libxmlsec-findcerts_oog_m5.diff || return 1
+ patch -Np0 -i ../libxmlsec-findcerts.diff || return 1
# allows soffice to find the user's firefox profile so that it can read
# his digital certificates. Nss stores digital certificates in your mozilla firefox profile.
- patch -Np0 -i ../soffice-detect-mozilla-certificates_oog_m5.diff || return 1
+ patch -Np0 -i ../soffice-detect-mozilla-certificates.diff || return 1
# 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
+ # nothing right now :)
# fix font hinting
- patch -Np0 -i ../fix-font-hinting_oog680_m2.diff || return 1
+ patch -Np0 -i ../fix-font-hinting.diff || return 1
# this heavily improves the looks of disabled icons in OpenOffice toolbar.
- patch -Np0 -i ../gui-insensitive_oog680_m2.diff || return 1
+ patch -Np0 -i ../gui-insensitive.diff || return 1
# remove the startup wizard
- patch -Np0 -i ../default-no-startup-wizard_oog680_m1.diff || return 1
+ patch -Np0 -i ../default-no-startup-wizard.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
+ patch -Np0 -i ../default-system-fpicker.diff || return 1
- # add gstreamer support for play audio in presentations
- patch -Np0 -i ../gstreamer-support_oog680_m1.diff || return 1
+
+ # add gtkprint dialog for gtk environment
+ patch -Np0 -i ../gtkunixprintdialog.diff || return 1
# arch related fixes & configure options
if [ "$CARCH" = "i686" ]; then
@@ -247,7 +217,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 -P4 --all || return 1
+ build.pl -P6 --all || return 1
cd ..
@@ -258,11 +228,7 @@
fi
cd $startdir/pkg/opt
- mv openoffice.org2.3 openoffice
-
- # replace original splash intro screen with one provided by shastry
- rm -rf $startdir/pkg/opt/openoffice/program/intro.bmp
- install -D -m644 $startdir/src/intro.bmp $startdir/pkg/opt/openoffice/program/
+ mv openoffice.org2.4 openoffice
# prepare filesystem entries
mkdir -p $startdir/pkg/usr/{bin,share/applications}
@@ -276,7 +242,7 @@
# install shortcuts
cp $startdir/pkg/opt/openoffice/share/xdg/*.desktop $startdir/pkg/usr/share/applications
cd $startdir/pkg/usr/share/applications
- sed -i -e 's|Exec=openoffice.org2.3|Exec=/opt/openoffice/program/soffice|g' *.desktop
+ sed -i -e 's|Exec=openoffice.org2.4|Exec=/opt/openoffice/program/soffice|g' *.desktop
sed -i -e 's|Exec=/opt/openoffice/program/soffice-printeradmin|Exec=/opt/openoffice/program/spadmin|g' printeradmin.desktop
# fix exec commands in shortcuts for Xfce menu
sed -i -e 's|base %U|base|g' base.desktop
@@ -288,7 +254,7 @@
# remove quickstarter, we disabled it above
rm -rf $startdir/pkg/usr/share/applications/qstart.desktop
# fix icons in shortcuts
- sed -i -e 's|Icon=openofficeorg23-|Icon=|g' *.desktop
+ sed -i -e 's|Icon=openofficeorg24-|Icon=|g' *.desktop
# add template desktop file
install -D -m644 $startdir/src/template.desktop $startdir/pkg/usr/share/applications/template.desktop
@@ -317,9 +283,6 @@
rm -f $startdir/pkg/opt/openoffice/program/root*.dat
rm -f $startdir/pkg/opt/openoffice/program/root*.dat.*
- # 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
-
# add missing spell wizard
install -D -m644 $startdir/src/${_OO_milestone}/dictionaries/diclst/DicOOo.sxw $startdir/pkg/opt/openoffice/share/dict/ooo/DicOOo.sxw
Index: extra/office/openoffice-base/template.desktop
diff -u extra/office/openoffice-base/template.desktop:1.5 extra/office/openoffice-base/template.desktop:1.6
--- extra/office/openoffice-base/template.desktop:1.5 Mon Aug 27 02:58:47 2007
+++ extra/office/openoffice-base/template.desktop Thu Feb 14 17:25:59 2008
@@ -7,44 +7,44 @@
Exec=/opt/openoffice/program/soffice slot:5500
Categories=Application;Office;X-Red-Hat-Base;X-SuSE-Core-Office;
Type=Application
-Name=OpenOffice.org 2.3 From Template
-Name[en]=OpenOffice.org 2.3 From Template
-Name[de]=OpenOffice.org 2.3 Aus Vorlage
-Name[pt]=OpenOffice.org 2.3 Aus Vorlage
-Name[ru]=OpenOffice.org 2.3 из шаблона...
-Name[el]=OpenOffice.org 2.3 Από Ï€Ïότυπο
-Name[nl]=OpenOffice.org 2.3 Uit sjabloon
-Name[fr]=À partir d'un modèle OpenOffice.org 2.3
-Name[es]=A partir de una plantilla de OpenOffice.org 2.3
-Name[fi]=OpenOffice.org 2.3 Aus Vorlage
-Name[hu]=OpenOffice.org 2.3 sablonból
-Name[it]=OpenOffice.org 2.3 Da modello
-Name[cs]=Ze Å¡ablony OpenOffice.org 2.3
-Name[sk]=Zo šablóny OpenOffice.org 2.3
-Name[da]=OpenOffice.org 2.3 Fra skabelon
-Name[sv]=Från en OpenOffice.org 2.3-mall
-Name[pl]=OpenOffice.org 2.3 Na podstawie szablonu
-Name[pt_BR]=A partir de um modelo OpenOffice.org 2.3
-Name[ja]=OpenOffice.org 2.3 テンプレートã‹ã‚‰
-Name[ko]=OpenOffice.org 2.3 ì„œì‹ íŒŒì¼ë¡œë¶€í„°
-Name[zh_CN]=OpenOffice.org 2.3 é‡‡ç”¨æ ·å¼
-Name[zh_TW]=OpenOffice.org 2.3 採用樣å¼
-Name[tr]=OpenOffice.org 2.3 Åžablondan
-Name[ar]=OpenOffice.org 2.3 Aus Vorlage
-Name[he]=OpenOffice.org 2.3 Aus Vorlage
-Name[ca]=OpenOffice.org 2.3 Aus Vorlage
-Name[th]=OpenOffice.org 2.3 จาà¸à¹à¸¡à¹ˆà¹à¸šà¸š
-Name[hi_IN]=OpenOffice.org 2.3 Aus Vorlage
-Name[et]=OpenOffice.org 2.3 mallist
-Name[sl]=OpenOffice.org 2.3 iz predloge
-Name[ns]=OpenOffice.org 2.3 go tšwa go Template
-Name[af]=OpenOffice.org 2.3 vanaf sjabloon
-Name[zu]=I-OpenOffice.org 2.3 esuka Oqwenjini lokuphumelelisa
-Name[nb]=OpenOffice.org 2.3 From Template
-Name[cy]=OpenOffice.org 2.3 From Template
-Name[tn]=OpenOffice.org 2.3 From Template
-Name[nn]=OpenOffice.org 2.3 From Template
-Name[eu]=OpenOffice.org 2.3 Aus Vorlage
-Name[lt]=„OpenOffice.org 2.3“ dokumentas iš šablono
-Name[kn_IN]=OpenOffice.org 2.3 ಸಿದà³à²§à²µà²¿à²¨à³à²¯à²¾à²¸ ಪà³à²Ÿà²¦à²¿à²‚ದ
-Name[gl]=A partir dun modelo de OpenOffice.org 2.3
+Name=OpenOffice.org 2.4 From Template
+Name[en]=OpenOffice.org 2.4 From Template
+Name[de]=OpenOffice.org 2.4 Aus Vorlage
+Name[pt]=OpenOffice.org 2.4 Aus Vorlage
+Name[ru]=OpenOffice.org 2.4 из шаблона...
+Name[el]=OpenOffice.org 2.4 Από Ï€Ïότυπο
+Name[nl]=OpenOffice.org 2.4 Uit sjabloon
+Name[fr]=À partir d'un modèle OpenOffice.org 2.4
+Name[es]=A partir de una plantilla de OpenOffice.org 2.4
+Name[fi]=OpenOffice.org 2.4 Aus Vorlage
+Name[hu]=OpenOffice.org 2.4 sablonból
+Name[it]=OpenOffice.org 2.4 Da modello
+Name[cs]=Ze Å¡ablony OpenOffice.org 2.4
+Name[sk]=Zo šablóny OpenOffice.org 2.4
+Name[da]=OpenOffice.org 2.4 Fra skabelon
+Name[sv]=Från en OpenOffice.org 2.4-mall
+Name[pl]=OpenOffice.org 2.4 Na podstawie szablonu
+Name[pt_BR]=A partir de um modelo OpenOffice.org 2.4
+Name[ja]=OpenOffice.org 2.4 テンプレートã‹ã‚‰
+Name[ko]=OpenOffice.org 2.4 ì„œì‹ íŒŒì¼ë¡œë¶€í„°
+Name[zh_CN]=OpenOffice.org 2.4 é‡‡ç”¨æ ·å¼
+Name[zh_TW]=OpenOffice.org 2.4 採用樣å¼
+Name[tr]=OpenOffice.org 2.4 Åžablondan
+Name[ar]=OpenOffice.org 2.4 Aus Vorlage
+Name[he]=OpenOffice.org 2.4 Aus Vorlage
+Name[ca]=OpenOffice.org 2.4 Aus Vorlage
+Name[th]=OpenOffice.org 2.4 จาà¸à¹à¸¡à¹ˆà¹à¸šà¸š
+Name[hi_IN]=OpenOffice.org 2.4 Aus Vorlage
+Name[et]=OpenOffice.org 2.4 mallist
+Name[sl]=OpenOffice.org 2.4 iz predloge
+Name[ns]=OpenOffice.org 2.4 go tšwa go Template
+Name[af]=OpenOffice.org 2.4 vanaf sjabloon
+Name[zu]=I-OpenOffice.org 2.4 esuka Oqwenjini lokuphumelelisa
+Name[nb]=OpenOffice.org 2.4 From Template
+Name[cy]=OpenOffice.org 2.4 From Template
+Name[tn]=OpenOffice.org 2.4 From Template
+Name[nn]=OpenOffice.org 2.4 From Template
+Name[eu]=OpenOffice.org 2.4 Aus Vorlage
+Name[lt]=„OpenOffice.org 2.4“ dokumentas iš šablono
+Name[kn_IN]=OpenOffice.org 2.4 ಸಿದà³à²§à²µà²¿à²¨à³à²¯à²¾à²¸ ಪà³à²Ÿà²¦à²¿à²‚ದ
+Name[gl]=A partir dun modelo de OpenOffice.org 2.4
More information about the arch-commits
mailing list