1 |
sera 12/05/26 11:19:59 |
2 |
|
3 |
Added: xerces-2.11.0-build.xml.patch |
4 |
Log: |
5 |
Security bump. #280611 |
6 |
Don't let taskdef point to non-existent jar. #351394 |
7 |
|
8 |
(Portage version: 2.1.10.62/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 dev-java/xerces/files/xerces-2.11.0-build.xml.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xerces/files/xerces-2.11.0-build.xml.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/xerces/files/xerces-2.11.0-build.xml.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: xerces-2.11.0-build.xml.patch |
17 |
=================================================================== |
18 |
Author: Ralph Sennhauser <sera@g.o> |
19 |
|
20 |
Don't reference non existing jar in taskdef. #351394 |
21 |
Don't let user properties leak into build env. |
22 |
Don't bundle stuff from xml-commons-external. |
23 |
|
24 |
--- a/build.xml |
25 |
+++ b/build.xml |
26 |
@@ -39,18 +39,13 @@ Authors: |
27 |
<property name="tools.dir" value="./tools"/> |
28 |
|
29 |
<!-- enable compilation under JDK 1.4 and above --> |
30 |
- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"> |
31 |
- <classpath> |
32 |
- <pathelement location="${tools.dir}/bin/xjavac.jar"/> |
33 |
- </classpath> |
34 |
- </taskdef> |
35 |
+ <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/> |
36 |
|
37 |
<!-- Allow properties following these statements to be overridden --> |
38 |
<!-- Note that all of these don't have to exist. They've just been defined |
39 |
incase they are used. --> |
40 |
<property file="build.properties"/> |
41 |
<property file=".ant.properties"/> |
42 |
- <property file="${user.home}/.ant.properties"/> |
43 |
<property file="default.properties"/> |
44 |
|
45 |
<target name="init"> |
46 |
@@ -247,7 +242,7 @@ Authors: |
47 |
<copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties" |
48 |
tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/> |
49 |
|
50 |
- <!-- now deal with API's: --> |
51 |
+ <!-- now deal with API's: |
52 |
<unzip src="${src.apis.zip}" dest="${build.src}"> |
53 |
<patternset |
54 |
includes="org/xml/sax/** |
55 |
@@ -269,7 +264,7 @@ Authors: |
56 |
org/w3c/dom/views/** |
57 |
org/w3c/dom/xpath/**" |
58 |
/> |
59 |
- </unzip> |
60 |
+ </unzip> --> |
61 |
|
62 |
<!-- substitute tokens as needed --> |
63 |
<replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" |