From 915ea7fa5822fc07ad60b58d63b6e9feca07f30b Mon Sep 17 00:00:00 2001 From: AlexanderR Date: Thu, 24 Oct 2013 11:54:38 +1100 Subject: [PATCH] Fixed ScummVM compilation with JDK7 --- metadata/org.scummvm.scummvm.txt | 5 ++--- metadata/org.scummvm.scummvm/jdk7.patch | 22 ++++++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) create mode 100644 metadata/org.scummvm.scummvm/jdk7.patch diff --git a/metadata/org.scummvm.scummvm.txt b/metadata/org.scummvm.scummvm.txt index 168deaa0c5..43d7c9e79c 100644 --- a/metadata/org.scummvm.scummvm.txt +++ b/metadata/org.scummvm.scummvm.txt @@ -31,9 +31,8 @@ Unlike upstream build, this one has all plugins bundled together in single apk. Repo Type:git Repo:git://github.com/scummvm/scummvm.git -Build Version:1.5.0,6,!build failing (at v1.5.0),\ -extlibs=libmad/libmad-0.15.1b.tar.gz,srclibs=FLAC@1.2.1;Tremor@b31465b840,\ -update=no,patch=fdroid_build.patch;latest_sdk.patch,bindir=.,antcommand="-p",\ +Build Version:1.5.0,6,v1.5.0,extlibs=libmad/libmad-0.15.1b.tar.gz,srclibs=FLAC@1.2.1;Tremor@18154,\ +update=no,patch=fdroid_build.patch;latest_sdk.patch;jdk7.patch,bindir=.,antcommand="-p",\ init=echo -e '\n\n' > build.xml,\ prebuild=\ set -- $$SDK$$/build-tools/*/aapt && \ diff --git a/metadata/org.scummvm.scummvm/jdk7.patch b/metadata/org.scummvm.scummvm/jdk7.patch new file mode 100644 index 0000000000..e6c0fe9930 --- /dev/null +++ b/metadata/org.scummvm.scummvm/jdk7.patch @@ -0,0 +1,22 @@ +diff --git a/backends/platform/android/org/scummvm/scummvm/Unpacker.java b/backends/platform/android/org/scummvm/scummvm/Unpacker.java +index da76ceb..a750e2c 100644 +--- a/backends/platform/android/org/scummvm/scummvm/Unpacker.java ++++ b/backends/platform/android/org/scummvm/scummvm/Unpacker.java +@@ -314,7 +314,7 @@ public class Unpacker extends Activity { + .queryBroadcastReceivers(intent, 0); + if (PLUGINS_ENABLED && plugins.isEmpty()) { + // No plugins installed +- AlertDialog.Builder alert = new AlertDialog.Builder(this) ++ /*AlertDialog.Builder alert = new AlertDialog.Builder(this) + .setTitle(R.string.no_plugins_title) + .setMessage(R.string.no_plugins_found) + .setIcon(android.R.drawable.ic_dialog_alert) +@@ -348,7 +348,7 @@ public class Unpacker extends Activity { + }); + } + +- alert.show(); ++ alert.show();*/ + + } else { + // Already have at least one plugin installed