Merge branch 'master' of https://git.gitorious.org/f-droid/fdroiddata
This commit is contained in:
commit
ad57aa27e6
|
@ -14,14 +14,18 @@ sale from the website.
|
|||
Repo Type:hg
|
||||
Repo:https://bitbucket.org/dalb8/osciiprime
|
||||
|
||||
# already a prebuilt in jni/ but use NDK version instead
|
||||
Build:Dagobert,14
|
||||
commit=0
|
||||
Build:16,16
|
||||
commit=150c5dbd13f08ef292
|
||||
forceversion=yes
|
||||
extlibs=android/android-support-v4.jar
|
||||
prebuild=cp $$NDK$$/platforms/android-14/arch-arm/usr/lib/liblog.so jni/
|
||||
scanignore=jni
|
||||
build=cp $$NDK$$/platforms/android-14/arch-arm/usr/lib/liblog.so jni/
|
||||
scandelete=jni/liblog.so
|
||||
buildjni=yes
|
||||
|
||||
Maintainer Notes:
|
||||
Substituting binary in jni/ with one from the NDK
|
||||
.
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:RepoManifest
|
||||
Current Version:Dagobert
|
||||
|
|
|
@ -30,25 +30,25 @@ Status: BETA
|
|||
Repo Type:git
|
||||
Repo:https://github.com/adventuregamestudio/ags.git
|
||||
|
||||
Build:3.3.0-beta,1
|
||||
disable=lots of build errors
|
||||
commit=v.3.3.0-beta
|
||||
Build:3.3.0-hotfix,1158
|
||||
disable=missing symbols
|
||||
commit=v.3.3.0-hotfix
|
||||
subdir=Android/launcher_list
|
||||
submodules=yes
|
||||
init=cd ../.. && \
|
||||
find -iregex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && \
|
||||
git submodule foreach git checkout d6f13daef9
|
||||
target=android-17
|
||||
update=.,../library
|
||||
forceversion=yes
|
||||
patch=ndkr9.patch
|
||||
scandelete=/
|
||||
build=cd ../buildlibs && \
|
||||
find -name "*.sh" -exec chmod +x {} + && \
|
||||
./buildall.sh
|
||||
buildjni=../library
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:Tags
|
||||
Current Version:3.3.0-beta
|
||||
Current Version Code:1
|
||||
Maintainer Notes:
|
||||
Android manifest has no version info, so no UCM applies.
|
||||
.
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:None
|
||||
Current Version:3.3.0-hotfix
|
||||
Current Version Code:1158
|
||||
|
||||
|
|
|
@ -1,72 +0,0 @@
|
|||
From fe3d87c86b830c5e6d7b7e990de5ec5ef68483e7 Mon Sep 17 00:00:00 2001
|
||||
From: jjsat <jjs@jjs.at>
|
||||
Date: Sun, 25 Aug 2013 11:39:02 +0200
|
||||
Subject: [PATCH] Android: Fix building with NDK r9.
|
||||
|
||||
---
|
||||
Android/library/jni/pe_jni.c | 2 +-
|
||||
Engine/platform/android/acpland.cpp | 6 +++---
|
||||
Engine/platform/util/libc.c | 2 +-
|
||||
3 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Android/library/jni/pe_jni.c b/Android/library/jni/pe_jni.c
|
||||
index ac5b359..c24681b 100644
|
||||
--- a/Android/library/jni/pe_jni.c
|
||||
+++ b/Android/library/jni/pe_jni.c
|
||||
@@ -13,7 +13,7 @@ void android_debug_printf(char* format, ...)
|
||||
vsprintf(buffer, format, ap);
|
||||
va_end(ap);
|
||||
|
||||
- __android_log_print(ANDROID_LOG_DEBUG, "Allegro", buffer);
|
||||
+ __android_log_print(ANDROID_LOG_DEBUG, "Allegro", "%s", buffer);
|
||||
}
|
||||
|
||||
int IsDataFile(version_info_t* version_info)
|
||||
diff --git a/Engine/platform/android/acpland.cpp b/Engine/platform/android/acpland.cpp
|
||||
index 3aa1668..244d595 100644
|
||||
--- a/Engine/platform/android/acpland.cpp
|
||||
+++ b/Engine/platform/android/acpland.cpp
|
||||
@@ -675,7 +675,7 @@ void AGSAndroid::WriteDebugString(const char* texx, ...)
|
||||
va_start(ap,texx);
|
||||
vsprintf(&displbuf[5],texx,ap);
|
||||
va_end(ap);
|
||||
- __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf);
|
||||
+ __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -712,7 +712,7 @@ void AGSAndroid::DisplayAlert(const char *text, ...) {
|
||||
JNIEnv* thread_env;
|
||||
android_jni_vm->AttachCurrentThread(&thread_env, NULL);
|
||||
|
||||
- __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf);
|
||||
+ __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf);
|
||||
|
||||
jstring java_string = thread_env->NewStringUTF(displbuf);
|
||||
thread_env->CallVoidMethod(java_object, java_messageCallback, java_string);
|
||||
@@ -765,7 +765,7 @@ void AGSAndroid::WriteConsole(const char *text, ...) {
|
||||
va_start(ap, text);
|
||||
vsprintf(displbuf, text, ap);
|
||||
va_end(ap);
|
||||
- __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf);
|
||||
+ __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf);
|
||||
}
|
||||
|
||||
void AGSAndroid::ShutdownCDPlayer() {
|
||||
diff --git a/Engine/platform/util/libc.c b/Engine/platform/util/libc.c
|
||||
index e201d2b..e3820af 100644
|
||||
--- a/Engine/platform/util/libc.c
|
||||
+++ b/Engine/platform/util/libc.c
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <string.h>
|
||||
|
||||
// Only a dummy. It is used in a function of alfont, but never called in AGS.
|
||||
-size_t malloc_usable_size(void* allocation)
|
||||
+size_t malloc_usable_size(const void* allocation)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
1.8.4
|
||||
|
||||
|
|
@ -121,7 +121,9 @@ Build:2.2alpha14,20200114
|
|||
Build:2.2alpha17,20200117
|
||||
commit=v2.2alpha17
|
||||
|
||||
Archive Policy:4 versions
|
||||
Build:2.1.2,20102300
|
||||
commit=v2.1.2
|
||||
|
||||
Auto Update Mode:Version v%v
|
||||
Update Check Mode:Tags ^v[0-9.]*$
|
||||
Current Version:2.1.2
|
||||
|
|
|
@ -50,6 +50,6 @@ Build:0.9.1,17
|
|||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:Tags
|
||||
Current Version:0.9.1
|
||||
Current Version Code:17
|
||||
Current Version:0.9.2
|
||||
Current Version Code:18
|
||||
|
||||
|
|
|
@ -25,8 +25,7 @@ Build Version:1.0.5 [BETA],37,v1.0.5b,init=rm -f build.xml
|
|||
Build Version:1.0.6-legacy,38,e6b0ad8221,init=rm -f build.xml,forceversion=yes
|
||||
|
||||
Auto Update Mode:None
|
||||
#Device variable and version code is similar for both apks
|
||||
Update Check Mode:None
|
||||
Current Version:1.0.4 [BETA]
|
||||
Current Version Code:35
|
||||
Current Version:1.0.5 [BETA]
|
||||
Current Version Code:37
|
||||
|
||||
|
|
|
@ -85,6 +85,6 @@ Build:0.9.4r741,28
|
|||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:RepoManifest/0.9
|
||||
Current Version:0.9.4r741
|
||||
Current Version Code:28
|
||||
Current Version:0.9.4r745
|
||||
Current Version Code:29
|
||||
|
||||
|
|
|
@ -127,5 +127,5 @@ Build:4.3.5,80
|
|||
Auto Update Mode:None
|
||||
Update Check Mode:Tags
|
||||
Current Version:4.5.7
|
||||
Current Version Code:98
|
||||
Current Version Code:99
|
||||
|
||||
|
|
|
@ -300,15 +300,12 @@ Build:3.1.2-27,847
|
|||
rm=android/ant.properties
|
||||
buildjni=yes
|
||||
|
||||
Build:3.1.2-34,854
|
||||
disable=not building
|
||||
commit=cr3.1.2-34
|
||||
Build:3.1.2-38,858
|
||||
disable=ndk build errors
|
||||
commit=cr3-3.1.2-38
|
||||
subdir=android
|
||||
buildjni=yes
|
||||
|
||||
Build:3.1.2-35,855
|
||||
disable=no tag for this version
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:RepoManifest
|
||||
Current Version:3.1.2-39
|
||||
|
|
|
@ -46,6 +46,6 @@ Build:1.2.2,42
|
|||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:Tags
|
||||
Current Version:2.1.1
|
||||
Current Version Code:48
|
||||
Current Version:2.1.2
|
||||
Current Version Code:49
|
||||
|
||||
|
|
|
@ -922,6 +922,7 @@ com.ichi2.anki_20100214.apk com.ichi2.anki 2014-03-21
|
|||
com.ichi2.anki_20100215.apk com.ichi2.anki 2014-03-26
|
||||
com.ichi2.anki_20100216.apk com.ichi2.anki 2014-03-27
|
||||
com.ichi2.anki_20101300.apk com.ichi2.anki 2014-03-28
|
||||
com.ichi2.anki_20102300.apk com.ichi2.anki 2014-04-03
|
||||
com.ichi2.anki_20200101.apk com.ichi2.anki 2014-03-31
|
||||
com.ichi2.anki_20200114.apk com.ichi2.anki 2014-04-01
|
||||
com.ichi2.anki_20200117.apk com.ichi2.anki 2014-04-02
|
||||
|
@ -2835,6 +2836,7 @@ org.dsandler.apps.markers_56.apk org.dsandler.apps.markers 2014-02-22
|
|||
org.durka.hallmonitor_3.apk org.durka.hallmonitor 2013-12-23
|
||||
org.durka.hallmonitor_5.apk org.durka.hallmonitor 2014-01-27
|
||||
org.durka.hallmonitor_6.apk org.durka.hallmonitor 2014-03-27
|
||||
org.durka.hallmonitor_7.apk org.durka.hallmonitor 2014-04-03
|
||||
org.dynalogin.android_2.apk org.dynalogin.android 2012-09-07
|
||||
org.dyndns.fules.ck_16.apk org.dyndns.fules.ck 2012-10-10
|
||||
org.dyndns.fules.ck_17.apk org.dyndns.fules.ck 2012-10-08
|
||||
|
|
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue