From ed808b634e63cf843c5f6a2446deca1ee8ce285f Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 20 Jan 2014 13:34:24 +0000 Subject: [PATCH 01/11] update Smashwords Access to beta 14 --- build/extlib/SW-build.gradle_58 | 21 +++++++++++++++++++ .../com.unleashyouradventure.swaccess.txt | 15 ++++++++++--- 2 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 build/extlib/SW-build.gradle_58 diff --git a/build/extlib/SW-build.gradle_58 b/build/extlib/SW-build.gradle_58 new file mode 100644 index 0000000000..29c3e5c22a --- /dev/null +++ b/build/extlib/SW-build.gradle_58 @@ -0,0 +1,21 @@ +apply plugin: 'java' +apply plugin: 'maven' + +sourceCompatibility = 1.6 + + +version = '1.0-SNAPSHOT' +group = 'com.swaccess' + +repositories { + mavenCentral() +} + +dependencies { + compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0.1' + compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.0.1' + compile group: 'org.jsoup', name: 'jsoup', version: '1.6.1' + compile group: 'com.google.code.gson', name: 'gson', version: '2.2.1' + compile group: 'org.projectlombok', name: 'lombok', version:'1.12.2' +} + diff --git a/metadata/com.unleashyouradventure.swaccess.txt b/metadata/com.unleashyouradventure.swaccess.txt index 181585e949..b4a593466a 100644 --- a/metadata/com.unleashyouradventure.swaccess.txt +++ b/metadata/com.unleashyouradventure.swaccess.txt @@ -8,8 +8,9 @@ Auto Name:Smashwords Access Summary:eBook shop Description: Unofficial app for smashwords.com, a purveyor of DRM-free and gratis ebooks. +Enter your credentials to access purchased books. -Books can be loaded directly from Cool reader, FBReader or Pageturner +Books can be loaded directly from Cool reader, FBReader or Pageturner. . Repo Type:git-svn @@ -24,8 +25,16 @@ Build:011 beta,11 cp -r $$ImageLoader-Novoda$$/src/main/java/com/novoda/ src/com/ && \ cp -r $$Google-Gson$$/src/main/java/com/google/ src/com/ -Build:012 beta,12 - disable=not published +Build:014 beta,14 + commit=33 + subdir=SmashwordsAccess + extlibs=SW-build.gradle_58 + srclibs=1:ActionBarSherlock@4.4.0;Smashwords-API@58;ImageLoader-Novoda@imageloader-parent-1.5.8 + rm=SmashwordsAccess/libs/imageloader-core-1.5.8.jar + prebuild=cp -r $$ImageLoader-Novoda$$/src/main/java/com/novoda/ src/com/ && \ + mv libs/SW-build.gradle_58 $$Smashwords-API$$/build.gradle + build=gradle jar -p $$Smashwords-API$$ && \ + mv $$Smashwords-API$$/build/libs/SmashwordsAPI-1.0-SNAPSHOT.jar libs/ Auto Update Mode:None Update Check Mode:RepoManifest From 868be4845b923593f4e560403eb3775f7e91264b Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 20 Jan 2014 13:51:31 +0000 Subject: [PATCH 02/11] add Bankomat Card Infos --- metadata/at.zweng.bankomatinfos.txt | 33 +++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 metadata/at.zweng.bankomatinfos.txt diff --git a/metadata/at.zweng.bankomatinfos.txt b/metadata/at.zweng.bankomatinfos.txt new file mode 100644 index 0000000000..9a194f4135 --- /dev/null +++ b/metadata/at.zweng.bankomatinfos.txt @@ -0,0 +1,33 @@ +Categories:Office +License:GPLv3 +Web Site:http://johannes.zweng.at +Source Code:https://github.com/johnzweng/bankomatinfos +Issue Tracker:https://github.com/johnzweng/bankomatinfos/issues +Donate:http://johannes.zweng.at/donations.html + +Auto Name:Bankomat Card Infos +Summary:Read bank card via NFC +Description: +Tries to read the last transactions and some general infos from a NFC-enabled +Austrian Bankomatkarte (Maestro debit card) via NFC. +It may not work on all cards, only tested with cards from Bank Austria for now. + +It checks if the card contains the Paylife Quick application +(`AID D040000001000002`) and the Maestro (Bankomat) application +(`AID A0000000043060`) and tries to read some free accessible files +(no authentication is performed to card). +. + +Repo Type:git +Repo:https://github.com/johnzweng/bankomatinfos.git + +Build:1.2.4,7 + commit=845e11d71f751 + prebuild=rm $(find res -name ic_launcher.png) && \ + touch res/drawable/ic_launcher.png + +Auto Update Mode:None +Update Check Mode:RepoManifest +Current Version:1.2.4 +Current Version Code:7 + From 8bcc08add8f642b5a5532050950fe95e06801d00 Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 20 Jan 2014 14:05:59 +0000 Subject: [PATCH 03/11] Add Eyecam --- metadata/ch.hsr.eyecam.txt | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 metadata/ch.hsr.eyecam.txt diff --git a/metadata/ch.hsr.eyecam.txt b/metadata/ch.hsr.eyecam.txt new file mode 100644 index 0000000000..b71ba1484c --- /dev/null +++ b/metadata/ch.hsr.eyecam.txt @@ -0,0 +1,36 @@ +Categories:Multimedia +License:GPLv3 +Web Site: +Source Code:https://github.com/tom-and-jerry/eyeCam +Issue Tracker:https://github.com/tom-and-jerry/eyeCam/issues + +Auto Name:eyeCam +Summary:Recognize colours +Description: +An augmented reality app which aims to support colorblind people in +distinguishing and recognizing colors. + +* Color recognition +* Camera filters to enhance color differentiation +* Simulation of colorblindness (e.g. for web developers) + +Known issues: +* Color recognition does not work properly sometimes +* Tablets are not yet supported (orientation is off) + +[http://chir.ag/projects/name-that-color Name that color] +is used to detect color names. +. + +Repo Type:git +Repo:https://github.com/tom-and-jerry/eyeCam.git + +Build:0.9-beta,81 + commit=161096295b4d4 + buildjni=yes + +Auto Update Mode:None +Update Check Mode:RepoManifest +Current Version:0.9-beta +Current Version Code:81 + From 9d9cc6a673042322812b0a19bda68f96830a270d Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 20 Jan 2014 14:13:00 +0000 Subject: [PATCH 04/11] Add JTT and srclib --- metadata/com.aragaer.jtt.txt | 41 +++++++++++++++++++++++++++++++ srclibs/SunriseSunset-aragaer.txt | 5 ++++ 2 files changed, 46 insertions(+) create mode 100644 metadata/com.aragaer.jtt.txt create mode 100644 srclibs/SunriseSunset-aragaer.txt diff --git a/metadata/com.aragaer.jtt.txt b/metadata/com.aragaer.jtt.txt new file mode 100644 index 0000000000..9910614658 --- /dev/null +++ b/metadata/com.aragaer.jtt.txt @@ -0,0 +1,41 @@ +Categories:System +License:MIT +Web Site:http://aragaer.github.com/jtt_android +Source Code:https://github.com/aragaer/jtt_android +Issue Tracker:https://github.com/aragaer/jtt_android/issues + +Auto Name:Japanese Traditional Time +Summary:Clock widget +Description: +A clock widget based on the traditional Japanese time +[https://en.wikipedia.org/wiki/Japanese_clock#The_traditional_Japanese_time_system system]. + +* Widget showing the current hour (named after an animal) +* Mapping of traditional time to local time +* (Eventually) Alarms based on traditional time + +The sunrise and sunset times for are calculated locally +by the app for the current location; +if the device doesn't know that you can enter a manual one. +. + +Repo Type:git +Repo:https://github.com/aragaer/jtt_android.git + +Build:1.4.4.2,24 + commit=v1.4.4.2 + init=sed -i '/reference.1/d' project.properties + srclibs=1:SunriseSunset-aragaer@aee96f + +Build:1.4.4.5-pre,25 + disable=not published + +Maintainer Notes: +Uses git submodules +. + +Auto Update Mode:None +Update Check Mode:Tags +Current Version:1.4.5pre +Current Version Code:25 + diff --git a/srclibs/SunriseSunset-aragaer.txt b/srclibs/SunriseSunset-aragaer.txt new file mode 100644 index 0000000000..6a674f1f36 --- /dev/null +++ b/srclibs/SunriseSunset-aragaer.txt @@ -0,0 +1,5 @@ +Repo Type:git +Repo:https://github.com/aragaer/sunrisesunsetlib-java +Prepare:rm -rf src/test build.xml +Update Project:Yes + From 0b200485250377cfb42499696762cfd56296918a Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 20 Jan 2014 14:44:05 +0000 Subject: [PATCH 05/11] Fix Prevo --- metadata/uk.co.busydoingnothing.prevo.txt | 29 +++++++++++++++++++---- srclibs/PrevoDB.txt | 2 ++ srclibs/Revo.txt | 2 ++ 3 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 srclibs/PrevoDB.txt create mode 100644 srclibs/Revo.txt diff --git a/metadata/uk.co.busydoingnothing.prevo.txt b/metadata/uk.co.busydoingnothing.prevo.txt index e3482987dc..4cf8ff9e40 100644 --- a/metadata/uk.co.busydoingnothing.prevo.txt +++ b/metadata/uk.co.busydoingnothing.prevo.txt @@ -1,7 +1,8 @@ Categories:Science & Education License:GPLv2 -Web Site:http://www.busydoingnothing.co.uk/prevo -Source Code:http://git.busydoingnothing.co.uk/cgit.cgi/prevo-android.git +Web Site:http://www.busydoingnothing.co.uk/prevo/ +Source Code:http://git.busydoingnothing.co.uk/cgit.cgi/prevo-android.git/ +Issue Tracker: Summary:Esperanto dictionary Description: @@ -13,8 +14,26 @@ searched with the keyboard. Repo Type:git Repo:git://git.busydoingnothing.co.uk/prevo-android.git -Build Version:0.3,3,!Needs a lot of work 5bbaab6852978e,target=android-14 +Build:0.9,9 + commit=0.9 + target=android-14 + srclibs=Revo@ade7e27bf8;PrevoDB@c2de0f915c9c4 + build=cp -r $$Revo$$ . && \ + cp -r $$PrevoDB$$ . && \ + cd PrevoDB && \ + sed -i '/AS_ALL_LINGUAS/d' configure.ac && \ + aclocal && \ + autoheader && \ + automake -a && \ + intltoolize && \ + autoconf && \ + ./configure && \ + make -j2 && \ + ./src/prevodb -i ../Revo -o .. -#Tags/Repo can't find version info and no reviews on market -Update Check Mode:Static +Auto Update Mode:None +# Tags/Repo can't find version info +Update Check Mode:None +Current Version:0.9 +Current Version:9 diff --git a/srclibs/PrevoDB.txt b/srclibs/PrevoDB.txt new file mode 100644 index 0000000000..a97c6cbd6b --- /dev/null +++ b/srclibs/PrevoDB.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:git://git.busydoingnothing.co.uk/prevodb.git diff --git a/srclibs/Revo.txt b/srclibs/Revo.txt new file mode 100644 index 0000000000..fa680f66cb --- /dev/null +++ b/srclibs/Revo.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:git://git.busydoingnothing.co.uk/revo.git From 2bdc921fe680c0430da61f548a085459eb11a1e9 Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 20 Jan 2014 15:48:51 +0000 Subject: [PATCH 06/11] use massive sed hack to patch a srclib instead of using an extlib --- build/extlib/SW-build.gradle_58 | 21 ------------------- .../com.unleashyouradventure.swaccess.txt | 3 +-- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 build/extlib/SW-build.gradle_58 diff --git a/build/extlib/SW-build.gradle_58 b/build/extlib/SW-build.gradle_58 deleted file mode 100644 index 29c3e5c22a..0000000000 --- a/build/extlib/SW-build.gradle_58 +++ /dev/null @@ -1,21 +0,0 @@ -apply plugin: 'java' -apply plugin: 'maven' - -sourceCompatibility = 1.6 - - -version = '1.0-SNAPSHOT' -group = 'com.swaccess' - -repositories { - mavenCentral() -} - -dependencies { - compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.0.1' - compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.0.1' - compile group: 'org.jsoup', name: 'jsoup', version: '1.6.1' - compile group: 'com.google.code.gson', name: 'gson', version: '2.2.1' - compile group: 'org.projectlombok', name: 'lombok', version:'1.12.2' -} - diff --git a/metadata/com.unleashyouradventure.swaccess.txt b/metadata/com.unleashyouradventure.swaccess.txt index b4a593466a..66602a6317 100644 --- a/metadata/com.unleashyouradventure.swaccess.txt +++ b/metadata/com.unleashyouradventure.swaccess.txt @@ -28,11 +28,10 @@ Build:011 beta,11 Build:014 beta,14 commit=33 subdir=SmashwordsAccess - extlibs=SW-build.gradle_58 srclibs=1:ActionBarSherlock@4.4.0;Smashwords-API@58;ImageLoader-Novoda@imageloader-parent-1.5.8 rm=SmashwordsAccess/libs/imageloader-core-1.5.8.jar prebuild=cp -r $$ImageLoader-Novoda$$/src/main/java/com/novoda/ src/com/ && \ - mv libs/SW-build.gradle_58 $$Smashwords-API$$/build.gradle + sed -i "2d;5s/:/=/g;13,14d;s/compile 'com.google.code.gson:gson:2.2.1'/compile group: 'com.google.code.gson', name: 'gson', version: '2.2.1'/g;s/compile 'org.projectlombok:lombok:1.12.2'/compile group: 'org.projectlombok', name: 'lombok', version: '1.12.2'/g;26,28d" $$Smashwords-API$$/build.gradle build=gradle jar -p $$Smashwords-API$$ && \ mv $$Smashwords-API$$/build/libs/SmashwordsAPI-1.0-SNAPSHOT.jar libs/ From e034ab1428e35d60f79e914411f9078eb35baf2a Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 20 Jan 2014 18:45:07 +0000 Subject: [PATCH 07/11] can't build apk because fdroid only allows latest NDK --- metadata/net.gorry.android.input.nicownng.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/net.gorry.android.input.nicownng.txt b/metadata/net.gorry.android.input.nicownng.txt index d766e699c9..9cd92cf47a 100644 --- a/metadata/net.gorry.android.input.nicownng.txt +++ b/metadata/net.gorry.android.input.nicownng.txt @@ -23,9 +23,9 @@ Build Version:2013.0425.1.1305,201304251,3,target=android-10,prebuild=\ echo 'NDK_TOOLCHAIN_VERSION=4.4.3' >> jni/Application.mk,buildjni=yes Build:2013.1231.1.1305,201312311 + disable=needs GCC 4.4.3 commit=5 target=android-19 - prebuild=echo 'NDK_TOOLCHAIN_VERSION=4.4.3' >> jni/Application.mk buildjni=yes Auto Update Mode:None From 45a78d4d715c7804985370841ebd7f5e2c83ccd7 Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 20 Jan 2014 19:12:40 +0000 Subject: [PATCH 08/11] hack to get nicownng to build --- metadata/net.gorry.android.input.nicownng.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/net.gorry.android.input.nicownng.txt b/metadata/net.gorry.android.input.nicownng.txt index 9cd92cf47a..aa1e3ebc4f 100644 --- a/metadata/net.gorry.android.input.nicownng.txt +++ b/metadata/net.gorry.android.input.nicownng.txt @@ -23,9 +23,9 @@ Build Version:2013.0425.1.1305,201304251,3,target=android-10,prebuild=\ echo 'NDK_TOOLCHAIN_VERSION=4.4.3' >> jni/Application.mk,buildjni=yes Build:2013.1231.1.1305,201312311 - disable=needs GCC 4.4.3 commit=5 target=android-19 + prebuild=sed -i 's/,--gc-section//g' jni/libwnnDictionary/Android.mk buildjni=yes Auto Update Mode:None From 1926124087d63e1b281928a14c45a8733e27b6ee Mon Sep 17 00:00:00 2001 From: David Black Date: Mon, 20 Jan 2014 19:17:34 +0000 Subject: [PATCH 09/11] small fix to last commit --- metadata/net.gorry.android.input.nicownng.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata/net.gorry.android.input.nicownng.txt b/metadata/net.gorry.android.input.nicownng.txt index aa1e3ebc4f..b4868b55df 100644 --- a/metadata/net.gorry.android.input.nicownng.txt +++ b/metadata/net.gorry.android.input.nicownng.txt @@ -25,7 +25,8 @@ echo 'NDK_TOOLCHAIN_VERSION=4.4.3' >> jni/Application.mk,buildjni=yes Build:2013.1231.1.1305,201312311 commit=5 target=android-19 - prebuild=sed -i 's/,--gc-section//g' jni/libwnnDictionary/Android.mk + prebuild=sed -i 's/,--gc-section//g' jni/libwnnDictionary/Android.mk && \ + sed -i 's/4.4.3/4.6/' jni/Application.mk buildjni=yes Auto Update Mode:None From ca0fd36a3e786cb87a18d0608c7a078c9e44fb4f Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 21 Jan 2014 14:24:51 +0000 Subject: [PATCH 10/11] Build a (probably better) revision of Busybox Installer --- metadata/stericson.busybox.donate.txt | 36 +++++++++++++++++++++------ 1 file changed, 29 insertions(+), 7 deletions(-) diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt index 67baca8bdb..f3f6ddf9bd 100644 --- a/metadata/stericson.busybox.donate.txt +++ b/metadata/stericson.busybox.donate.txt @@ -37,6 +37,7 @@ Repo Type:git-svn Repo:http://busybox-android.googlecode.com/svn/trunk Build:10.3,161 + disable=build 162 instead commit=32 subdir=app/Pro target=android-15 @@ -51,10 +52,27 @@ Build:10.3,161 make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \ mv busybox-git.arm/busybox ../Pro/assets/busybox1.21.1.png +Build:10.3.1,162 + commit=37 + subdir=deprecated/Pro + forceversion=yes + forcevercode=yes + target=android-15 + srclibs=1:ViewPagerIndicator@8cd549;RootTools@3.4;BusyboxConfigs-linusyang@63dc + rm=binaries;patches;app;deprecated/Free;deprecated/Pro/assets + prebuild=mkdir assets && \ + cp -r $$RootTools$$/src/com/ src/ && \ + cp -r $$BusyboxConfigs-linusyang$$ ../BB && \ + sed -i 's/darwin-x86_64/linux-x86/g;s/4.4.3/4.6/;/android_ndk_config-w-patches/d;s/#CONFIG_FILE/CONFIG_FILE/' ../BB/Makefile + build=cd ../BB && \ + export PATH=$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin:$PATH && \ + make CONFIG_SYSROOT="$$NDK$$/platforms/android-9/arch-arm" ARCH=arm ANDROID_NDK=$$NDK$$ && \ + mv busybox-git.arm/busybox ../Pro/assets/busybox1.21.1.png + Build:10.7,180 commit=37 subdir=application/Busybox - disable=busybox builds but java app isn't functional; need to rename busybox binaries sensibly so they are made available in the UI + disable=busybox builds but java app isn't functional; if building for multiple architectures, need to rename busybox binaries sensibly so they are made available in the UI forceversion=yes forcevercode=yes gradle=pro @@ -70,7 +88,7 @@ Build:10.7,180 Build:10.7,200 commit=37 - disable=using Tias repo:sed: invalid option -- 'D' -- 'z' after patching; need to rename busybox binaries sensibly so they are made available in the UI + disable=using Tias repo:sed: invalid option -- 'D' -- 'z' after patching; if building for multiple architectures, need to rename busybox binaries sensibly so they are made available in the UI forceversion=yes forcevercode=yes subdir=application/Busybox @@ -94,19 +112,23 @@ Build:10.7,200 Maintainer Notes: The Java app is hard to figure out as things keep moving around and there are no commit descriptions. -It's now using gradle but it's half baked at time of writing. +It's now using gradle but it's half baked at r40. -Busybox x86 and MIPS hang for me with linusyang setup with stericson and basic configs. +Busybox x86 and MIPS don't build for me with linusyang setup with stericson and basic configs. The Tias setup won't patch properly; maybe it's my version of sed. -The busybox binary was tested with toolchain 4.6; I don't have toolchain 4.4.3 installed. -So if it doesn't build just sed 4.6 in ../BB/Makefile. +Recommended toolchain is 4.4.3, but f-droid doesn't have that. For 10.3 I just ripped out the prebuilts; it seems to be OK but somebody should verify. +This is all I had to go on: https://f-droid.org/forums/topic/busybox-installer/page/2/#post-10075, +but the source code is so messed up and the blobs are still there :\ + +Could consider use of standalone toolchains for compatibility with older NDKs: +https://github.com/cernekee/openconnect/commit/9df6672d7c80ceef2ed41 . Auto Update Mode:None Update Check Mode:None Current Version:10.3 -Current Version Code:161 +Current Version Code:162 From 8d9c42ad8c193b50f5c7de76ef5789ab492c5845 Mon Sep 17 00:00:00 2001 From: David Black Date: Tue, 21 Jan 2014 14:59:11 +0000 Subject: [PATCH 11/11] Add a warning to Busybox description --- metadata/stericson.busybox.donate.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/metadata/stericson.busybox.donate.txt b/metadata/stericson.busybox.donate.txt index f3f6ddf9bd..30b0d5baf0 100644 --- a/metadata/stericson.busybox.donate.txt +++ b/metadata/stericson.busybox.donate.txt @@ -7,6 +7,9 @@ Issue Tracker:http://code.google.com/p/busybox-android/issues Name:BusyBox Installer Summary:Interface to install system tools Description: +'''N.B''' During testing it was found that the restore function +wasn't working properly. It's recommended that you don't use it. + Interface to install BusyBox 1.21.1 (just ARM architecture for now as the other ones can't be built) as well other versions off the internet (if you're brave).