ooo-build r13813 - in branches/ooo-build-2-4-1: . patches/src680

[ccheney svn gnome org]

Author: ccheney
Date: Fri Sep  5 18:26:52 2008
New Revision: 13813
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13813&view=rev

Log:
2008-09-05  Chris Cheney  <ccheney ubuntu com>

        * patches/src680/apply:
        * patches/src680/buildfix-openjdk-6-no-rhino.diff: add patch
        from ooo-build-3-0 to allow building rhino with openjdk-6.


Added:
   branches/ooo-build-2-4-1/patches/src680/buildfix-openjdk-6-no-rhino.diff
Modified:
   branches/ooo-build-2-4-1/ChangeLog
   branches/ooo-build-2-4-1/patches/src680/apply

Modified: branches/ooo-build-2-4-1/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4-1/patches/src680/apply	(original)
+++ branches/ooo-build-2-4-1/patches/src680/apply	Fri Sep  5 18:26:52 2008
@@ -62,8 +62,6 @@
 UbuntuBased : DebianBase, UbuntuOnly
 UbuntuDapper : UbuntuBased, UbuntuDapperOnly, Debian32Only
 UbuntuDapper64 : UbuntuBased, UbuntuDapperOnly
-UbuntuFeisty : UbuntuBased, CairoFonts, UbuntuFeistyOnly, Debian32Only
-UbuntuFeisty64 : UbuntuBased, CairoFonts, UbuntuFeistyOnly
 UbuntuGutsy : UbuntuBased, CairoFonts, UbuntuGutsyOnly, Debian32Only
 UbuntuGutsy64 : UbuntuBased, CairoFonts, UbuntuGutsyOnly
 UbuntuHardy : UbuntuBased, CairoFonts, UbuntuHardyOnly, Debian32Only
@@ -1463,6 +1461,7 @@
 ubuntu-dictionary.diff
 ubuntu-lpi.diff, i#64895, mklose
 ubuntu-sparc-hack.diff, mklose
+buildfix-openjdk-6-no-rhino.diff, rene
 
 
 [ Mono ]
@@ -1909,14 +1908,6 @@
 # use -llpsolve55_pic
 system-lpsolve-use-_pic.diff, rengelha
 
-[ UbuntuFeistyOnly ]
-static-libs-use-_pic.diff, rengelha
-unxlngi6-notune.diff, doko
-ubuntu-no-stack-protector.diff, doko
-# use -llpsolve55_pic
-system-lpsolve-use-_pic.diff, rengelha
-#gccXXXXX.solenv.javaregistration.diff
-
 [ UbuntuGutsyOnly ]
 static-libs-use-_pic.diff, rengelha
 unxlngi6-notune.diff, doko

Added: branches/ooo-build-2-4-1/patches/src680/buildfix-openjdk-6-no-rhino.diff
==============================================================================
--- (empty file)
+++ branches/ooo-build-2-4-1/patches/src680/buildfix-openjdk-6-no-rhino.diff	Fri Sep  5 18:26:52 2008
@@ -0,0 +1,33 @@
+--- rhino/rhino1_5R5.patch	2008-09-05 04:51:35 +0000
++++ rhino/rhino1_5R5.patch	2008-09-05 05:12:34 +0000
+@@ -1518,3 +1518,14 @@
+ + 
+   }
+   
++--- misc/build/rhino1_5R5/toolsrc/build.xml	2008-09-05 04:51:35 +0000
+++++ misc/build/rhino1_5R5/toolsrc/build.xml	2008-09-05 04:53:30 +0000
++@@ -34,6 +34,7 @@
++            source="${java.source.ver}" 
++            target="${java.target.ver}"
++            debug="${debug}">
+++      <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
++     </javac>
++     <copy todir="${nest}/${classes}">
++       <fileset dir="." includes="org/**/*.properties" />
++
+
+=== modified file 'scripting/java/build.xml'
+--- scripting/java/build.xml	2008-09-05 05:33:10 +0000
++++ scripting/java/build.xml	2008-09-05 05:38:09 +0000
+@@ -90,7 +90,9 @@
+     <javac srcdir="com" destdir="${jardir}"
+          includes="**/*.java" classpathref="idlclasspath"
+          debug="${debug}" optimize="${optimize}" deprecation="off"
+-	 source="${java.source.ver}" target="${java.target.ver}"/>
++	 source="${java.source.ver}" target="${java.target.ver}">
++	 <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
++    </javac>
+     <javac srcdir="Framework/" destdir="${jardir}"
+          includes="**/*.java" classpathref="idlclasspath" debug="${debug}" 
+          optimize="${optimize}" deprecation="off"
+