fix baseline build (old cairo) - 'cairo_rectangle_int_t' does not name a type
[LibreOffice.git] / external / beanshell / bsh-2.0b1-src.patch
blob6124f18d197f10dd44f0fb38776d2967612df176
1 --- misc/BeanShell/build.xml Fri Dec 19 17:14:27 2003
2 +++ misc/build/BeanShell/build.xml Fri Mar 28 15:55:04 2008
3 @@ -10,7 +10,7 @@
4 - Why can't I nest filesets? This seems like it would be so easy and
5 useful...
6 -->
7 -<project name="beanshell" default="compile" basedir=".">
8 +<project name="beanshell" default="jarall" basedir=".">
10 <!-- Project Configuration -->
12 @@ -65,6 +65,9 @@
13 <property name="exclude-engine" value="bsh/engine/**"/>
14 -->
16 + <property name="exclude-bsf"
17 + value="bsh/util/BeanShellBSFEngine.java,TestBshBSF.java"/>
19 <!-- Uncomment to build without the ASM class generator code.
20 <property name="exclude-classgen"
21 value="bsh/org/objectweb/asm/**,bsh/ClassGeneratorImpl.java,bsh/ClassGeneratorUtil.java,bsh/DelayedEvalBshMethod.java"/>
22 @@ -75,6 +78,9 @@
23 value="bsh/servlet/*"/>
24 -->
26 + <property name="exclude-servlet"
27 + value="bsh/servlet/*"/>
29 <!-- Legacy excludes. Comment this *out* to build these legacy items -->
30 <property name="excludes-legacy"
31 value="bsh/JThis.java"/>
32 --- misc/BeanShell/src/bsh/classpath/BshClassPath.java 2003-12-19 17:14:28.000000000 +0100
33 +++ misc/build/BeanShell/src/bsh/classpath/BshClassPath.java 2014-07-22 21:02:52.000000000 +0200
34 @@ -36,6 +36,7 @@
35 import bsh.StringUtil;
36 import bsh.ClassPathException;
37 import java.lang.ref.WeakReference;
38 +import java.lang.SecurityException;
39 import bsh.NameSource;
41 /**
42 @@ -659,6 +660,8 @@
43 URL url = new File( rtjar ).toURI().toURL();
44 bootClassPath = new BshClassPath(
45 "Boot Class Path", new URL[] { url } );
46 + } catch ( SecurityException e ) {
47 + throw new ClassPathException(" can't access to boot jar: "+e);
48 } catch ( MalformedURLException e ) {
49 throw new ClassPathException(" can't find boot jar: "+e);