- apply some "const" so this builds with new bison; from jakllsch

- include <string.h> when using stdrup
- enable compilation with GCC 4.5

5 files changed, 64 insertions, 1 deletions

diff --git a/misc/openoffice3/distinfo b/misc/openoffice3/distinfo
index 20c1e03c33b..e1e2fe554e1 100644
--- a/misc/openoffice3/distinfo
+++ b/misc/openoffice3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2011/04/01 20:11:33 bouyer Exp $
+$NetBSD: distinfo,v 1.30 2011/07/22 03:03:28 mrg Exp $
 
 SHA1 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 3b4d0d312a1bed9bdb1bbdfb172fa7361533b498
 RMD160 (openoffice-3.1.1/OOo_3.1.1_src_binfilter.tar.bz2) = 8caa064f836e531035fd551cf2d7288ca5188da0
@@ -24,7 +24,9 @@ SHA1 (patch-af) = 553e67c7afd8506515ae40a252d4e26dce59fc51
 SHA1 (patch-ag) = 6c2f17424cfc85b5bc923a650167f14b7acabfd4
 SHA1 (patch-ah) = e0a7dd2bf36e5009b5b8a5ddc593a5a78c01a012
 SHA1 (patch-ai) = 268c8107052d2650a78d8048513f4acb2a1ee0f1
+SHA1 (patch-aj) = 64a9c271ab473b2b358d863a85ce632f3d4894b3
 SHA1 (patch-ak) = e8d2f5c8b7ff997b2aa83452f73b59420d01eb6b
+SHA1 (patch-al) = 4de49711c725562e839925acfdf70b80a9035ce3
 SHA1 (patch-am) = 8e497298dd5534bd0ef438c22595c1c0f63912a5
 SHA1 (patch-an) = cdf677a8e135fd4b447eef006558c7fea4df0be6
 SHA1 (patch-ao) = a83178adec44571ebcf7a4dd66bda52d004d465c
@@ -32,6 +34,8 @@ SHA1 (patch-ap) = d9445a00083b7e847bf54b948f699a89b811d2da
 SHA1 (patch-aq) = 3e9a156887e108126c76f0735abb4dce177efa4b
 SHA1 (patch-ar) = e3592ddc51a311a90d727ef8b595944a0ac3e623
 SHA1 (patch-as) = b6a9760ba4260aa267df4e3fa0b767c6db2d49ac
+SHA1 (patch-at) = 1f970c9dd3b952bbc481a46f728e6988ff5bf2ec
+SHA1 (patch-au) = 92febfce09a049e6d68139498be8a0d6990c9b3c
 SHA1 (patch-aw) = a331b0130b0b6bac0b81ee6a1aeeb7b216d5f511
 SHA1 (patch-ba) = c759a1fca8893095d88e7f4ee30830fd01213a69
 SHA1 (patch-bb) = a2fe8b7aff8c875bdf15c70619b430f1fdbfa053
diff --git a/misc/openoffice3/patches/patch-aj b/misc/openoffice3/patches/patch-aj
new file mode 100644
index 00000000000..71b9472faf7
--- /dev/null
+++ b/misc/openoffice3/patches/patch-aj
@@ -0,0 +1,12 @@
+$NetBSD: patch-aj,v 1.1 2011/07/22 03:03:28 mrg Exp $
+
+--- bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx.orig	2008-04-11 03:22:44.000000000 -0700
++++ bridges/source/cpp_uno/gcc3_netbsd_intel/except.cxx	2011-07-21 01:31:47.000000000 -0700
+@@ -33,6 +33,7 @@
+ 
+ #include <stdio.h>
+ #include <dlfcn.h>
++#include <string.h>
+ #include <cxxabi.h>
+ #include <hash_map>
+ #include <sys/param.h>
diff --git a/misc/openoffice3/patches/patch-al b/misc/openoffice3/patches/patch-al
new file mode 100644
index 00000000000..42ebedbd7f7
--- /dev/null
+++ b/misc/openoffice3/patches/patch-al
@@ -0,0 +1,21 @@
+$NetBSD: patch-al,v 1.1 2011/07/22 03:03:28 mrg Exp $
+
+enable GCC 4.5 support
+
+--- cppu/inc/uno/lbnames.h.orig	2008-12-08 06:37:56.000000000 -0800
++++ cppu/inc/uno/lbnames.h	2011-07-20 20:07:27.000000000 -0700
+@@ -65,12 +65,12 @@
+ #error "Tested gcc 2 versions are 2.91 and 2.95.  Patch uno/lbnames.h to try your gcc 2 version."
+ #elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 4)
+ #define __CPPU_ENV gcc3
+-#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 4)
++#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
+ #define __CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is <= 3.4.  Patch uno/lbnames.h to try your gcc 3 version."
+ #else
+-#error "Supported gcc majors are 2 , 3 and 4 <= 4.4.  Unsupported gcc major version."
++#error "Supported gcc majors are 2 , 3 and 4 <= 4.5.  Unsupported gcc major version."
+ #endif /* defined (__GNUC__) */
+ #endif /* defined (_MSC_VER) */
+ 
diff --git a/misc/openoffice3/patches/patch-at b/misc/openoffice3/patches/patch-at
new file mode 100644
index 00000000000..8a2fbae3ad3
--- /dev/null
+++ b/misc/openoffice3/patches/patch-at
@@ -0,0 +1,13 @@
+$NetBSD: patch-at,v 1.1 2011/07/22 03:03:28 mrg Exp $
+
+--- connectivity/source/parse/sqlbison.y.orig	2008-11-19 10:43:08.000000000 -0800
++++ connectivity/source/parse/sqlbison.y	2011-07-20 22:26:46.000000000 -0700
+@@ -3654,7 +3654,7 @@
+ }
+ 
+ // -------------------------------------------------------------------------
+-void OSQLParser::error(sal_Char *fmt)
++void OSQLParser::error(const sal_Char *fmt)
+ {
+ 	if(!m_sErrorMessage.getLength())
+ 	{
diff --git a/misc/openoffice3/patches/patch-au b/misc/openoffice3/patches/patch-au
new file mode 100644
index 00000000000..0ee4e89fbf1
--- /dev/null
+++ b/misc/openoffice3/patches/patch-au
@@ -0,0 +1,13 @@
+$NetBSD: patch-au,v 1.1 2011/07/22 03:03:28 mrg Exp $
+
+--- connectivity/inc/connectivity/sqlparse.hxx.orig	2008-12-30 14:32:01.000000000 +0000
++++ connectivity/inc/connectivity/sqlparse.hxx
+@@ -213,7 +213,7 @@ namespace connectivity
+ 
+ 
+ 
+-		void error(sal_Char *fmt);
++		void error(const sal_Char *fmt);
+ 		int SQLlex();
+ #ifdef YYBISON
+ 		void setParseTree(OSQLParseNode * pNewParseTree);