diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-java/xerces/files/xerces-2.11.0-build.xml.patch | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-java/xerces/files/xerces-2.11.0-build.xml.patch')
-rw-r--r-- | dev-java/xerces/files/xerces-2.11.0-build.xml.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/dev-java/xerces/files/xerces-2.11.0-build.xml.patch b/dev-java/xerces/files/xerces-2.11.0-build.xml.patch new file mode 100644 index 000000000000..61afcddad9a4 --- /dev/null +++ b/dev-java/xerces/files/xerces-2.11.0-build.xml.patch @@ -0,0 +1,46 @@ +Author: Ralph Sennhauser <sera@gentoo.org> + +Don't reference non existing jar in taskdef. #351394 +Don't let user properties leak into build env. +Don't bundle stuff from xml-commons-external. + +--- a/build.xml ++++ b/build.xml +@@ -39,18 +39,13 @@ Authors: + <property name="tools.dir" value="./tools"/>
+
+ <!-- enable compilation under JDK 1.4 and above -->
+- <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
+- <classpath>
+- <pathelement location="${tools.dir}/bin/xjavac.jar"/>
+- </classpath>
+- </taskdef>
++ <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac"/>
+
+ <!-- Allow properties following these statements to be overridden -->
+ <!-- Note that all of these don't have to exist. They've just been defined
+ incase they are used. -->
+ <property file="build.properties"/>
+ <property file=".ant.properties"/>
+- <property file="${user.home}/.ant.properties"/>
+ <property file="default.properties"/>
+
+ <target name="init">
+@@ -247,7 +242,7 @@ Authors: + <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
+ tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
+
+- <!-- now deal with API's: -->
++ <!-- now deal with API's:
+ <unzip src="${src.apis.zip}" dest="${build.src}">
+ <patternset
+ includes="org/xml/sax/**
+@@ -269,7 +264,7 @@ Authors: + org/w3c/dom/views/**
+ org/w3c/dom/xpath/**"
+ />
+- </unzip>
++ </unzip> -->
+
+ <!-- substitute tokens as needed -->
+ <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java"
|