Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=multilib.git;a=commitdiff;h=82234fd66a927ea9767679844c267d956c7c4c1e
commit 82234fd66a927ea9767679844c267d956c7c4c1e Author: DeX77 <[email protected]> Date: Tue Feb 13 11:08:46 2018 +0100 Revert "bcel-6.0-1-x86_64" This reverts commit ee1b7a491ecb265046bc57b9c96c3c32ede6ce65. diff --git a/source/devel-extra/bcel/FrugalBuild b/source/devel-extra/bcel/FrugalBuild index b9d490f..dad5ddf 100644 --- a/source/devel-extra/bcel/FrugalBuild +++ b/source/devel-extra/bcel/FrugalBuild @@ -2,25 +2,27 @@ # Maintainer: Miklos Vajna <[email protected]> pkgname=bcel -pkgver=6.1 -pkgextraver="-src" -pkgrel=2 +pkgver=5.2 +pkgrel=3 pkgdesc="The Byte Code Engineering Library: analyze, create, manipulate Java class files" -url="http://commons.apache.org/proper/commons-bcel/"; +url="http://jakarta.apache.org/bcel/"; groups=('devel-extra') -archs=('x86_64') -up2date="Flasttar http://commons.apache.org/proper/commons-bcel/download_bcel.cgi " -source=("https://archive.apache.org/dist/commons/bcel/source/bcel-$pkgver-src.tar.gz";) -sha1sums=('4ee5359c73f5bcb215a0820874a40b06e19ccb81') -depends=('openjre') +archs=('i686' 'x86_64') +up2date="Flastarchive https://commons.apache.org/proper/commons-bcel/download_bcel.cgi .src.tar.gz" +source=(http://www.apache.org/dist/jakarta/bcel/source/bcel-$pkgver-src.tar.gz \ + bcel-5.2-system-regexp.diff \ + encoding.patch) +signatures=($source.asc '' '') +depends=() ## wrong some java foo's Finclude openjava -makedepends+=('maven') build() { - Fcd - Fexec mvn -Dmaven.repo.local=$Fsrcdir/repo -DskipTests=true clean package || Fdie - Fjar target/bcel-$pkgver.jar + Fpatchall + Fjavacleanup + Fant jar + mv target/bcel{-$pkgver,}.jar + Fjar target/bcel.jar } # optimization OK diff --git a/source/devel-extra/bcel/bcel-5.2-system-regexp.diff b/source/devel-extra/bcel/bcel-5.2-system-regexp.diff new file mode 100644 index 0000000..e09f914 --- /dev/null +++ b/source/devel-extra/bcel/bcel-5.2-system-regexp.diff @@ -0,0 +1,11 @@ +--- bcel-5.2/build.xml.orig 2006-09-10 02:49:27.000000000 +0200 ++++ bcel-5.2/build.xml 2006-09-10 02:51:29.000000000 +0200 +@@ -112,7 +112,7 @@ + + <setproxy> + </setproxy> +- <get dest="${libdir}/regexp-1.2.jar" usetimestamp="true" ignoreerrors="true" src="http://www.ibiblio.org/maven/regexp/jars/regexp-1.2.jar";> ++ <get dest="${libdir}/regexp-1.2.jar" usetimestamp="true" ignoreerrors="true" src="file:///usr/share/java/jakarta-regexp.jar"> + </get> + </target> + <target name="install-maven"> diff --git a/source/devel-extra/bcel/encoding.patch b/source/devel-extra/bcel/encoding.patch new file mode 100644 index 0000000..9c9b4d7 --- /dev/null +++ b/source/devel-extra/bcel/encoding.patch @@ -0,0 +1,33 @@ +Description: Fix encoding of source files for Java 7 compatibility +Author: James Page <[email protected]> +Forwarded: not-needed + +Index: bcel/build.xml +=================================================================== +--- bcel.orig/build.xml 2011-12-05 14:50:45.203906796 +0000 ++++ bcel/build.xml 2011-12-05 14:51:00.535956116 +0000 +@@ -39,7 +39,7 @@ + <target name="compile" description="o Compile the code" depends="get-deps"> + <mkdir dir="${classesdir}"> + </mkdir> +- <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> ++ <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" encoding="ISO-8859-1"> + <src> + <pathelement location="src/java"> + </pathelement> +@@ -100,7 +100,7 @@ + </property> + <property name="title" value="jakarta-bcel 5.2 API"> + </property> +- <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*"> ++ <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="org.apache.bcel.*" encoding="ISO-8859-1"> + <classpath> + <path refid="build.classpath"> + </path> +@@ -116,4 +116,4 @@ + <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> + </unjar> + </target> +-</project> +\ No newline at end of file ++</project> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
