From 47560f1347baf9ae923363a7b3503c0126dc804e Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Thu, 19 Dec 2013 11:07:55 +0100 Subject: [PATCH] Transdroid: bump to 2.1.2, add java6 source patch The java6 source patch is not yet upstream but submitted. --- metadata/org.transdroid.full.txt | 3 ++- .../org.transdroid.full/java6source.patch | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 metadata/org.transdroid.full/java6source.patch diff --git a/metadata/org.transdroid.full.txt b/metadata/org.transdroid.full.txt index 9e445b4653..a6dc973a9a 100644 --- a/metadata/org.transdroid.full.txt +++ b/metadata/org.transdroid.full.txt @@ -19,8 +19,9 @@ See also [[org.transdroid.search]]. Repo Type:git Repo:https://github.com/erickok/transdroid.git -Build:2.1.1,210 +Build:2.1.2,211 commit=5aa1d8d4f23fbf308f71d28702f4b09273818955 + patch=java6source.patch subdir=full prebuild=ant -f ../lib/build.xml \ && sed -i 's;true;false;' ../core/res/values/bools.xml \ diff --git a/metadata/org.transdroid.full/java6source.patch b/metadata/org.transdroid.full/java6source.patch new file mode 100644 index 0000000000..3af25eaebb --- /dev/null +++ b/metadata/org.transdroid.full/java6source.patch @@ -0,0 +1,22 @@ +commit 93e997d442d617226c3dc307719e9b752f037e91 +Author: Florian Schmaus +Date: Thu Dec 19 10:58:31 2013 +0100 + + lib/build.xml: Also set javac source to java6 + + "javac: target release 6 conflicts with default source release 1.7" + error will be emitted if a java7 compiler is used and target is set to 6 + but not source. + +diff --git a/lib/build.xml b/lib/build.xml +index 066dfff..d480d57 100644 +--- a/lib/build.xml ++++ b/lib/build.xml +@@ -20,6 +20,7 @@ + srcdir="src/" + destdir="build/" + bootclasspath="${sdk-location}/platforms/${android.version}/android.jar" ++ source="6" + target="6" + /> +