aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice.org-vcltesttool/files/patch-i93235
diff options
context:
space:
mode:
Diffstat (limited to 'editors/openoffice.org-vcltesttool/files/patch-i93235')
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-i93235102
1 files changed, 0 insertions, 102 deletions
diff --git a/editors/openoffice.org-vcltesttool/files/patch-i93235 b/editors/openoffice.org-vcltesttool/files/patch-i93235
deleted file mode 100644
index 8f50a337c76f..000000000000
--- a/editors/openoffice.org-vcltesttool/files/patch-i93235
+++ /dev/null
@@ -1,102 +0,0 @@
---- /dev/null 2008-08-27 17:05:37.000000000 -0400
-+++ jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 2008-08-27 17:20:55.000000000 -0400
-@@ -0,0 +1,38 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+
-+<javaSelection xmlns="http://openoffice.org/2004/java/framework/1.0"
-+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-+
-+ <updated>2008-08-27</updated>
-+
-+ <vendorInfos>
-+ <vendor name="Sun Microsystems Inc.">
-+ <minVersion>1.3.1</minVersion>
-+ </vendor>
-+ <vendor name="The FreeBSD Foundation">
-+ <minVersion>1.6.0</minVersion>
-+ </vendor>
-+ <vendor name="IBM Corporation">
-+ <minVersion>1.3.1</minVersion>
-+ <maxVersion>1.4.2</maxVersion>
-+ </vendor>
-+ <vendor name="Blackdown Java-Linux Team">
-+ <minVersion>1.3.1</minVersion>
-+ </vendor>
-+ <vendor name="Free Software Foundation, Inc.">
-+ <minVersion>1.4.2</minVersion>
-+ </vendor>
-+ <vendor name="BEA Systems, Inc.">
-+ <minVersion>1.4.1</minVersion>
-+ </vendor>
-+ </vendorInfos>
-+
-+ <plugins>
-+ <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ <library vendor="The FreeBSD Foundation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ <library vendor="BEA Systems, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
-+ </plugins>
-+</javaSelection>
-
-Index: jvmfwk/distributions/OpenOfficeorg/makefile.mk
-===================================================================
-RCS file: /cvs/udk/jvmfwk/distributions/OpenOfficeorg/makefile.mk,v
-retrieving revision 1.7
-diff -u -r1.7 makefile.mk
---- jvmfwk/distributions/OpenOfficeorg/makefile.mk 2 Nov 2007 12:26:51 -0000 1.7
-+++ jvmfwk/distributions/OpenOfficeorg/makefile.mk 28 Aug 2008 23:58:26 -0000
-@@ -47,9 +47,11 @@
- .IF "$(SOLAR_JAVA)"!=""
- $(BIN)$/javavendors_ooo.xml: javavendors_unx.xml javavendors_wnt.xml javavendors_macosx.xml javavendors_linux.xml
- .IF "$(GUI)"=="UNX"
--.IF "$(OS)"=="MACOSX"
-+.IF "$(OS)"=="FREEBSD"
-+ -$(COPY) javavendors_freebsd.xml $(BIN)$/javavendors_ooo.xml
-+.ELIF "$(OS)"=="MACOSX"
- -$(COPY) javavendors_macosx.xml $(BIN)$/javavendors_ooo.xml
--.ELIF "$(OS)"=="LINUX" || "$(OS)"=="FREEBSD"
-+.ELIF "$(OS)"=="LINUX"
- -$(COPY) javavendors_linux.xml $(BIN)$/javavendors_ooo.xml
- .ELSE
- -$(COPY) javavendors_unx.xml $(BIN)$/javavendors_ooo.xml
-Index: jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx,v
-retrieving revision 1.14
-diff -u -r1.14 javaldx.cxx
---- jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 12 Nov 2007 15:31:19 -0000 1.14
-+++ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 28 Aug 2008 23:58:26 -0000
-@@ -133,13 +133,15 @@
- rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
- rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
- rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
-+ rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
- if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
- || sVendor2.equals(pInfo->sVendor) == sal_True
- || sVendor3.equals(pInfo->sVendor) == sal_True
- || sVendor4.equals(pInfo->sVendor) == sal_True
- || sVendor5.equals(pInfo->sVendor) == sal_True
- || sVendor6.equals(pInfo->sVendor) == sal_True
-- || sVendor7.equals(pInfo->sVendor) == sal_True))
-+ || sVendor7.equals(pInfo->sVendor) == sal_True
-+ || sVendor8.equals(pInfo->sVendor) == sal_True))
- return 0;
-
- rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
-Index: jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
-===================================================================
-RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx,v
-retrieving revision 1.9
-diff -u -r1.9 vendorlist.cxx
---- jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 12 Nov 2007 15:31:32 -0000 1.9
-+++ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 28 Aug 2008 23:58:26 -0000
-@@ -61,6 +61,7 @@
- VENDOR_MAP_ENTRY("Apple Computer, Inc.", OtherInfo)
- VENDOR_MAP_ENTRY("BEA Systems, Inc.", OtherInfo)
- VENDOR_MAP_ENTRY("Free Software Foundation, Inc.", GnuInfo)
-+ VENDOR_MAP_ENTRY("The FreeBSD Foundation", OtherInfo)
- END_VENDOR_MAP()
-
-