[arch-commits] Commit in openoffice-base-beta/trunk (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Wed Jun 3 19:26:11 UTC 2009
Date: Wednesday, June 3, 2009 @ 15:26:11
Author: andyrtr
Revision: 41372
upgpkg: openoffice-base-beta 3.1.1_ooo310_m12-1
new version .1.1_ooo310_m12; built against new icu; added two buildfixes
Added:
openoffice-base-beta/trunk/buildfix-sw-printf.diff
openoffice-base-beta/trunk/soltools-mkdepend-getline.diff
Modified:
openoffice-base-beta/trunk/ChangeLog
openoffice-base-beta/trunk/PKGBUILD
--------------------------------+
ChangeLog | 8 +++++++
PKGBUILD | 17 ++++++++-------
buildfix-sw-printf.diff | 21 +++++++++++++++++++
soltools-mkdepend-getline.diff | 43 +++++++++++++++++++++++++++++++++++++++
4 files changed, 81 insertions(+), 8 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2009-06-03 15:56:31 UTC (rev 41371)
+++ ChangeLog 2009-06-03 19:26:11 UTC (rev 41372)
@@ -1,3 +1,11 @@
+2009-06-03 Andreas Radke <andyrtr at archlinux.org>
+
+ * 3.1.1-ooo310_m12-1 :
+ next snapshot
+ - build for icu 4.2
+ - add gcc4.4 fix
+ - add glibc 2.10.1 fix
+
2009-04-04 Andreas Radke <andyrtr at archlinux.org>
* 3.1.0-ooo310_m9-1 :
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2009-06-03 15:56:31 UTC (rev 41371)
+++ PKGBUILD 2009-06-03 19:26:11 UTC (rev 41372)
@@ -2,16 +2,16 @@
# Contributor: Hussam Al-Tayeb <ht990332 at gmail.com>
pkgname=openoffice-base-beta
-pkgver=3.1.0_ooo310_m9 # m9=RC1
+pkgver=3.1.1_ooo310_m12 # m9=RC1
pkgrel=1
pkgdesc="OpenOffice.org - a free multiplatform and multilingual office suite"
arch=(i686 x86_64)
-_OO_milestone=OOO310_m9
+_OO_milestone=OOO310_m12
license=('LGPL3')
url="http://www.openoffice.org"
install=openoffice.install
depends=('curl>=7.19.2' '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'
@@ -28,6 +28,8 @@
soffice-detect-mozilla-certificates.diff
buildfix-gcc43.diff
shell.patch
+ soltools-mkdepend-getline.diff
+ buildfix-sw-printf.diff
openoffice-beta.profile)
options=('!distcc' '!ccache' '!makeflags')
@@ -58,7 +60,9 @@
# 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.
patch -Np0 -i ${srcdir}/soffice-detect-mozilla-certificates.diff || return 1
@@ -200,10 +204,7 @@
ln -s ../../opt/openoffice/program/spadmin spadmin
# install all built dictionaries from source tree
- if [ "$CARCH" = "x86_64" ]; then
- pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlngx6.pro/bin
- else pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlngi6.pro/bin
- fi
+ pushd ${srcdir}/${_OO_milestone}/dictionaries/unxlng?6.pro/bin
for i in `ls -1 dict-??.oxt`; do
install -D -m644 $i ${pkgdir}/opt/openoffice/share/extension/install/$i || return 1
done
Added: buildfix-sw-printf.diff
===================================================================
--- buildfix-sw-printf.diff (rev 0)
+++ buildfix-sw-printf.diff 2009-06-03 19:26:11 UTC (rev 41372)
@@ -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-06-03 19:26:11 UTC (rev 41372)
@@ -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:
+
More information about the arch-commits
mailing list