diff options
| author |   Serkan Kaba <serkan@gentoo.org> | 2011-03-13 05:17:22 +0000 |
|---|---|---|
| committer | Serkan Kaba <serkan@gentoo.org> | 2011-03-13 05:17:22 +0000 |
| commit | a79c5070404fa4a0d98ad4fd04520374d2c9a044 (patch) | |
| tree | 70435b38a346371deefdd7387f0e42d0fb1e4203 /dev-java/xom/files | |
| parent | Revert bittorrent mask temporarily for bug #358485. (diff) | |
| download | gentoo-2-a79c5070404fa4a0d98ad4fd04520374d2c9a044.tar.gz gentoo-2-a79c5070404fa4a0d98ad4fd04520374d2c9a044.tar.bz2 gentoo-2-a79c5070404fa4a0d98ad4fd04520374d2c9a044.zip | |
Version bump to fix bug #146593. Thanks to Kenneth Prugh <ken69267@gentoo.org> for his hard work in the bug.
(Portage version: 2.2.0_alpha26/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/xom/files')
| -rw-r--r-- | dev-java/xom/files/xom-1.2.6.patch | 49 |
1 files changed, 49 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}" |