From 2b335d3e2fb39d9374825c750e2e22355e2c02a3 Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 13:08:53 +0100 Subject: [PATCH 1/9] fix BV of com.intervigil.micdroid --- metadata/com.intervigil.micdroid.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/metadata/com.intervigil.micdroid.txt b/metadata/com.intervigil.micdroid.txt index 9d144cef66..488f713f7d 100644 --- a/metadata/com.intervigil.micdroid.txt +++ b/metadata/com.intervigil.micdroid.txt @@ -21,6 +21,7 @@ Build Version:0.44,34,3af50666bc,update=force,\ srclibs=libautotalent@842e489b;liblame@dd48f963e;\ libwave@75ae03d1a8;libresample@804018847;MobAdMob@2d5736,prebuild=\ sed -i '/donate/d' res/menu/menu.xml && \ +sed -i '209\,215d' src/com/intervigil/micdroid/Mic.java && \ printf 'android.library.reference.1=$$MobAdMob$$\n\ android.library.reference.2=$$libautotalent$$\n\ android.library.reference.3=$$liblame$$\n\ From 539af45b9f58b09ff517f1a5db5f28a8125fa93b Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 13:15:03 +0100 Subject: [PATCH 2/9] update org.fox.ttrss to 1.8.7 --- metadata/org.fox.ttrss.txt | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/metadata/org.fox.ttrss.txt b/metadata/org.fox.ttrss.txt index 63f32f17ed..3cd44f5f93 100644 --- a/metadata/org.fox.ttrss.txt +++ b/metadata/org.fox.ttrss.txt @@ -72,6 +72,13 @@ sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@ cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \ cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \ cp libs/android-support-v4.jar $$SlidingMenu$$/libs +Build Version:1.8.7,187,2ad9f766e7,patch=notrial_new.patch,srclibs=\ +ActionBarSherlock@4.3.1;ViewPagerIndicator@2.4.1;SlidingMenu@8fcae2cce29e,prebuild=\ +sed -i -e 's@1=.*@1=$$ViewPagerIndicator$$@' -e 's@2=.*@2=$$ActionBarSherlock$$@' \ +-e 's@3=.*@3=$$SlidingMenu$$@' project.properties && \ +cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs && \ +cp libs/android-support-v4.jar $$ViewPagerIndicator$$/libs && \ +cp libs/android-support-v4.jar $$SlidingMenu$$/libs Auto Update Mode:None Update Check Mode:Market From a5d0304cf850b3d4d3366214c071c1e6d9006bea Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 13:16:20 +0100 Subject: [PATCH 3/9] AUM for net.fred.feedex --- metadata/net.fred.feedex.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/net.fred.feedex.txt b/metadata/net.fred.feedex.txt index 2f6e1e96f3..dc476a86d5 100644 --- a/metadata/net.fred.feedex.txt +++ b/metadata/net.fred.feedex.txt @@ -19,7 +19,7 @@ Build Version:1.0.8,9,v1.0.8 Build Version:1.0.9,10,v1.0.9 Build Version:1.1.1,12,v1.1.1,prebuild=sed -i -e '/proguard/d' project.properties -Auto Update Mode:None +Auto Update Mode:Version v%v Update Check Mode:Tags Current Version:1.1.1 Current Version Code:12 From 4b8374ffd3bd8ba07b5919b1f022d3302d4d9bbb Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 13:27:42 +0100 Subject: [PATCH 4/9] Disable com.nononsenseapps.notepad (see metadata) --- metadata/com.nononsenseapps.notepad.txt | 11 +++++++---- metadata/org.mumod.android.txt | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/metadata/com.nononsenseapps.notepad.txt b/metadata/com.nononsenseapps.notepad.txt index 6116584ed6..6152f849df 100644 --- a/metadata/com.nononsenseapps.notepad.txt +++ b/metadata/com.nononsenseapps.notepad.txt @@ -1,3 +1,4 @@ +Disabled:Disable until FOSS branch created, or until GMS patch and local sync can be achieved Category:Office License:Apache2 Web Site:https://github.com/spacecowboy/NotePad @@ -6,7 +7,7 @@ Issue Tracker:https://github.com/spacecowboy/NotePad/issues Bitcoin:1Bt9RVseU3cLTPbc1hqUgU9UtGgi9iNL8r Name:NoNonsense Notes -Auto Name:NotePad +Auto Name:Notes Summary:Simple notepad Description: N.B. The syncing with Google Tasks won't work because there are @@ -34,9 +35,11 @@ Build Version:4.0,42,4.0-release,init=rm -f build.xml custom_rules.xml,prebuild= Build Version:4.1,43,4.1-rel,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd Build Version:4.3,46,4.3-release,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd Build Version:4.4.1,49,4.4.1-release,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd +Build Version:5.0,88,!Uses GMS to provide location reminders at 0013b649c817,subdir=NoNonsenseNotes,init=rm -f build.xml custom_rules.xml,prebuild=rm -f *.zip *.png *.7z *.psd Auto Update Mode:None -Update Check Mode:Tags -Current Version:4.4.1 -Current Version Code:49 +# Also on gplay +Update Check Mode:RepoManifest +Current Version:5.0 +Current Version Code:88 diff --git a/metadata/org.mumod.android.txt b/metadata/org.mumod.android.txt index 43892f2156..11d998ccfa 100644 --- a/metadata/org.mumod.android.txt +++ b/metadata/org.mumod.android.txt @@ -14,8 +14,8 @@ Client for [http://status.net/wiki/Take_a_tour StatusNet] GNU social is a microblogging platform somewhat like Twitter, but decentralized. Some examples are: [https://status.fsf.org fsf.org], -[https://sn.jpope.org jpope.org] and [http://bka.li bka.li]. -The latter is in German, as is the website. +and [http://bka.li bka.li]. +(The latter is in German, as is the website) Twitter is disabled in this build, but in future versions it will be possible to enter oAuth credentials into the app, after From ac262ee9df49f06eb385ca538f04ad3fd32486c4 Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 13:53:29 +0100 Subject: [PATCH 5/9] NonfreeAdd anti-feature for org.mozilla.firefox --- metadata/org.mozilla.firefox.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/metadata/org.mozilla.firefox.txt b/metadata/org.mozilla.firefox.txt index 6432471334..38dfc8d09f 100644 --- a/metadata/org.mozilla.firefox.txt +++ b/metadata/org.mozilla.firefox.txt @@ -1,3 +1,4 @@ +AntiFeatures:NonFreeAdd Category:Internet #mostly... License:MPL2 @@ -16,8 +17,12 @@ support for addons and the ability to enable or disable the search suggestions. '''This apk will only work on ARMv7 devices''': see the website for a list of supported devices and -a link to the ftp server for builds that work on ARMv6 CPUs with +a link to the ftp server for builds that work on ARMv6 or x86 CPUs with at least 500MB of RAM. + +Anti-features: Non-free Addons. The license of the addons/modules on +addons.mozilla.org may be seen in the version notes of the addon but often the +license is Custom or other non-free. . #Binaries in repo for now, build process is large and complex. They are very From c0d0dfcddc5c41a34e2d7236e3275b2dc7225dd5 Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 15:29:53 +0100 Subject: [PATCH 6/9] more wip osmand --- metadata/net.osmand.plus.txt | 20 ++++++++++++-------- srclibs/build.txt | 2 +- srclibs/resources.txt | 3 +++ 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 srclibs/resources.txt diff --git a/metadata/net.osmand.plus.txt b/metadata/net.osmand.plus.txt index 5dd6791684..4f99fbc5ac 100644 --- a/metadata/net.osmand.plus.txt +++ b/metadata/net.osmand.plus.txt @@ -58,19 +58,23 @@ cp -r ../DataExtractionOSM/build/lib/ libs/ # Name srclibs in such a way as to replicate OsmAnd build tree # Could try making https://github.com/osmandapp/OsmAnd-external-qtbase a srclib too -Build Version:1.4-fdroid,145,!WIP at r1.4,\ -rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,update=.;../SherlockBar,\ -srclibs=tools@9b4c9da995;core@r1.1.4;build@master,prebuild=\ +# Declare OSMAND_ARM_ONLY=true ndk-build.sh for just ARM +# Don't really understand what the other build.xmls do: they don't appear to put jars in classpath +# Jars haven't been verified +Build Version:1.4-fdroid,145,r1.4,\ +rm=SherlockBar/build.xml,subdir=OsmAnd,encoding=utf-8,\ +srclibs=tools@9b4c9da995;core@r1.1.4;build@86a575b93,prebuild=\ +sed -i 's/debuggable="true"/debuggable="false"/g' AndroidManifest.xml && \ +$$SDK$$/tools/android update project -p ../SherlockBar && \ sed -i 's/"\${aapt.ignore.assets}"/"\${aapt.ignore.assets}" \ libraryRFileRefid="project.library.bin.r.file.path"/g' build.xml && \ sed -i 's/app_version">[^<]*/app_version">1.4-fdroid/' \ res/values/no_translate.xml && sed -i '/keys/d' ant.properties,build=\ -ant build -f $$tools$$/OsmAndMapCreator/build.xml && \ -mv $$tools$$/OsmAndMapCreator/OsmAndMapCreator.jar libs/ && \ -mv $$core$$/OsmAnd-java/OsmAnd-core.jar libs/ && \ -zip -d libs/OsmAnd-core.jar net/osmand/PlatformUtil.class && \ -$$NDK$$/ndk-build +ant jar native-libs -f $$tools$$/OsmAndMapCreator/build.xml && \ +ant build -f ../OsmAnd-java/build.xml && \ +ANDROID_SDK=$$SDK$$ ANDROID_NDK=$$NDK$$ ./ndk-build.sh,buildjni=no +# well need to source "resources" srclib for next version # see https://github.com/osmandapp/OsmAnd-manifest/blob/master/current_release.xml Auto Update Mode:None Update Check Mode:Market diff --git a/srclibs/build.txt b/srclibs/build.txt index dd8e6b8ca2..e6238b94a0 100644 --- a/srclibs/build.txt +++ b/srclibs/build.txt @@ -1,3 +1,3 @@ Repo Type:git -Repo:https://github.com/osmandapp/Osmand-build +Repo:https://github.com/osmandapp/OsmAnd-build diff --git a/srclibs/resources.txt b/srclibs/resources.txt new file mode 100644 index 0000000000..8b9f0d969e --- /dev/null +++ b/srclibs/resources.txt @@ -0,0 +1,3 @@ +Repo Type:git +Repo:https://github.com/osmandapp/OsmAnd-resources + From 77b88a413651b76cd5eb8b60fe77f0047cd811ab Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 15:57:00 +0100 Subject: [PATCH 7/9] update org.jessies.mathdroid to 2.9.3 --- metadata/org.jessies.mathdroid.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/metadata/org.jessies.mathdroid.txt b/metadata/org.jessies.mathdroid.txt index e5af770770..a0e4daee7c 100644 --- a/metadata/org.jessies.mathdroid.txt +++ b/metadata/org.jessies.mathdroid.txt @@ -25,11 +25,13 @@ Build Version:2.9.2,292,675,target=android-17,\ subdir=mathdroid,prebuild=sed -i 's/android:minSdkVersion=\"3\"/\ android:minSdkVersion=\"4\"/g' AndroidManifest.xml && cd src/org/jessies/ && rm test && \ svn co http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test +Build Version:2.9.3,293,682,target=android-17,\ +subdir=mathdroid,prebuild=sed -i 's/android:minSdkVersion=\"3\"/\ +android:minSdkVersion=\"4\"/g' AndroidManifest.xml && cd src/org/jessies/ && rm test && \ +svn co http://software.jessies.org/svn/salma-hayek/trunk/src/org/jessies/test Auto Update Mode:None Update Check Mode:Market Current Version:2.9.3 Current Version Code:293 -No Source Since:2.9.3 - From 644615310b11730fccfadfe4224fd99b54af7a3f Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 15:59:12 +0100 Subject: [PATCH 8/9] use UCM:RM/nomusic for org.blockinger.game --- metadata/org.blockinger.game.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/org.blockinger.game.txt b/metadata/org.blockinger.game.txt index 80458ad10d..4463c19136 100644 --- a/metadata/org.blockinger.game.txt +++ b/metadata/org.blockinger.game.txt @@ -22,7 +22,7 @@ Build Version:1.4.4,7,v1.4.4-nomusic,target=android-17,prebuild=rm -rf gen bin . Build Version:1.5,9,v1.5-nomusic,target=android-17,prebuild=rm -rf gen bin .settings Auto Update Mode:None -Update Check Mode:Tags +Update Check Mode:RepoManifest/nomusic Current Version:1.7 Current Version Code:11 From caf0bbed5f1fa9d17a8ae0965316d4e57356fa9b Mon Sep 17 00:00:00 2001 From: David Black Date: Thu, 20 Jun 2013 16:37:40 +0100 Subject: [PATCH 9/9] new app org.androidsoft.games.slowit --- metadata/org.androidsoft.games.slowit.txt | 28 +++++++++++++++++++++++ srclibs/AndroidSoft.txt | 5 ++++ 2 files changed, 33 insertions(+) create mode 100644 metadata/org.androidsoft.games.slowit.txt create mode 100644 srclibs/AndroidSoft.txt diff --git a/metadata/org.androidsoft.games.slowit.txt b/metadata/org.androidsoft.games.slowit.txt new file mode 100644 index 0000000000..553c9db7fc --- /dev/null +++ b/metadata/org.androidsoft.games.slowit.txt @@ -0,0 +1,28 @@ +Category:Games;Children +License:GPLv3 +Web Site:http://www.androidsoft.org/ +Source Code:http://code.google.com/p/androidsoft/source/browse/trunk/SlowIt +Issue Tracker:https://code.google.com/p/androidsoft/issues/list + +Auto Name:Slow It! +Summary:Simple game +Description: +Keep the balls in the target area by guiding them with your finger. +Designed for children. +. + +Repo Type:srclib +Repo:AndroidSoft + +Build Version:2.0,10,75,forceversion=yes,subdir=SlowIt,\ +extlibs=android/android-support-v13.jar,prebuild=rm -rf libs/* && \ +rm -rf $(find .. -name releases) && cd ../ && \ +echo "source.dir=$PWD/SlowIt/src;$PWD/libs/Credits/src;\ +$PWD/libs/Utils/src" > SlowIt/ant.properties + +Auto Update Mode:None +# Bug in RM for srclibs +Update Check Mode:Market +Current Version:2.0 +Current Version Code:10 + diff --git a/srclibs/AndroidSoft.txt b/srclibs/AndroidSoft.txt new file mode 100644 index 0000000000..27d9a4512f --- /dev/null +++ b/srclibs/AndroidSoft.txt @@ -0,0 +1,5 @@ +Repo Type:git-svn +Repo:https://androidsoft.googlecode.com/svn/trunk + +# Not working +#Prepare:rm -rf $(find . -name releases)