ooo-build r13536 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Wed Aug 13 01:37:16 2008
New Revision: 13536
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13536&view=rev

Log:
2008-08-12  Rene Engelhard  <rene debian org>

        * patches/dev300/buildfix-openjdk-6-no-rhino.diff,
          patches/dev300/apply: fix build with OpenJDK 6 (containing a new
          rhino) by using -Xbootclasspath (DebianSidOnly, copy it when you
          need it)


Added:
   trunk/patches/dev300/buildfix-openjdk-6-no-rhino.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Aug 13 01:37:16 2008
@@ -1719,6 +1719,8 @@
 static-libs-use-_pic.diff, rengelha
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
+# openjdk contains rhino.jar. breaks the build...
+buildfix-openjdk-6-no-rhino.diff
 
 [ UbuntuOnly ]
 human-icons-add.diff, mklose

Added: trunk/patches/dev300/buildfix-openjdk-6-no-rhino.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/buildfix-openjdk-6-no-rhino.diff	Wed Aug 13 01:37:16 2008
@@ -0,0 +1,42 @@
+? unxlngx6.pro
+Index: rhino1_5R5.patch
+===================================================================
+RCS file: /cvs/external/rhino/rhino1_5R5.patch,v
+retrieving revision 1.3
+diff -u -r1.3 rhino1_5R5.patch
+--- rhino/rhino1_5R5.patch	11 Apr 2008 07:03:06 -0000	1.3
++++ rhino/rhino1_5R5.patch	12 Aug 2008 20:08:16 -0000
+@@ -1174,3 +1174,14 @@
+          PermissionCollection pc = Policy.getPolicy().getPermissions(cs);
+          return new ProtectionDomain(cs, pc);
+      }
++--- misc/rhino1_5R5/toolsrc/build.xml	2004-03-25 17:54:34.000000000 -0300
+++++ misc/build/rhino1_5R5/toolsrc/build.xml	2008-08-12 16:58:52.000000000 -0
++va	Fri Mar 28 17:24:23 2008
++@@ -68,6 +32,7 @@
++            includes="org/**/*.java"
++            deprecation="on"
++            debug="${debug}">
+++      <compilerarg value="-Xbootclasspath:${java.home}/jre/lib/rt.jar"/>
++     </javac>
++     <copy todir="${nest}/${classes}">
++       <fileset dir="." includes="org/**/*.properties" />
+? unxlngx6.pro
+Index: java/build.xml
+===================================================================
+RCS file: /cvs/framework/scripting/java/build.xml,v
+retrieving revision 1.36
+diff -u -r1.36 build.xml
+--- scripting/java/build.xml	11 Apr 2008 09:46:13 -0000	1.36
++++ scripting/java/build.xml	12 Aug 2008 23:20:31 -0000
+@@ -85,7 +85,9 @@
+   <target name="compile" depends="prepare">
+     <javac srcdir="com" destdir="${jardir}"
+          includes="**/*.java" classpathref="idlclasspath"
+-         debug="${debug}" optimize="${optimize}" deprecation="off"/>
++         debug="${debug}" optimize="${optimize}" deprecation="off">
++	 <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">