[arch-commits] Commit in openoffice-base/trunk (4 files)

[andyrtr at archlinux.org]

    Date: Saturday, May 30, 2009 @ 15:15:38
  Author: andyrtr
Revision: 40736

upgpkg: openoffice-base 3.1.0-2
    rebuild for icu4.2

Added:
  openoffice-base/trunk/buildfix-sw-printf.diff
  openoffice-base/trunk/soltools-mkdepend-getline.diff
Modified:
  openoffice-base/trunk/ChangeLog
  openoffice-base/trunk/PKGBUILD

--------------------------------+
 ChangeLog                      |    7 ++++++
 PKGBUILD                       |   14 +++++++++---
 buildfix-sw-printf.diff        |   21 +++++++++++++++++++
 soltools-mkdepend-getline.diff |   43 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 81 insertions(+), 4 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-05-30 17:51:15 UTC (rev 40735)
+++ ChangeLog	2009-05-30 19:15:38 UTC (rev 40736)
@@ -1,3 +1,10 @@
+2009-05-30 Andreas Radke <andyrtr at archlinux.org>
+
+        * 3.1.0-2 :
+	- rebuild for icu 4.2
+	- add gcc4.4 fix
+	- add glibc 2.10.1 fix
+
 2009-05-05 Andreas Radke <andyrtr at archlinux.org>
 
         * 3.1.0-1 :

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-30 17:51:15 UTC (rev 40735)
+++ PKGBUILD	2009-05-30 19:15:38 UTC (rev 40736)
@@ -3,7 +3,7 @@
 
 pkgname=openoffice-base
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
 arch=(i686 x86_64)
 _OO_milestone=OOO310_m11  # =RC2 = final
@@ -11,7 +11,7 @@
 url="http://www.openoffice.org"
 install=openoffice.install
 depends=('curl>=7.19.4' 'hunspell>=1.2.8' 'python>=2.6.1' 'libwpd' 'redland'
-         'libxaw' 'neon>=0.28.3-2' 'dbus-glib' 'icu>=4.0-2' 'hsqldb-java' 'libxslt' 'desktop-file-utils')
+         'libxaw' 'neon>=0.28.3-2' 'dbus-glib' 'icu>=4.2' 'hsqldb-java' 'libxslt' 'desktop-file-utils')
 optdepends=('java-runtime:	adds java support'
             'libcups:		adds printing support'
             'gconf:		adds additional gnome support'
@@ -27,7 +27,9 @@
 	soffice-detect-mozilla-certificates.diff
 	buildfix-gcc43.diff
 	shell.patch
-	openoffice.profile)
+	openoffice.profile
+	soltools-mkdepend-getline.diff
+	buildfix-sw-printf.diff)
 options=('!distcc' '!ccache' '!makeflags')
 md5sums=('650d8f2b648b291688bed9821f9dda91'
          '5e22f876c3c5d4754af394399e9bf375'
@@ -36,7 +38,9 @@
          '1dc7480a04f572ad136d35923a2af66d'
          'bf7119084a2d1e0566b5e34b57dce8eb'
          'a51200f770c635355c430cc5052db8cf'
-         '8d68d44c941a687813ddd968383cdf27')
+         '8d68d44c941a687813ddd968383cdf27'
+         '7f9012680d0e329227445925710bafe6'
+         '2461119a2b7f1580f997f504a76a1c98')
 
 # see ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/build/build for upstream build instructions
 
@@ -65,6 +69,8 @@
 
 	# build fixes
 	patch -Np0 -i ${srcdir}/buildfix-gcc43.diff || return 1
+	patch -Np0 -i ${srcdir}/buildfix-sw-printf.diff || return 1
+	patch -Np0 -i ${srcdir}/soltools-mkdepend-getline.diff || return 1
 
 	# allows soffice to find the user's firefox profile so that it can read
 	# its digital certificates. Nss stores digital certificates in your mozilla firefox profile. 

Added: buildfix-sw-printf.diff
===================================================================
--- buildfix-sw-printf.diff	                        (rev 0)
+++ buildfix-sw-printf.diff	2009-05-30 19:15:38 UTC (rev 40736)
@@ -0,0 +1,21 @@
+--- sw/source/core/doc/docbm.cxx	2009-05-01 08:09:45.000000000 -0500
++++ sw/source/core/doc/docbm.cxx	2009-05-01 13:31:49.000000000 -0500
+@@ -33,6 +33,7 @@
+ #include "precompiled_sw.hxx"
+ 
+ 
++#include <stdio.h>
+ #include <tools/pstm.hxx>
+ #include <svx/linkmgr.hxx>
+ #include <fmtanchr.hxx>
+--- sw/source/filter/ww8/WW8TableInfo.cxx	2009-04-21 04:51:46.000000000 -0500
++++ sw/source/filter/ww8/WW8TableInfo.cxx	2009-05-01 15:20:53.000000000 -0500
+@@ -31,6 +31,7 @@
+ // MARKER(update_precomp.py): autogen include statement, do not remove
+ #include "precompiled_sw.hxx"
+ 
++#include <stdio.h>
+ #include <iostream> 
+ #include "WW8TableInfo.hxx"
+ #include "swtable.hxx"
+

Added: soltools-mkdepend-getline.diff
===================================================================
--- soltools-mkdepend-getline.diff	                        (rev 0)
+++ soltools-mkdepend-getline.diff	2009-05-30 19:15:38 UTC (rev 40736)
@@ -0,0 +1,43 @@
+--- soltools/mkdepend/def.h.orig	2009-05-18 15:28:59.000000000 +0200
++++ soltools/mkdepend/def.h	2009-05-18 15:29:36.000000000 +0200
+@@ -154,7 +154,7 @@
+ 
+ char			*copy();
+ char			*base_name();
+-char			*getline();
++char			*ooo_getline();
+ char			*isdefined();
+ struct filepointer	*getfile();
+ struct inclist		*newinclude();
+--- soltools/mkdepend/main.c.orig	2009-05-18 15:29:08.000000000 +0200
++++ soltools/mkdepend/main.c	2009-05-18 15:30:23.000000000 +0200
+@@ -548,7 +548,7 @@
+  * Get the next line.  We only return lines beginning with '#' since that
+  * is all this program is ever interested in.
+  */
+-char *getline(filep)
++char *ooo_getline(filep)
+ 	register struct filepointer	*filep;
+ {
+ 	register char	*p,	/* walking pointer */
+--- soltools/mkdepend/parse.c.orig	2009-05-18 15:29:17.000000000 +0200
++++ soltools/mkdepend/parse.c	2009-05-18 15:30:43.000000000 +0200
+@@ -45,7 +45,7 @@
+ 	register int	type;
+ 	boolean recfailOK;
+ 
+-	while ((line = getline(filep))) {
++	while ((line = ooo_getline(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, TRUE, symbols)) {
+ 		case IF:
+ 		doif:
+@@ -168,7 +168,7 @@
+ 	register char	*line;
+ 	register int	type;
+ 
+-	while ((line = getline(filep))) {
++	while ((line = ooo_getline(filep))) {
+ 		switch(type = deftype(line, filep, file_red, file, FALSE, symbols)) {
+ 		case IF:
+ 		case IFFALSE:
+