[arch-commits] Commit in openoffice-base-beta/repos (3 files)

[andyrtr at archlinux.org]

    Date: Saturday, July 4, 2009 @ 12:09:25
  Author: andyrtr
Revision: 44869

Merged revisions 44868 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/openoffice-base-beta/trunk

........
  r44868 | andyrtr | 2009-07-04 16:08:48 +0000 (Sa, 04 Jul 2009) | 2 lines
  
  upgpkg: openoffice-base-beta 3.1.1_ooo310_m15-1
      new snapshot, lower optimizations
........

Modified:
  openoffice-base-beta/repos/testing-x86_64/	(properties)
  openoffice-base-beta/repos/testing-x86_64/ChangeLog
  openoffice-base-beta/repos/testing-x86_64/PKGBUILD

-----------+
 ChangeLog |    7 +++++++
 PKGBUILD  |   15 +++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)


Property changes on: openoffice-base-beta/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /openoffice-base-beta/trunk:1-44643
   + /openoffice-base-beta/trunk:1-44868

Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog	2009-07-04 16:08:48 UTC (rev 44868)
+++ testing-x86_64/ChangeLog	2009-07-04 16:09:25 UTC (rev 44869)
@@ -1,3 +1,10 @@
+2009-07-04 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.1.1-ooo310_m15-1 :
+	new snapshot
+	rebuild with lowered compiler optimizations
+	http://bugs.archlinux.org/task/15290
+
 2009-07-03 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.1.1-ooo310_m14-2 :

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2009-07-04 16:08:48 UTC (rev 44868)
+++ testing-x86_64/PKGBUILD	2009-07-04 16:09:25 UTC (rev 44869)
@@ -2,16 +2,16 @@
 # Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
 
 pkgname=openoffice-base-beta
-pkgver=3.1.1_ooo310_m14 # m9=RC1
-pkgrel=2
+pkgver=3.1.1_ooo310_m15 # m9=RC1
+pkgrel=1
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
-_OO_milestone=OOO310_m14
+_OO_milestone=OOO310_m15
 license=('LGPL3')
 url="http://www.openoffice.org"
 install=openoffice.install
 depends=('curl>=7.19.2' 'hunspell>=1.2.8' 'python>=2.6.2' 'libwpd' 'redland'
-         'libxaw' 'neon>=0.28.4' 'dbus-glib' 'icu>=4.2' 'hsqldb-java' 'libxslt' 'desktop-file-utils')
+         'libxaw' 'neon>=0.28.4' 'dbus-glib' 'icu>=4.2.1' 'hsqldb-java' 'libxslt' 'desktop-file-utils')
 optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
             'gconf:		adds additional gnome support'
@@ -19,7 +19,7 @@
             'pstoedit:		translates PostScript and PDF graphics into other vector formats')
 makedepends=('bison' 'svn' 'automake' 'findutils' 'flex' 'gawk' 'gcc-libs' 'libart-lgpl' 'libxtst'
              'pam' 'sane' 'zip' 'perl-archive-zip' 'pkgconfig' 'unzip' 'xulrunner>=1.9.1-2'
-             'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5') #'boost' 
+             'apache-ant>=1.7.1-3' 'cairo' 'gperf' 'libcups' 'pstoedit' 'gconf' 'openjdk6>=1.5-4') #'boost' 
 provides=('openoffice-base')
 source=(${pkgname}-${_OO_milestone}.tar.gz
 	template.desktop
@@ -89,7 +89,10 @@
 	cd ${srcdir}/${_OO_milestone}
 
 	# export C(XX)FLAGS
-	export ARCH_FLAGS="$CFLAGS"
+	# http://www.openoffice.org/issues/show_bug.cgi?id=103205
+	unset CFLAGS
+	unset CXXFLAGS
+#	export ARCH_FLAGS="$CFLAGS"
 
 	# Need to recreate the configure script because of patches
 	autoreconf -v || return 1