From 0ccaa5eb7014668604f6f47c512c4ab437e207cf Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Thu, 6 Jul 2006 00:38:48 +0000 Subject: Build fix for 7-current. NAKAJI-san kindly signed to JCA for upstream, so we accept the patch. Please refer policy section of http://porting.openoffice.org/freebsd . PR: 99284 Submitted by: NAKAJI Hiroyuki --- editors/openoffice-3-devel/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice-3/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice.org-2-RC/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice.org-2-devel/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice.org-2.0-devel/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice.org-2.0/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice.org-2/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice.org-3-RC/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice.org-3-devel/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice.org-3/files/patch-i65512 | 18 ++++++++++++++++++ editors/openoffice.org-vcltesttool/files/patch-i65512 | 18 ++++++++++++++++++ 11 files changed, 198 insertions(+) (limited to 'editors') diff --git a/editors/openoffice-3-devel/files/patch-i65512 b/editors/openoffice-3-devel/files/patch-i65512 index 1f5005a87f78..680086a0c518 100644 --- a/editors/openoffice-3-devel/files/patch-i65512 +++ b/editors/openoffice-3-devel/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice-3/files/patch-i65512 b/editors/openoffice-3/files/patch-i65512 index 9f7b63af1ca1..b37f2e47fa2d 100644 --- a/editors/openoffice-3/files/patch-i65512 +++ b/editors/openoffice-3/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice.org-2-RC/files/patch-i65512 b/editors/openoffice.org-2-RC/files/patch-i65512 index 9f7b63af1ca1..b37f2e47fa2d 100644 --- a/editors/openoffice.org-2-RC/files/patch-i65512 +++ b/editors/openoffice.org-2-RC/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice.org-2-devel/files/patch-i65512 b/editors/openoffice.org-2-devel/files/patch-i65512 index 1f5005a87f78..680086a0c518 100644 --- a/editors/openoffice.org-2-devel/files/patch-i65512 +++ b/editors/openoffice.org-2-devel/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice.org-2.0-devel/files/patch-i65512 b/editors/openoffice.org-2.0-devel/files/patch-i65512 index 1f5005a87f78..680086a0c518 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-i65512 +++ b/editors/openoffice.org-2.0-devel/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice.org-2.0/files/patch-i65512 b/editors/openoffice.org-2.0/files/patch-i65512 index 9f7b63af1ca1..b37f2e47fa2d 100644 --- a/editors/openoffice.org-2.0/files/patch-i65512 +++ b/editors/openoffice.org-2.0/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice.org-2/files/patch-i65512 b/editors/openoffice.org-2/files/patch-i65512 index 9f7b63af1ca1..b37f2e47fa2d 100644 --- a/editors/openoffice.org-2/files/patch-i65512 +++ b/editors/openoffice.org-2/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice.org-3-RC/files/patch-i65512 b/editors/openoffice.org-3-RC/files/patch-i65512 index 9f7b63af1ca1..b37f2e47fa2d 100644 --- a/editors/openoffice.org-3-RC/files/patch-i65512 +++ b/editors/openoffice.org-3-RC/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice.org-3-devel/files/patch-i65512 b/editors/openoffice.org-3-devel/files/patch-i65512 index 1f5005a87f78..680086a0c518 100644 --- a/editors/openoffice.org-3-devel/files/patch-i65512 +++ b/editors/openoffice.org-3-devel/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice.org-3/files/patch-i65512 b/editors/openoffice.org-3/files/patch-i65512 index 9f7b63af1ca1..b37f2e47fa2d 100644 --- a/editors/openoffice.org-3/files/patch-i65512 +++ b/editors/openoffice.org-3/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif diff --git a/editors/openoffice.org-vcltesttool/files/patch-i65512 b/editors/openoffice.org-vcltesttool/files/patch-i65512 index 1f5005a87f78..680086a0c518 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-i65512 +++ b/editors/openoffice.org-vcltesttool/files/patch-i65512 @@ -41,3 +41,21 @@ #endif #endif /* __OSL_SYSTEM_H__ */ +--- moz/mozilla-source-1.7.5.patch.orig Wed Jun 21 23:50:14 2006 ++++ moz/mozilla-source-1.7.5.patch Thu Jun 22 00:00:08 2006 +@@ -7697,3 +7697,15 @@ + + # Force applications to be built non-statically + # when building the mozcomps meta component ++--- misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c.orig Thu Sep 2 08:44:37 2004 +++++ misc/build/mozilla/nsprpub/pr/src/misc/prnetdb.c Wed Jun 21 23:58:12 2006 ++@@ -105,7 +105,8 @@ ++ #define _PR_HAVE_GETPROTO_R_INT ++ #endif ++ ++-#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) +++#if (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) || \ +++ (defined(__FreeBSD__) && __FreeBSD_version > 700016) ++ #define _PR_HAVE_GETPROTO_R ++ #define _PR_HAVE_5_ARG_GETPROTO_R ++ #endif -- cgit v1.2.3