Forgot to add new patches...

10 files changed, 186 insertions, 0 deletions

diff --git a/editors/openoffice.org-2-RC/files/patch-i65974 b/editors/openoffice.org-2-RC/files/patch-i65974
new file mode 100644
index 000000000000..40de0acde40f
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i65974
@@ -0,0 +1,12 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	16 Sep 2006 17:46:13 -0000	1.7
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	22 Jun 2007 21:36:24 -0000
+@@ -94,6 +94,9 @@
+     static char const * ar[] = {
+ 
+         "/lib/" JFW_PLUGIN_ARCH "/client",
++#if SAL_TYPES_SIZEOFPOINTER == 8
++        "/lib/" JFW_PLUGIN_ARCH "/server",
++#endif
+         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
+         "/lib/" JFW_PLUGIN_ARCH
+ 
diff --git a/editors/openoffice.org-2-RC/files/patch-i78417 b/editors/openoffice.org-2-RC/files/patch-i78417
new file mode 100644
index 000000000000..fee06f2fa429
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i78417
@@ -0,0 +1,10 @@
+--- sw/source/core/bastyp/swregion.cxx
++++ sw/source/core/bastyp/swregion.cxx
+@@ -79,6 +79,7 @@
+ {
+ 	if( rDel )
+ 	{
++		pData = (SwRect*) pData;
+ 		*(pData+nPos) = rRect;
+ 		rDel = FALSE;
+ 	}
diff --git a/editors/openoffice.org-2-RC/files/patch-i78875 b/editors/openoffice.org-2-RC/files/patch-i78875
new file mode 100644
index 000000000000..aff1f83eead5
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i78875
@@ -0,0 +1,31 @@
+Index: libtextcat/libtextcat-2.2.patch
+===================================================================
+RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v
+retrieving revision 1.3
+diff -u -r1.3 libtextcat-2.2.patch
+--- libtextcat/libtextcat-2.2.patch	21 Jun 2007 16:05:43 -0000	1.3
++++ libtextcat/libtextcat-2.2.patch	25 Jun 2007 11:12:26 -0000
+@@ -18,6 +18,23 @@
+   # when you set need_version to no, make sure it does not cause -set_version
+   # flags to be left without arguments
+   archive_cmds=
++***************
++*** 6280,6286 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 6281,6287 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
+ *** misc/libtextcat-2.2/src/Makefile.in	Thu May 22 13:39:52 2003
+ --- misc/build/libtextcat-2.2/src/Makefile.in	Thu Jun 21 17:44:15 2007
+ ***************
diff --git a/editors/openoffice.org-2-RC/files/patch-i80003 b/editors/openoffice.org-2-RC/files/patch-i80003
new file mode 100644
index 000000000000..453610348c91
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i80003
@@ -0,0 +1,22 @@
+correct patch by jkim
+http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
+will be go into cws obo15.
+
+Index: libxslt/makefile.mk
+===================================================================
+RCS file: /cvs/external/libxslt/makefile.mk,v
+retrieving revision 1.7
+diff -u -r1.7 makefile.mk
+--- libxslt/makefile.mk	19 Jul 2007 11:21:19 -0000	1.7
++++ libxslt/makefile.mk	24 Jul 2007 20:33:55 -0000
+@@ -96,6 +96,10 @@
+ BUILD_DIR=$(CONFIGURE_DIR)
+ .ENDIF
+ 
++.IF "$(OS)"=="FREEBSD"
++xslt_LDFLAGS+=-L$(SOLARLIBDIR)
++.ENDIF
++
+ OUT2INC=libxslt$/*.h
+ 
+ .IF "$(OS)"=="MACOSX"
diff --git a/editors/openoffice.org-2-RC/files/patch-i80129 b/editors/openoffice.org-2-RC/files/patch-i80129
new file mode 100644
index 000000000000..90fd4ceb9dc5
--- /dev/null
+++ b/editors/openoffice.org-2-RC/files/patch-i80129
@@ -0,0 +1,18 @@
+Merely a workaround
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.14
+diff -u -r1.14 ure.scp
+--- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
++++ scp2/source/ure/ure.scp	27 Jul 2007 22:07:16 -0000
+@@ -610,6 +610,8 @@
+ #endif
+ #elif defined MACOSX
+     Name = SCP2_URE_DL_NORMAL(xml2.2);
++#elif defined FREEBSD
++    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
+ #else
+     Name = SCP2_URE_DL_VER(xml2, 2);
+ #endif
diff --git a/editors/openoffice.org-3-RC/files/patch-i65974 b/editors/openoffice.org-3-RC/files/patch-i65974
new file mode 100644
index 000000000000..40de0acde40f
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i65974
@@ -0,0 +1,12 @@
+--- jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	16 Sep 2006 17:46:13 -0000	1.7
++++ jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx	22 Jun 2007 21:36:24 -0000
+@@ -94,6 +94,9 @@
+     static char const * ar[] = {
+ 
+         "/lib/" JFW_PLUGIN_ARCH "/client",
++#if SAL_TYPES_SIZEOFPOINTER == 8
++        "/lib/" JFW_PLUGIN_ARCH "/server",
++#endif
+         "/lib/" JFW_PLUGIN_ARCH "/native_threads", 
+         "/lib/" JFW_PLUGIN_ARCH
+ 
diff --git a/editors/openoffice.org-3-RC/files/patch-i78417 b/editors/openoffice.org-3-RC/files/patch-i78417
new file mode 100644
index 000000000000..fee06f2fa429
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i78417
@@ -0,0 +1,10 @@
+--- sw/source/core/bastyp/swregion.cxx
++++ sw/source/core/bastyp/swregion.cxx
+@@ -79,6 +79,7 @@
+ {
+ 	if( rDel )
+ 	{
++		pData = (SwRect*) pData;
+ 		*(pData+nPos) = rRect;
+ 		rDel = FALSE;
+ 	}
diff --git a/editors/openoffice.org-3-RC/files/patch-i78875 b/editors/openoffice.org-3-RC/files/patch-i78875
new file mode 100644
index 000000000000..aff1f83eead5
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i78875
@@ -0,0 +1,31 @@
+Index: libtextcat/libtextcat-2.2.patch
+===================================================================
+RCS file: /cvs/external/libtextcat/libtextcat-2.2.patch,v
+retrieving revision 1.3
+diff -u -r1.3 libtextcat-2.2.patch
+--- libtextcat/libtextcat-2.2.patch	21 Jun 2007 16:05:43 -0000	1.3
++++ libtextcat/libtextcat-2.2.patch	25 Jun 2007 11:12:26 -0000
+@@ -18,6 +18,23 @@
+   # when you set need_version to no, make sure it does not cause -set_version
+   # flags to be left without arguments
+   archive_cmds=
++***************
++*** 6280,6286 ****
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
++--- 6281,6287 ----
++    ;;
++  
++  freebsd*)
++!   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo elf`
++    version_type=freebsd-$objformat
++    case $version_type in
++      freebsd-elf*)
+ *** misc/libtextcat-2.2/src/Makefile.in	Thu May 22 13:39:52 2003
+ --- misc/build/libtextcat-2.2/src/Makefile.in	Thu Jun 21 17:44:15 2007
+ ***************
diff --git a/editors/openoffice.org-3-RC/files/patch-i80003 b/editors/openoffice.org-3-RC/files/patch-i80003
new file mode 100644
index 000000000000..453610348c91
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i80003
@@ -0,0 +1,22 @@
+correct patch by jkim
+http://www.openoffice.org/nonav/issues/showattachment.cgi/47084/patch-i80003
+will be go into cws obo15.
+
+Index: libxslt/makefile.mk
+===================================================================
+RCS file: /cvs/external/libxslt/makefile.mk,v
+retrieving revision 1.7
+diff -u -r1.7 makefile.mk
+--- libxslt/makefile.mk	19 Jul 2007 11:21:19 -0000	1.7
++++ libxslt/makefile.mk	24 Jul 2007 20:33:55 -0000
+@@ -96,6 +96,10 @@
+ BUILD_DIR=$(CONFIGURE_DIR)
+ .ENDIF
+ 
++.IF "$(OS)"=="FREEBSD"
++xslt_LDFLAGS+=-L$(SOLARLIBDIR)
++.ENDIF
++
+ OUT2INC=libxslt$/*.h
+ 
+ .IF "$(OS)"=="MACOSX"
diff --git a/editors/openoffice.org-3-RC/files/patch-i80129 b/editors/openoffice.org-3-RC/files/patch-i80129
new file mode 100644
index 000000000000..90fd4ceb9dc5
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/patch-i80129
@@ -0,0 +1,18 @@
+Merely a workaround
+
+Index: scp2/source/ure/ure.scp
+===================================================================
+RCS file: /cvs/installation/scp2/source/ure/ure.scp,v
+retrieving revision 1.14
+diff -u -r1.14 ure.scp
+--- scp2/source/ure/ure.scp	18 Jul 2007 08:07:32 -0000	1.14
++++ scp2/source/ure/ure.scp	27 Jul 2007 22:07:16 -0000
+@@ -610,6 +610,8 @@
+ #endif
+ #elif defined MACOSX
+     Name = SCP2_URE_DL_NORMAL(xml2.2);
++#elif defined FREEBSD
++    Name = STRING(CONCAT3(libxml2,UNXSUFFIX,.2.6.17));
+ #else
+     Name = SCP2_URE_DL_VER(xml2, 2);
+ #endif