diff options
| author | Palica <palica+gitlab@liguros.net> | 2020-06-23 22:35:08 +0200 |
|---|---|---|
| committer | Palica <palica+gitlab@liguros.net> | 2020-06-23 22:35:08 +0200 |
| commit | ecdac123787b96ce6649f0f91da12ea6458cc2b1 (patch) | |
| tree | b89c74d9e6fe6e8aebc4c77bcbeb4ab73214127d /dev-java/xom/files | |
| parent | 1be72aa41cf41dedadeecf59dca9f01de6381f5e (diff) | |
| download | baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.tar.gz baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.tar.xz baldeagleos-repo-ecdac123787b96ce6649f0f91da12ea6458cc2b1.zip | |
Updating liguros repo
Diffstat (limited to 'dev-java/xom/files')
| -rw-r--r-- | dev-java/xom/files/xom-1.2.6.patch | 49 | ||||
| -rw-r--r-- | dev-java/xom/files/xom-strip-fallback-parser.patch | 18 |
2 files changed, 67 insertions, 0 deletions
diff --git a/dev-java/xom/files/xom-1.2.6.patch b/dev-java/xom/files/xom-1.2.6.patch new file mode 100644 index 000000000000..3187e437306b --- /dev/null +++ b/dev-java/xom/files/xom-1.2.6.patch @@ -0,0 +1,49 @@ +diff -Nur XOM/build.xml XOM_patched/build.xml +--- XOM/build.xml 2010-06-21 06:03:14.000000000 +0300 ++++ XOM_patched/build.xml 2011-03-13 07:05:01.000000000 +0200 +@@ -21,7 +21,6 @@ + subject line. The XOM home page is http://www.xom.nu/ + --> + <project name="XOM" default="help" basedir="."> +- + <description> + Build XOM + </description> +@@ -71,7 +70,7 @@ + <property name="jaxen.dir" value="${build.dir}/jaxen-classes"/> + + <property name="xml-apis.jar" value="${lib.dir}/xml-apis.jar"/> +- <property name="parser.jar" value="${lib.dir}/dtd-xercesImpl.jar"/> ++ <property name="parser.jar" value="${lib.dir}/xercesImpl.jar"/> + <property name="xslt.jar" value="${lib.dir}/xalan.jar"/> + <property name="serializer.jar" value="${lib.dir}/serializer.jar"/> + <property name="tagsoup.jar" value="${lib2.dir}/tagsoup-1.2.jar"/> +@@ -226,7 +225,7 @@ + encoding="UTF-8" + fork="true" + includeAntRuntime="false" +- excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java"> ++excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/"> + <classpath refid="compile.class.path"/> + </javac> + <copy file="${build.src}/nu/xom/characters.dat" tofile="${build.dest}/nu/xom/characters.dat"/> +@@ -323,7 +322,7 @@ + + <target name="jar" depends="compile" description="Create xom.jar"> + <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" +- classpath="${lib.dir}/jarjar-1.0.jar"/> ++ classpath="${lib.dir}/jarjar.jar"/> + <jarjar jarfile="${build.dir}/${name}-${version}.jar" + basedir="${build.dest}" + index="no" +@@ -862,8 +861,8 @@ + </target> + + +- <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen"> +- <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main" ++ <target name="compile-jaxen" description="Compile Jaxen"> ++ <javac srcdir="lib/jaxen-${jaxenversion}/src/java/main" + destdir="${build.dir}/jaxen-classes" + debug="${debug}" + optimize="${optimize}" diff --git a/dev-java/xom/files/xom-strip-fallback-parser.patch b/dev-java/xom/files/xom-strip-fallback-parser.patch new file mode 100644 index 000000000000..49a324ef2dad --- /dev/null +++ b/dev-java/xom/files/xom-strip-fallback-parser.patch @@ -0,0 +1,18 @@ +Author: Ralph Sennhauser <sera@gentoo.org> + +Don't build and install fallback parser relying on internel classes of +SUNs/Oracles JVM >= 1.5. This allows building xom using ibm-jdk-bin. #399119 + +--- /tmp/build.xml ++++ /tmp/build.xml +@@ -235,10 +235,6 @@ + <echo file="${build.dest}/nu/xom/version.txt">${version}</echo> + + <copy file="${build.src}/nu/xom/compositions.dat" tofile="${build.dest}/nu/xom/compositions.dat" /> +- +- <!-- This file requires Java 1.5 to generate so we compile it with a +- different target and copy it over here. --> +- <copy file="classes15/nu/xom/JDK15XML1_0Parser.class" tofile="${build.dest}/nu/xom/JDK15XML1_0Parser.class"/> + </target> + + |