From 01fcdd747bbaa7019c0f894ac798d85e0aaed138 Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 17:41:44 +0000 Subject: [PATCH 1/9] fix kwaak3 --- metadata/org.kwaak3.ext.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/org.kwaak3.ext.txt b/metadata/org.kwaak3.ext.txt index 357f4cb099..6573e4ebfe 100644 --- a/metadata/org.kwaak3.ext.txt +++ b/metadata/org.kwaak3.ext.txt @@ -15,8 +15,8 @@ Repo Type:git-svn Repo:http://kwaak3.googlecode.com/svn/trunk/ #pushd is a bash-only command, prebuild, etc use sh -Build Version:1.0,1,!disabled - needs adjusting at 37,subdir=kwaak/project,buildjni=yes,target=android-10,novcheck=yes,patch=common.patch,prebuild=\ -pushd ../.. && chmod +x mkjni.sh && ANDROID_NDK=$$NDK$$ ./mkjni.sh && popd +Build Version:1.0,1,37,subdir=kwaak/project,buildjni=yes,target=android-10,novcheck=yes,patch=common.patch,prebuild=\ +cd ../.. && chmod +x mkjni.sh && ANDROID_NDK=$$NDK$$ ./mkjni.sh && cd kwaak/project Auto Update Mode:None Update Check Mode:RepoManifest From f958747e0eae325f619cd26e6787b7f79ecab390 Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 17:55:17 +0000 Subject: [PATCH 2/9] update calculator to 2.2.2 --- metadata/com.android2.calculator3.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/metadata/com.android2.calculator3.txt b/metadata/com.android2.calculator3.txt index db6e7ae50d..7d673d0408 100644 --- a/metadata/com.android2.calculator3.txt +++ b/metadata/com.android2.calculator3.txt @@ -18,6 +18,8 @@ Build Version:1.8,22,d2b2bde6c9,target=android-15 Build Version:2.0,24,d61631afc5,target=android-16,srclibs=Slider@556b4db69a,prebuild=\ rm -rf tests libs/slider.jar && echo "android.library.reference.1=$$Slider$$" >> project.properties Build Version:2.2,26,!no source +Build Version:2.2.2,28,2eafd952,target=android-16,srclibs=Slider@556b4db69a,prebuild=\ +rm -rf tests libs/slider.jar && echo "android.library.reference.1=$$Slider$$" >> project.properties Auto Update Mode:None Update Check Mode:Market From 82e1f612500ae7fc26485a00401516d8516eb626 Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 18:22:40 +0000 Subject: [PATCH 3/9] can't fix aicia : strange problem --- metadata/net.gorry.aicia.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/metadata/net.gorry.aicia.txt b/metadata/net.gorry.aicia.txt index f43bc323eb..8b199e0af7 100644 --- a/metadata/net.gorry.aicia.txt +++ b/metadata/net.gorry.aicia.txt @@ -7,18 +7,17 @@ Issue Tracker: Summary:IRC client Description: Internet Relay Chat client with a twin-pane view. - -Website is in Japanese. . Repo Type:hg Repo:https://bitbucket.org/dalb8/aicia -Build Version:2012.1008.1,!build fails - Missing subdir build/net.gorry.aicia/AiCia (at 201210081),d1bfe6a,subdir=AiCia,prebuild=\ +#Builds fine from tarball; building from this repo gives one error about missing symbol +Build Version:2012.1216.1,201212161,!build problems 165d5db3fed8,subdir=AiCiA,prebuild=\ sed -i '/debuggable/d' AndroidManifest.xml Auto Update Mode:None Update Check Mode:Market -Current Version:2012.1008.1 -Current Version Code:201210081 +Current Version:2012.1216.1 +Current Version Code:201212161 From b5b081d2d97644994a77d0d47db25acac15c8716 Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 18:34:18 +0000 Subject: [PATCH 4/9] can't fix geopap: no source code for ELFs --- metadata/eu.hydrologis.geopaparazzi.txt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/metadata/eu.hydrologis.geopaparazzi.txt b/metadata/eu.hydrologis.geopaparazzi.txt index 762f02d780..06f24a6320 100644 --- a/metadata/eu.hydrologis.geopaparazzi.txt +++ b/metadata/eu.hydrologis.geopaparazzi.txt @@ -34,10 +34,11 @@ update=.;../geopaparazzilibrary Build Version:3.2.6,37,version_3.2.6,subdir=geopaparazzi.app,update=.;../geopaparazzilibrary Build Version:3.2.7,38,version_3.2.7,subdir=geopaparazzi.app,update=.;../geopaparazzilibrary Build Version:3.3.0,39,version_3.3.0,subdir=geopaparazzi.app,update=.;../geopaparazzilibrary -Build Version:3.4.0,40,!build fails (at version_3.4.0),subdir=geopaparazzi.app,update=.;../geopaparazzilibrary +Build Version:3.4.0,40,!no source code for ELF in subproject version_3.4.0,subdir=geopaparazzi.app,\ +update=.;../geopaparazzilibrary;../geopaparazzispatialitelibrary -Auto Update Mode:Version version_%v +Auto Update Mode:None Update Check Mode:Tags -Current Version:3.4.0 -Current Version Code:40 +Current Version:3.3.0 +Current Version Code:39 From a6f6b058b1c7a2cc0376e36c31e1c84f314dbb5c Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 19:39:07 +0000 Subject: [PATCH 5/9] update frostwire to 1.0.5, forcing target this time (build slows machine badly still) --- metadata/com.frostwire.android.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/metadata/com.frostwire.android.txt b/metadata/com.frostwire.android.txt index bf306d8c24..83d714f020 100644 --- a/metadata/com.frostwire.android.txt +++ b/metadata/com.frostwire.android.txt @@ -22,7 +22,10 @@ a different key. Repo Type:git Repo:https://github.com/frostwire/frostwire-android.git -Build Version:0.9.14,75,!requires android-13-e which is not listed/available? (at 6db095c85f4),srclibs=MobAdMob@2d5736,update=force,prebuild=\ +Build Version:0.9.14,75,6db095c85f4,srclibs=MobAdMob@2d5736,target=android-13,prebuild=\ +rm -f libs/GoogleAdMobAdsSdk-6.0.0.jar && \ +echo -e "\nandroid.library.reference.1=$$MobAdMob$$" >> project.properties +Build Version:1.0.5,81,852b155461,srclibs=MobAdMob@2d5736,target=android-13,prebuild=\ rm -f libs/GoogleAdMobAdsSdk-6.0.0.jar && \ echo -e "\nandroid.library.reference.1=$$MobAdMob$$" >> project.properties From 8418eb328e3108c773d4a057c99a3b75a19f115d Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 19:54:34 +0000 Subject: [PATCH 6/9] update narau to 0.8.1 --- metadata/org.vono.narau.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata/org.vono.narau.txt b/metadata/org.vono.narau.txt index b2f81ad076..85b7b2c9cc 100644 --- a/metadata/org.vono.narau.txt +++ b/metadata/org.vono.narau.txt @@ -23,9 +23,9 @@ Repo:lp:narau/fdroid Build Version:0.6,3,41,subdir=Narau Build Version:0.7,4,43,subdir=Narau -Build Version:0.8,5,!won't build with android-16 46,subdir=Narau +Build Version:0.8.1,6,48,subdir=Narau #Not in the playmarket Update Check Mode:None -Current Version:0.8 -Current Version Code:5 +Current Version:0.8.1 +Current Version Code:6 From b1d77a9fb6682aa2a23c5f9239eb380ca8b886ae Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 20:04:38 +0000 Subject: [PATCH 7/9] try replacing bash with sh to fix servestream --- metadata/net.sourceforge.servestream.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata/net.sourceforge.servestream.txt b/metadata/net.sourceforge.servestream.txt index bd60fabdb0..538ff52a7a 100644 --- a/metadata/net.sourceforge.servestream.txt +++ b/metadata/net.sourceforge.servestream.txt @@ -41,7 +41,7 @@ Repo:http://svn.code.sf.net/p/servestream/code/trunk #Build Version:0.4.9,59,1049,buildjni=no #Build Version:0.4.12,62,1160,buildjni=no #adapted from here http://servestream.sourceforge.net/build-servestream.sh. See tags for releases -Build Version:0.5.0,64,!build fails (at 1223),prebuild=\ +Build Version:0.5.0,64,1223,prebuild=\ export NDK=$$NDK$$ && \ wget http://sourceforge.net/p/servestream/code/1175/tree/ffmpeg/ffmpeg-0.11.1-android-2012-09-18.tar.gz?\ format=raw --output-document=ffmpeg-0.11.1-android-2012-09-18.tar.gz && \ @@ -54,6 +54,7 @@ chmod +x arm-build.sh && chmod +x x86-build.sh && \ mv arm-build.sh ffmpeg-0.11.1-android-2012-09-18 && mv x86-build.sh ffmpeg-0.11.1-android-2012-09-18 && \ cd ffmpeg-0.11.1-android-2012-09-18 && ./extract.sh && \ sed -i 's/make -j4/make -j2/g' arm-build.sh && sed -i 's/make -j4/make -j2/g' x86-build.sh && \ +sed -i 's/bash/sh/g' arm-build.sh && sed -i 's/bash/sh/g' x86-build.sh && \ ./arm-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg && \ ./x86-build.sh && cp -r build/ffmpeg/* ../jni/ffmpeg/ffmpeg && cd ../,buildjni=yes From 0e1c72152d8c3dc394484ee652ceca897a6564d9 Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 20:23:37 +0000 Subject: [PATCH 8/9] fix apv apvpro --- metadata/cx.hell.android.pdfview.txt | 2 +- metadata/cx.hell.android.pdfviewpro.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/metadata/cx.hell.android.pdfview.txt b/metadata/cx.hell.android.pdfview.txt index b6007e3a64..a398d47960 100644 --- a/metadata/cx.hell.android.pdfview.txt +++ b/metadata/cx.hell.android.pdfview.txt @@ -27,7 +27,7 @@ Build Version:0.3.0,300,!this crashes when built with the patch used in 0.3.2 7a subdir=pdfview,buildjni=yes,prebuild=scripts/build-native.sh Build Version:0.3.2,32000,ff030f8b49e6,subdir=pdfview,buildjni=no,target=android-8,\ patch=fdroid-ndk-build.patch,prebuild=scripts/build-native.sh -Build Version:0.3.4,34000,!ndk build fails (at c8724f674967),subdir=pdfview,target=android-10,buildjni=yes,prebuild=\ +Build Version:0.3.4,34000,4f6cb715dbef,subdir=pdfview,target=android-10,buildjni=yes,prebuild=\ sed -i '/ndk-build/d' scripts/build-native.sh && \ ./scripts/build-native.sh && sed -i '/proguard/d' project.properties,forceversion=yes,forcevercode=yes diff --git a/metadata/cx.hell.android.pdfviewpro.txt b/metadata/cx.hell.android.pdfviewpro.txt index 8376e329b1..3b67af5b21 100644 --- a/metadata/cx.hell.android.pdfviewpro.txt +++ b/metadata/cx.hell.android.pdfviewpro.txt @@ -27,11 +27,11 @@ Repo Type:hg Repo:https://code.google.com/p/apv/ #Version code last digit: 0 for all arm; 1 for armeabi; 2 for armeabi-v7a; 3 for x86 -Build Version:0.3.4-arm,34000,!ndk build fails (at c8724f674967),subdir=pdfview,target=android-10,buildjni=yes,prebuild=\ +Build Version:0.3.4-arm,34000,4f6cb715dbef,subdir=pdfview,target=android-10,buildjni=yes,prebuild=\ python2.7 ./scripts/pjpp.py --configuration pro && sed -i '/ndk-build/d' scripts/build-native.sh && \ ./scripts/build-native.sh && sed -i 's/armeabi-v7a armeabi x86/armeabi-v7a armeabi/g' jni/Application.mk && \ sed -i '/proguard/d' project.properties,forceversion=yes,forcevercode=yes -Build Version:0.3.4-x86,34003,!ndk build fails (at c8724f674967),subdir=pdfview,target=android-10,buildjni=yes,prebuild=\ +Build Version:0.3.4-x86,34003,4f6cb715dbef,subdir=pdfview,target=android-10,buildjni=yes,prebuild=\ python2.7 ./scripts/pjpp.py --configuration pro && sed -i '/ndk-build/d' scripts/build-native.sh && \ ./scripts/build-native.sh && sed -i 's/armeabi-v7a armeabi x86/x86/g' jni/Application.mk && \ sed -i '/proguard/d' project.properties,forceversion=yes,forcevercode=yes From 04558e60af7f2caf8c3a9467f2c142f6fa0ea207 Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 18 Dec 2012 20:54:12 +0000 Subject: [PATCH 9/9] apv descriptions --- metadata/cx.hell.android.pdfview.txt | 5 +++-- metadata/cx.hell.android.pdfviewpro.txt | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/metadata/cx.hell.android.pdfview.txt b/metadata/cx.hell.android.pdfview.txt index a398d47960..c6f19f2456 100644 --- a/metadata/cx.hell.android.pdfview.txt +++ b/metadata/cx.hell.android.pdfview.txt @@ -15,9 +15,10 @@ Features: * Flexible key/button/gesture configuration * Different color schemes for comfortable reading * Optimizations for eInk +* x86 support -An enhanced version for this is available in cx.hell.android.pdfviewpro, which also -has x86 support, contents table and text reflow. +An enhanced version for this is available in [[cx.hell.android.pdfviewpro]]; you +should probably install that as this one will probably be removed at some point. . Repo Type:hg diff --git a/metadata/cx.hell.android.pdfviewpro.txt b/metadata/cx.hell.android.pdfviewpro.txt index 3b67af5b21..2abb1dfce5 100644 --- a/metadata/cx.hell.android.pdfviewpro.txt +++ b/metadata/cx.hell.android.pdfviewpro.txt @@ -19,7 +19,8 @@ Features: * Different color schemes for comfortable reading * Optimizations for eInk -There are two apks, which contain native binaries for different CPU architectures. The client will +There are two apks, which contain native binaries for different CPU architectures: if you +are in doubt, you should try the arm one. The client will mark the arm version as current so take care updating if you use the x86 one. .