diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2016-06-25 02:50:23 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2016-06-25 02:50:23 -0500 |
| commit | 9342ad3c5cf23768d1b5cf50c1d812ae9c796220 (patch) | |
| tree | 211c293856d3287f2237c806859c3b4dc3f6c117 /pcr/apache-ant-contrib/apache-ant-contrib-parabolize.patch | |
| parent | 005b88507f19d576c9296fcf0e1de3c78ff549a3 (diff) | |
| download | abslibre-9342ad3c5cf23768d1b5cf50c1d812ae9c796220.tar.gz abslibre-9342ad3c5cf23768d1b5cf50c1d812ae9c796220.tar.bz2 abslibre-9342ad3c5cf23768d1b5cf50c1d812ae9c796220.zip | |
apache-ant-contrib-1.0b5-1.parabola1: updating version
Diffstat (limited to 'pcr/apache-ant-contrib/apache-ant-contrib-parabolize.patch')
| -rw-r--r-- | pcr/apache-ant-contrib/apache-ant-contrib-parabolize.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/pcr/apache-ant-contrib/apache-ant-contrib-parabolize.patch b/pcr/apache-ant-contrib/apache-ant-contrib-parabolize.patch new file mode 100644 index 000000000..244a513e9 --- /dev/null +++ b/pcr/apache-ant-contrib/apache-ant-contrib-parabolize.patch @@ -0,0 +1,53 @@ +--- ant-contrib-1.0b3.orig/build.xml 2016-06-25 00:18:39.274662000 -0500 ++++ ant-contrib-1.0b3/build.xml 2016-06-25 01:52:50.547085640 -0500 +@@ -53,12 +53,12 @@ +
+ <target name="init" unless="no-ivy">
+ <path id="ivy.lib.path">
+- <fileset dir="lib/ivy/jars" includes="ivy-2.0.0.jar"/>
+- <fileset dir="lib/commons-cli/jars" includes="commons-cli-1.0.jar"/>
+- <fileset dir="lib/commons-codec/jars" includes="commons-codec-1.3.jar"/>
+- <fileset dir="lib/commons-httpclient/jars" includes="commons-httpclient-3.0.1.jar"/>
+- <fileset dir="lib/commons-logging/jars" includes="commons-logging-1.0.4.jar"/>
+- <fileset dir="lib/oro/jars" includes="oro-2.0.8.jar"/>
++ <fileset dir="/usr/share/java/apache-ivy" includes="ivy.jar"/>
++ <fileset dir="/usr/share/java" includes="commons-cli.jar"/>
++ <fileset dir="/usr/share/java" includes="commons-codec.jar"/>
++ <fileset dir="/usr/share/java" includes="commons-httpclient.jar"/>
++ <fileset dir="/usr/share/java" includes="commons-logging.jar"/>
++ <fileset dir="/usr/share/java" includes="oro.jar"/>
+ </path>
+
+ <taskdef resource="org/apache/ivy/ant/antlib.xml"
+@@ -109,6 +109,7 @@ + classpathref="compile.classpath"
+ source="${jdk.source}"
+ target="${jdk.target}"
++ excludes="**/Ivy14Adapter.java"
+ />
+
+ <copy todir="${target.classes.dir}">
+--- ant-contrib-1.0b3.orig/ivysettings.xml 2016-06-25 00:18:38.381370000 -0500 ++++ ant-contrib-1.0b3/ivysettings.xml 2016-06-25 01:48:32.389967175 -0500 +@@ -5,8 +5,8 @@ + + <resolvers> + <filesystem name="local"> +- <ivy pattern="${ivy.conf.dir}/lib/[module]/ivy-[revision].xml" /> +- <artifact pattern="${ivy.conf.dir}/lib/[module]/[ext]s/[artifact]-[revision].[ext]" /> ++ <ivy pattern="${ivy.conf.dir}/ivy-[revision].xml" /> ++ <artifact pattern="/usr/share/java/[artifact].[ext]" /> + </filesystem> + + +--- ant-contrib-1.0b3.orig/src/main/java/net/sf/antcontrib/net/URLImportTask.java 2016-06-25 00:18:38.968009000 -0500 ++++ ant-contrib-1.0b3/src/main/java/net/sf/antcontrib/net/URLImportTask.java 2016-06-25 01:46:26.712467308 -0500 +@@ -158,7 +158,7 @@ + adapter = new Ivy20Adapter();
+ }
+ catch (ClassNotFoundException e) {
+- adapter = new Ivy14Adapter();
++ // adapter = new Ivy14Adapter();
+ }
+
+ String setId = org + "." + module + "." + rev + ".fileset";
|