missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed ScummVM compilation with JDK7

Browse source
This commit is contained in:
AlexanderR 2013-10-24 11:54:38 +11:00
parent 40eadd7187
commit 915ea7fa58
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
metadata/org.scummvm.scummvm.txt
View file

@ -31,9 +31,8 @@ Unlike upstream build, this one has all plugins bundled together in single apk.
Repo Type:git Repo Type:git
Repo:git://github.com/scummvm/scummvm.git Repo:git://github.com/scummvm/scummvm.git
Build Version:1.5.0,6,!build failing (at v1.5.0),\ Build Version:1.5.0,6,v1.5.0,extlibs=libmad/libmad-0.15.1b.tar.gz,srclibs=FLAC@1.2.1;Tremor@18154,\
extlibs=libmad/libmad-0.15.1b.tar.gz,srclibs=FLAC@1.2.1;Tremor@b31465b840,\ update=no,patch=fdroid_build.patch;latest_sdk.patch;jdk7.patch,bindir=.,antcommand="-p",\
update=no,patch=fdroid_build.patch;latest_sdk.patch,bindir=.,antcommand="-p",\
init=echo -e '<project>\n<target name="Creating scummvm.apk for release..."/>\n</project>' > build.xml,\ init=echo -e '<project>\n<target name="Creating scummvm.apk for release..."/>\n</project>' > build.xml,\
prebuild=\ prebuild=\
set -- $$SDK$$/build-tools/*/aapt && \ set -- $$SDK$$/build-tools/*/aapt && \

22
metadata/org.scummvm.scummvm/jdk7.patch Normal file
View file

@ -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