monsieurp 15/05/12 17:03:34 Modified: pdfbox-1.8.8-build.xml.patch Log: Add RESTRICT=test back and turn off tests. Correct wrong slots. Fix bug 549110. Signed-off-by: Patrice Clement <monsie...@gentoo.org> (Portage version: 2.2.14/cvs/Linux i686, signed Manifest commit with key 93491BB8)
Revision Changes Path 1.2 dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch?r1=1.1&r2=1.2 Index: pdfbox-1.8.8-build.xml.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/dev-java/pdfbox/files/pdfbox-1.8.8-build.xml.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pdfbox-1.8.8-build.xml.patch 21 Feb 2015 14:29:15 -0000 1.1 +++ pdfbox-1.8.8-build.xml.patch 12 May 2015 17:03:34 -0000 1.2 @@ -1,5 +1,5 @@ ---- build.xml.orig 2015-02-21 14:23:45.700488598 +0100 -+++ build.xml 2015-02-21 14:23:51.968504982 +0100 +--- build.xml.orig 2015-05-12 16:41:01.813664913 +0000 ++++ build.xml 2015-05-12 16:44:10.434652444 +0000 @@ -28,7 +28,7 @@ <property name="tool.dir" value="tools" /> <property name="bin.dir" value="bin" /> @@ -9,3 +9,126 @@ <!-- pdfbox --> <property name="pdfbox.project.name" value="pdfbox"/> +@@ -95,9 +95,6 @@ + <property name="testoutput-ext.dir" value="${pdfbox.target.dir}/test-output-ext"/> + <property name="testinput-ext.dir" value="${pdfbox.target.dir}/test-input-ext"/> + +- <property name="adobefiles.url" value="${maven.repo2}/com/adobe/pdf/pcfi/2010.08.09/pcfi-2010.08.09.jar"/> +- <property name="adobefiles.jar" value="${download.dir}/pcfi-2010.08.09.jar"/> +- + <property name="file" value=""/> + + <!--.NET properties --> +@@ -171,7 +168,7 @@ + <mkdir dir="${jempbox.dest.dir}"/> + </target> + +- <target name="pdfbox.compile" depends="fontbox.package,jempbox.package,pdfbox.init,get.adobefiles" ++ <target name="pdfbox.compile" depends="fontbox.package,jempbox.package,pdfbox.init" + description="Compile Java source files"> + <!-- required encoding flag to be able to build using ibm-jdk on redhat ES--> + <javac srcdir="${pdfbox.src.dir}" destdir="${pdfbox.dest.dir}" +@@ -206,31 +203,6 @@ + + <target name="test" depends="testextract,test-junit,testimage" description="Run all the junit tests"/> + +- <target name="find.adobefiles"> +- <available property="adobefiles.found" file="${dest.dir}/org/apache/pdfbox/resources/cmap"/> +- </target> +- +- <target name="get.adobefiles" +- unless="adobefiles.found" depends="find.adobefiles" +- description="Download and unpack afm and cmap files from Adobe"> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${adobefiles.url}"/> +- <param name="destfile" value="${adobefiles.jar}"/> +- </antcall> +- <unjar src="${adobefiles.jar}" dest="${pdfbox.dest.dir}/org/apache/pdfbox/resources/afm"> +- <patternset> +- <include name="com/adobe/pdf/pcfi/afm/*.afm"/> +- </patternset> +- <mapper type="flatten"/> +- </unjar> +- <unjar src="${adobefiles.jar}" dest="${pdfbox.dest.dir}/org/apache/pdfbox/resources"> +- <patternset> +- <include name="com/adobe/pdf/pcfi/glyphlist.txt"/> +- </patternset> +- <mapper type="flatten"/> +- </unjar> +- </target> +- + <target name="testextract" depends="clean,pdfbox.compile" description="Test text extraction"> + <junit printsummary="off" fork="on" dir="."> + <jvmarg value="-Xmx1024M"/> +@@ -341,52 +313,7 @@ + </checkstyle> + </target> + +- <target name="get.externallibs.pdfbox"> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${bcmail.url}"/> +- <param name="destfile" value="${bcmail.jar}"/> +- </antcall> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${bcprov.url}"/> +- <param name="destfile" value="${bcprov.jar}"/> +- </antcall> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${junit.url}"/> +- <param name="destfile" value="${junit.jar}"/> +- </antcall> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${logging.url}"/> +- <param name="destfile" value="${logging.jar}"/> +- </antcall> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${icu4j.url}"/> +- <param name="destfile" value="${icu4j.jar}"/> +- </antcall> +- </target> +- +- <target name="get.externallibs.fontbox"> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${junit.url}"/> +- <param name="destfile" value="${junit.jar}"/> +- </antcall> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${logging.url}"/> +- <param name="destfile" value="${logging.jar}"/> +- </antcall> +- </target> +- +- <target name="get.externallibs.jempbox"> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${junit.url}"/> +- <param name="destfile" value="${junit.jar}"/> +- </antcall> +- <antcall target="downloadfile"> +- <param name="sourcefile" value="${logging.url}"/> +- <param name="destfile" value="${logging.jar}"/> +- </antcall> +- </target> +- +- <target name="pdfbox.package" depends="get.externallibs.pdfbox,pdfbox.compile" description="Package pdfbox into a jar file"> ++ <target name="pdfbox.package" depends="pdfbox.compile" description="Package pdfbox into a jar file"> + <propertyfile file="${pdfbox.resources.dir}/org/apache/pdfbox/resources/pdfbox.version"> + <entry key="pdfbox.version" value="${pdfbox.release.name}"/> + </propertyfile> +@@ -405,7 +332,7 @@ + </jar> + </target> + +- <target name="fontbox.package" depends="get.externallibs.fontbox,fontbox.compile" description="Package fontbox into a jar file"> ++ <target name="fontbox.package" depends="fontbox.compile" description="Package fontbox into a jar file"> + <jar jarfile="${fontbox.jar}"> + <fileset dir="${fontbox.dest.dir}"/> + <metainf dir="." includes="*.txt"/> +@@ -419,7 +346,7 @@ + </jar> + </target> + +- <target name="jempbox.package" depends="get.externallibs.jempbox,jempbox.compile" description="Package jempbox into a jar file"> ++ <target name="jempbox.package" depends="jempbox.compile" description="Package jempbox into a jar file"> + <jar jarfile="${jempbox.jar}"> + <fileset dir="${jempbox.dest.dir}"/> + <metainf dir="." includes="*.txt"/>
