Allow uno bridging code to compile with our gcc3.1 and gcc3.2 from ports.

23 files changed, 253 insertions, 0 deletions

diff --git a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h b/editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-devel/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-1.0/files/patch-cppu::inc::uno::lbnames.h b/editors/openoffice.org-1.0/files/patch-cppu::inc::uno::lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-1.0/files/patch-cppu::inc::uno::lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice/files/patch-cppu+inc+uno+lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice/files/patch-cppu+inc+uno+lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."
diff --git a/editors/openoffice/files/patch-cppu::inc::uno::lbnames.h b/editors/openoffice/files/patch-cppu::inc::uno::lbnames.h
new file mode 100644
index 0000000..c972b58
--- /dev/null
+++ b/editors/openoffice/files/patch-cppu::inc::uno::lbnames.h
@@ -0,0 +1,11 @@
+--- ../cppu/inc/uno/lbnames.h.orig	Fri May 31 00:06:58 2002
++++ ../cppu/inc/uno/lbnames.h	Fri May 31 00:07:22 2002
+@@ -94,7 +94,7 @@
+ #define	__CPPU_ENV gcc2
+ #elif (__GNUC__ == 2)
+ #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__ == 1)
++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
+ #define	__CPPU_ENV gcc3
+ #elif (__GNUC__ == 3)
+ #error "Tested gcc 3 version is 3.0.  Patch uno/lbnames.h to try your gcc 3 version."