diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/xom/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
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> + + |