Merge commit 'refs/merge-requests/213' of git://gitorious.org/f-droid/fdroiddata into merge-requests/213

metadata/org.dolphinemu.dolphinemu.txt

@@ -29,8 +29,10 @@ Status: ALPHA
 Repo Type:git
 Repo:https://code.google.com/p/dolphin-emu/
 
-Build Version:0.11,11,!lots of binaries need removing (at 4.0),buildjni=no,extlibs=android/android-support-v13.jar,\
-subdir=Source/Android,init=rm -r libs/* ../../Externals/msvcrt/ ../../Installer/dxredist/,\
+Build Version:0.11,11,4.0,buildjni=no,extlibs=android/android-support-v13.jar,subdir=Source/Android,\
+init=\
+  rm -r libs/* ../../Externals/msvcrt/ ../../Installer/dxredist/ && \
+  find -L -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete,\
 build=cd .. &&\
  cmake -DANDROID=True -DANDROID_NATIVE_API_LEVEL=android-14 \
  -DCMAKE_TOOLCHAIN_FILE=../Source/Android/android.toolchain.cmake \

metadata/org.openmsx.android.openmsx.txt

@@ -28,15 +28,19 @@ of drivers and have good (virtual) hardware capabilities.
 Repo Type:srclib
 Repo:libsdl-android
 
-# setup_anddev.sh downloads TCL sources and builds them in one go
+# this looks so ugly because:
+# 1) setup_anddev.sh downloads TCL sources, unpacks and builds them in one go
+# 2) AndroidManifest.xml is only generated after TCL compilation
 Build Version:0.9.1-584,11527,openttd-1.2.3.25,update=no,srclibs=OpenMSX@728325a472,buildjni=no,\
 subdir=project,patch=tcl.patch,scanignore=libsdl-android/project/jni/tcl8.5/lib,\
-init=ln -s ../../OpenMSX openmsx && find . -name "*.so" -delete &&\
- sed -ri 's/ant debug|ant release/exit/' ../build.sh &&\
- export SDL_ANDROID_PORT_PATH=`readlink -f ..` && cd openmsx/build/android && ./setup_anddev.sh,\
-prebuild=sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml,\
-build=cd $$OpenMSX$$/build/android/openmsx &&\
- declare -rx VERSION_NAME=0.9.1-584 &&\
+init=\
+  ln -s ../../OpenMSX openmsx && find . -name "*.so" -delete &&\
+  sed -ri 's/ant debug|ant release/exit/' ../build.sh,\
+prebuild=\
+  export SDL_ANDROID_PORT_PATH=`readlink -f ..` && cd openmsx/build/android && ./setup_anddev.sh && \
+  sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \
+  cd openmsx && \
+  declare -rx VERSION_NAME=0.9.1-584 && \
  ./launch_anddev_build.sh
 
 Auto Update Mode:None

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 '<project>\n<target name="Creating scummvm.apk for release..."/>\n</project>' > build.xml,\
 prebuild=\
   set -- $$SDK$$/build-tools/*/aapt && \

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