Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=a193dfc0abfec5b4b3f16d567bb7d937d748bec2
commit a193dfc0abfec5b4b3f16d567bb7d937d748bec2 Author: Marius Cirsta <[email protected]> Date: Wed Jun 27 00:57:32 2012 +0000 junit-4.10-2-x86_64 * rebuilt with openjava * changed m8r diff --git a/source/devel-extra/junit/FrugalBuild b/source/devel-extra/junit/FrugalBuild index 1be0a4b..acf2d04 100644 --- a/source/devel-extra/junit/FrugalBuild +++ b/source/devel-extra/junit/FrugalBuild @@ -1,21 +1,24 @@ # Compiling Time: 0.04 SBU -# Maintainer: Miklos Vajna <[email protected]> +# Maintainer: Marius Cirsta <[email protected]> +# Contributor: Miklos Vajna <[email protected]> pkgname=junit pkgver=4.10 -pkgrel=1 +pkgrel=2 pkgdesc="A regression testing framework." -_F_java_no_gcj=1 -Finclude java +Finclude openjava url="http://www.junit.org/"; Fpkgversep="" +_F_archive_grepv="SNAPSHOT" up2date="Flastarchive https://github.com/KentBeck/junit/downloads .zip" depends=('hamcrest') makedepends=('openjdk') groups=('devel-extra') archs=('i686' 'x86_64') -source=(https://github.com/KentBeck/junit/downloads/$pkgname$pkgver.zip) -sha1sums=('2d9663bdfe3079673ff66f1154b42a31b40d8235') +source=(https://github.com/KentBeck/junit/downloads/$pkgname$pkgver.zip \ + workaround_typing_bug.patch) +sha1sums=('2d9663bdfe3079673ff66f1154b42a31b40d8235' \ + '3c81a1861fcd94bb900dc6272285b4435660fcf5') build() { @@ -26,6 +29,7 @@ build() rm -rfv javadoc temp.hamcrest.source Fjavacleanup mkdir -p classes + Fpatchall javac -cp $(ls /usr/share/java/hamcrest-*.jar|tr '\n' ':') -d classes \ -sourcepath src $(find src -name "*.java") || return 1 echo "Class-Path: hamcrest-core.jar" > MANIFEST diff --git a/source/devel-extra/junit/workaround_typing_bug.patch b/source/devel-extra/junit/workaround_typing_bug.patch new file mode 100644 index 0000000..b841f59 --- /dev/null +++ b/source/devel-extra/junit/workaround_typing_bug.patch @@ -0,0 +1,47 @@ +--- a/src/org/junit/internal/matchers/CombinableMatcher.java ++++ b/src/org/junit/internal/matchers/CombinableMatcher.java +@@ -24,11 +24,11 @@ + + @SuppressWarnings("unchecked") + public CombinableMatcher<T> and(Matcher<? extends T> matcher) { +- return new CombinableMatcher<T>(allOf(matcher, fMatcher)); ++ return new CombinableMatcher<T>(allOf((Matcher)matcher, fMatcher)); + } + + @SuppressWarnings("unchecked") + public CombinableMatcher<T> or(Matcher<? extends T> matcher) { +- return new CombinableMatcher<T>(anyOf(matcher, fMatcher)); ++ return new CombinableMatcher<T>(anyOf((Matcher)matcher, fMatcher)); + } +-} +\ No newline at end of file ++} +--- a/src/org/junit/internal/matchers/IsCollectionContaining.java ++++ b/src/org/junit/internal/matchers/IsCollectionContaining.java +@@ -41,7 +41,7 @@ + + @Factory + public static <T> Matcher<Iterable<T>> hasItem(T element) { +- return hasItem(equalTo(element)); ++ return hasItem((Matcher)equalTo(element)); + } + + @Factory +@@ -51,7 +51,7 @@ + for (Matcher<? extends T> elementMatcher : elementMatchers) { + all.add(hasItem(elementMatcher)); + } +- return allOf(all); ++ return allOf((Collection)all); + } + + @Factory +@@ -61,7 +61,7 @@ + for (T element : elements) { + all.add(hasItem(element)); + } +- return allOf(all); ++ return allOf((Collection)all); + } + + } \ No newline at end of file _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
