diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2009-05-19 11:26:37 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2009-05-19 11:26:37 +0000 |
| commit | 99d5fcace56eb6d56f714cb7ffdae0951fae6ef5 (patch) | |
| tree | dd84d65569c5010c0f3e8c35a339b1bee6c76e1b /app-office/openoffice/files | |
| parent | Mask eselect-1.1_rc1. (diff) | |
| download | gentoo-2-99d5fcace56eb6d56f714cb7ffdae0951fae6ef5.tar.gz gentoo-2-99d5fcace56eb6d56f714cb7ffdae0951fae6ef5.tar.bz2 gentoo-2-99d5fcace56eb6d56f714cb7ffdae0951fae6ef5.zip | |
Fix build problems with gcc-4.4 (bug #269452) and glibc-2.10.1 (bug #270263) and correct post-install message for bash completion (bug #270185)
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'app-office/openoffice/files')
| -rw-r--r-- | app-office/openoffice/files/buildfix-gcc44.diff | 20 | ||||
| -rw-r--r-- | app-office/openoffice/files/ooo_getline.diff | 42 |
2 files changed, 62 insertions, 0 deletions
diff --git a/app-office/openoffice/files/buildfix-gcc44.diff b/app-office/openoffice/files/buildfix-gcc44.diff new file mode 100644 index 000000000000..5da661e1f2d4 --- /dev/null +++ b/app-office/openoffice/files/buildfix-gcc44.diff @@ -0,0 +1,20 @@ +--- sw/source/core/doc/docbm.cxx 2009-05-17 16:41:34.765483089 -0500 ++++ sw/source/core/doc/docbm.cxx 2009-05-17 16:41:39.141355157 -0500 +@@ -33,6 +33,7 @@ + #include "precompiled_sw.hxx" + + ++#include <cstdio> + #include <tools/pstm.hxx> + #include <svx/linkmgr.hxx> + #include <fmtanchr.hxx> +--- sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-17 17:06:33.556313757 -0500 ++++ sw/source/filter/ww8/WW8TableInfo.cxx 2009-05-17 17:06:46.964547351 -0500 +@@ -32,6 +32,7 @@ + #include "precompiled_sw.hxx" + + #include <iostream> ++#include <cstdio> + #include "WW8TableInfo.hxx" + #include "swtable.hxx" + #include "pam.hxx" diff --git a/app-office/openoffice/files/ooo_getline.diff b/app-office/openoffice/files/ooo_getline.diff new file mode 100644 index 000000000000..9fed114c3979 --- /dev/null +++ b/app-office/openoffice/files/ooo_getline.diff @@ -0,0 +1,42 @@ +--- 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: |