Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=openjava.git;a=commitdiff;h=962a7eeeae4ffcbcd94828ac16b77e191bf5a547
commit 962a7eeeae4ffcbcd94828ac16b77e191bf5a547 Author: Marius Cirsta <[email protected]> Date: Sun Jul 1 02:25:49 2012 +0000 avalon-logkit-2.1-2-x86_64 * rebuild with openjava * update source and up2date diff --git a/source/devel-extra/avalon-logkit/01_implement_abstract_methods.patch b/source/devel-extra/avalon-logkit/01_implement_abstract_methods.patch new file mode 100644 index 0000000..85d6857 --- /dev/null +++ b/source/devel-extra/avalon-logkit/01_implement_abstract_methods.patch @@ -0,0 +1,38 @@ +Description: Add method stubs to build against current APIs. +Forwarded: not-needed +Author: Onkar Shinde <[email protected]>, James page <[email protected]> + +Index: excalibur-logkit/src/java/org/apache/log/output/db/DefaultDataSource.java +=================================================================== +--- excalibur-logkit.orig/src/java/org/apache/log/output/db/DefaultDataSource.java 2011-11-25 10:55:37.000000000 +0000 ++++ excalibur-logkit/src/java/org/apache/log/output/db/DefaultDataSource.java 2011-11-25 10:59:19.640362541 +0000 +@@ -20,6 +20,8 @@ + import java.sql.Connection; + import java.sql.DriverManager; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; ++import java.util.logging.Logger; + import javax.sql.DataSource; + + /** +@@ -111,4 +113,20 @@ + { + m_logWriter = logWriter; + } ++ ++ public Object unwrap(Class iface) throws java.sql.SQLException ++ { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public boolean isWrapperFor(Class iface) throws java.sql.SQLException ++ { ++ throw new UnsupportedOperationException(); ++ } ++ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException ++ { ++ throw new SQLFeatureNotSupportedException(); ++ } ++ + } diff --git a/source/devel-extra/avalon-logkit/FrugalBuild b/source/devel-extra/avalon-logkit/FrugalBuild index bf85906..5c2dea7 100644 --- a/source/devel-extra/avalon-logkit/FrugalBuild +++ b/source/devel-extra/avalon-logkit/FrugalBuild @@ -3,21 +3,22 @@ pkgname=avalon-logkit pkgver=2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Easy-to-use Java logging toolkit" url="http://avalon.apache.org/"; _F_java_jars="target/avalon-logkit-$pkgver.jar" -Finclude java +Finclude openjava depends=(${depends[@]} 'apache-log4j' 'servletapi' 'gnumail') groups=('devel-extra') archs=('i686' 'x86_64') -up2date="Flastarchive http://www.apache.org/dist/excalibur/avalon-logkit/source/ -src.tar.gz" -source=(http://www.apache.org/dist/excalibur/avalon-logkit/source/avalon-logkit-$pkgver-src.tar.gz) -signatures=($source.asc) +up2date="Flastarchive http://archive.apache.org/dist/excalibur/avalon-logkit/source/ -src.tar.gz" +source=(http://archive.apache.org/dist/excalibur/avalon-logkit/source//avalon-logkit-$pkgver-src.tar.gz \ + buildFix.patch 01_implement_abstract_methods.patch) +signatures=($source.asc '' '') build() { - Fsed 'depends="get-deps"' 'depends=""' build.xml + Fpatchall rm -rf src/java/org/apache/log/output/jms Fjavacleanup mkdir -p target/lib diff --git a/source/devel-extra/avalon-logkit/buildFix.patch b/source/devel-extra/avalon-logkit/buildFix.patch new file mode 100644 index 0000000..c6933f3 --- /dev/null +++ b/source/devel-extra/avalon-logkit/buildFix.patch @@ -0,0 +1,24 @@ +--- avalon-logkit-2.1/build.xml 2005-08-30 02:03:48.000000000 +0000 ++++ avalon-logkit-2.1.new/build.xml 2012-07-01 02:15:58.000000000 +0000 +@@ -40,10 +40,10 @@ + <available property="Junit.present" classname="junit.framework.Test"> + </available> + </target> +- <target name="compile" description="o Compile the code" depends="get-deps"> ++ <target name="compile" description="o Compile the code" depends=""> + <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> +@@ -197,7 +197,7 @@ + </fileset> + </copy> + </target> +- <target name="javadoc" description="o Generate javadoc" depends="get-deps"> ++ <target name="javadoc" description="o Generate javadoc" depends=""> + <mkdir dir="${javadocdir}"> + </mkdir> + <tstamp> _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
