[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Petr Mladek]

 patches/dev300/apply                      |    3 +++
 patches/dev300/build-java-1.4-enable.diff |    6 +-----
 patches/dev300/jvmfwk-disable-gcj.diff    |   20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit 372fc7b7a67c840464ec8ff8454512866604ed79
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu May 20 17:46:12 2010 +0200

    Disabled gcj in supported JRE's (NovellLinuxOnly)
    
    * patches/dev300/jvmfwk-disable-gcj.diff: disable gcj in javavendors_linux.xml;
      OOo newer really worked with it
    * patches/dev300/apply: apply the above diff in NovellLinuxOnly section
    * patches/dev300/build-java-1.4-enable.diff: update to apply

diff --git a/patches/dev300/apply b/patches/dev300/apply
index a1d4727..a8ed7f9 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -613,6 +613,9 @@ mysqlcppconn-static-mysql-binding.diff, pmladek
 # Push fonts into the ps stream always
 pushfont-psstream.diff, i#84481, michael
 
+# ignore gcj; OOo newer worked well with it
+jvmfwk-disable-gcj.diff
+
 [ BrokenSystemNSS ]
 # fix build with system libnss installed apart from mozilla
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
diff --git a/patches/dev300/build-java-1.4-enable.diff b/patches/dev300/build-java-1.4-enable.diff
index 7a5fd2d..89fbd69 100644
--- a/patches/dev300/build-java-1.4-enable.diff
+++ b/patches/dev300/build-java-1.4-enable.diff
@@ -13,7 +13,7 @@
          JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"`
 --- jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml.old	2009-02-12 14:50:55.000000000 +0100
 +++ jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml	2009-02-19 12:07:59.000000000 +0100
-@@ -7,19 +7,19 @@
+@@ -7,16 +7,16 @@
   
   <vendorInfos> 
    <vendor name="Sun Microsystems Inc.">
@@ -28,10 +28,6 @@
 -    <minVersion>1.5.0</minVersion>
 +    <minVersion>1.4.2</minVersion>
    </vendor>
-   <vendor name="Free Software Foundation, Inc.">
--    <minVersion>1.5.0</minVersion>
-+    <minVersion>1.4.2</minVersion>
-   </vendor>
    <vendor name="BEA Systems, Inc.">
 -    <minVersion>1.5.0</minVersion>
 +    <minVersion>1.4.1</minVersion>
diff --git a/patches/dev300/jvmfwk-disable-gcj.diff b/patches/dev300/jvmfwk-disable-gcj.diff
new file mode 100644
index 0000000..5f100dc
--- /dev/null
+++ b/patches/dev300/jvmfwk-disable-gcj.diff
@@ -0,0 +1,20 @@
+--- jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml.old	2010-04-28 11:35:17.000000000 +0200
++++ jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml	2010-05-20 17:23:46.000000000 +0200
+@@ -15,9 +15,6 @@
+   <vendor name="Blackdown Java-Linux Team">
+     <minVersion>1.5.0</minVersion>
+   </vendor>
+-  <vendor name="Free Software Foundation, Inc.">
+-    <minVersion>1.5.0</minVersion>
+-  </vendor>
+   <vendor name="BEA Systems, Inc.">
+     <minVersion>1.5.0</minVersion>
+   </vendor>
+@@ -27,7 +24,6 @@
+   <library vendor="Sun Microsystems Inc.">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>