[arch-commits] CVS update of extra/office/openoffice-base (PKGBUILD intro.bmp)

[andyrtr at archlinux.org]

    Date: Sunday, September 16, 2007 @ 11:01:42
  Author: andyrtr
    Path: /home/cvs-extra/extra/office/openoffice-base

Modified: PKGBUILD (1.51 -> 1.52) intro.bmp (1.1 -> 1.2)

final release 2.3.0


-----------+
 PKGBUILD  |   28 +++++++++++++---------------
 intro.bmp |    <<Binary file>>
 2 files changed, 14 insertions(+), 15 deletions(-)


Index: extra/office/openoffice-base/PKGBUILD
diff -u extra/office/openoffice-base/PKGBUILD:1.51 extra/office/openoffice-base/PKGBUILD:1.52
--- extra/office/openoffice-base/PKGBUILD:1.51	Tue Sep 11 12:54:22 2007
+++ extra/office/openoffice-base/PKGBUILD	Sun Sep 16 11:01:42 2007
@@ -3,10 +3,11 @@
 
 pkgname=openoffice-base
 pkgver=2.3.0
-pkgrel=0.22
+pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
-_OO_milestone=oog680-m5
+#_OO_milestone=oog680-m5
+_OO_milestone=OOG680_m5
 license=('LGPL')
 url="http://www.openoffice.org"
 install=openoffice.install
@@ -26,14 +27,14 @@
 #             'jdk' 'apache-ant' 'cairo')
 provides=('openoffice-base')
 
-#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://go-oo.org/packages/OOG680/
+#MIRROR=http://go-oo.org/packages/OOG680/
 
-source=(#$MIRROR/stable/${pkgver}/OOo_${pkgver}_src_{core,binfilter}.tar.bz2
+source=($MIRROR/stable/${pkgver}/OOo_${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
@@ -41,8 +42,7 @@
 	#$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,sdk_oo,system,lang}.tar.bz2
-	$MIRROR/${_OO_milestone}-{core,binfilter,system}.tar.bz2
+	#$MIRROR/${_OO_milestone}-{core,binfilter,system}.tar.bz2
 	intro.bmp
 	template.desktop
 	default-no-startup-wizard_oog680_m1.diff
@@ -53,7 +53,6 @@
 	internal-db-no-java_oog680_m1.diff
 	gstreamer-support_oog680_m1.diff
 	fix-font-hinting_oog680_m2.diff
-	no-mozilla-plug-in-option_oog680_m1.diff
 	remove-broken-wizards_oog680_m1.diff
 	fix-invisible-text.diff
 	system-xmlsec_oog680_m1.diff
@@ -64,10 +63,10 @@
 	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=('eb0bce2625e182db1470b7cebfbcdc17'
-         '8ebfe5ead84524f38c23911805142c4d'
-         '35cc875dd83712ee1eb43b0b974220ff'
-         '18e281491eadda03ed661b0261be0c22'
+md5sums=('d447057b2af58020234cb9db6c782bfa'
+         '27a1406a825ed465c71c39f3abfd622a'
+         '60c56b99855143fc0c8f7e581f214b5b'
+         '72dba5b4cd94d4439e06f75769402c6f'
          'd9475c3aaf879c294bd9bc692071bd41'
          '0faab33566196ddc9c405d68cf614663'
          '39e4c1b1e864b22ee4650b2bff44c695'
@@ -77,7 +76,6 @@
          '2b218f0c8672329eeaea8c1be1297a6d'
          'c5bbc077ad65add8feec1ae76fb4d9b5'
          'cfaf776e3254123f764c31cc93621e8b'
-         'ab3305973c8665b2e48304221c8f10ca'
          '50ca7bcb38d62062e861667fa8ce01eb'
          '509697a7da6508ac9377b7750a57bfc4'
          '42b45865406bdbff65ab50fa64443b93'
@@ -86,6 +84,7 @@
          '4f0da68601120267be643c9cdaca2772'
          '1fc1ca5205730655eab2d2e119aa06fe'
          '83bb5e235c4e4062eed404829d760c14')
+
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
 build() {
@@ -121,8 +120,6 @@
 
 	# fix font hinting
 	patch -Np0 -i ../fix-font-hinting_oog680_m2.diff || return 1
-	# don't build the mozilla plugin
-	patch -Np0 -i ../no-mozilla-plug-in-option_oog680_m1.diff || return 1
 	# this heavily improves the looks of disabled icons in OpenOffice toolbar. 
 	patch -Np0 -i ../gui-insensitive_oog680_m2.diff || return 1
 
@@ -168,6 +165,7 @@
 	--disable-qadevooo\
 	--disable-systray\
 	--disable-gpc\
+	--disable-mozilla\
 	--enable-gtk\
 	--enable-kde\
 	--enable-cups\
Index: extra/office/openoffice-base/intro.bmp
<<Binary file>>