Merge branch 'master' of gitorious.org:f-droid/fdroiddata
This commit is contained in:
Ciaran Gultnieks
commit
9091af3f13
|
|
@ -1,9 +1,9 @@
|
|||
Categories:Internet
|
||||
License:GPLv3
|
||||
Web Site:http://www.kontalk.org
|
||||
Source Code:https://code.google.com/p/kontalk.androidclient/source
|
||||
Issue Tracker:https://code.google.com/p/kontalk/issues
|
||||
Donate:http://www.kontalk.net
|
||||
Source Code:https://github.com/kontalk/androidclient
|
||||
Issue Tracker:https://github.com/kontalk/androidclient/issues
|
||||
Donate:https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=VU57LMG64GATN
|
||||
Bitcoin:14vipppSvCG7VdvoYmbhKZ8DbTfv9U1QfS
|
||||
|
||||
Auto Name:Kontalk
|
||||
|
|
@ -22,7 +22,7 @@ for sending you the verification code, then it will be discarded.
|
|||
.
|
||||
|
||||
Repo Type:git
|
||||
Repo:https://code.google.com/p/kontalk.androidclient
|
||||
Repo:https://github.com/kontalk/androidclient.git
|
||||
|
||||
Build:2.2.5,21
|
||||
commit=2.2.5
|
||||
|
|
@ -106,6 +106,6 @@ Build:2.2.9,26
|
|||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:Tags
|
||||
Current Version:3.0a4
|
||||
Current Version Code:30
|
||||
Current Version:3.0a5
|
||||
Current Version Code:31
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ Repo Type:git
|
|||
Repo:https://github.com/Vilbrekin/tinc_gui.git
|
||||
|
||||
Build:0.9.7-arm,8
|
||||
commit=73e7bbd909640a16
|
||||
commit=ad35972299ad697a0770e7b8d9cb5b3778415a7f
|
||||
forceversion=yes
|
||||
submodules=yes
|
||||
rm=res/raw/tincd
|
||||
|
|
|
|||
|
|
@ -23,8 +23,14 @@ Build:1.0.9,10999
|
|||
unzip libs/bc145_reduced_for_apg.zip -d src/ && \
|
||||
rm -f libs/bc145_reduced_for_apg.zip ant.properties
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:RepoManifest/1.0.9-release
|
||||
Current Version:1.0.9
|
||||
Current Version Code:10999
|
||||
Build:1.1.1,11199
|
||||
disable=gradle error
|
||||
commit=v1.1.1
|
||||
subdir=apg
|
||||
gradle=yes
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:Tags
|
||||
Current Version:1.1.1
|
||||
Current Version Code:11199
|
||||
|
||||
|
|
|
|||
|
|
@ -45,10 +45,10 @@ Build:0.2.3.23-rc-1.0.11-RC5-test2,51
|
|||
make -C external
|
||||
|
||||
Build:13.0.5,70
|
||||
disable=wait until patches are merged and new release is out
|
||||
commit=03667e2c916fe6ed091c0e9
|
||||
submodules=yes
|
||||
rm=libs
|
||||
patch=buildfixes.patch
|
||||
build=NDK_BASE=$$NDK$$ make -C external
|
||||
|
||||
Auto Update Mode:None
|
||||
|
|
|
|||
71
metadata/org.torproject.android/buildfixes.patch
Normal file
71
metadata/org.torproject.android/buildfixes.patch
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
diff --git a/.gitignore b/.gitignore
|
||||
index 4824f92..f3fb750 100644
|
||||
--- a/.gitignore
|
||||
+++ b/.gitignore
|
||||
@@ -1,16 +1,11 @@
|
||||
-external/bin/
|
||||
-external/include/
|
||||
-external/jtorctl-build-stamp
|
||||
-external/lib/
|
||||
-external/libevent-build-stamp
|
||||
-external/obfsproxy-build-stamp
|
||||
-external/openssl-static-build-stamp
|
||||
-external/privoxy-build-stamp
|
||||
-external/privoxy/
|
||||
-external/test.c
|
||||
-external/test.h.gch
|
||||
-external/tor-build-stamp
|
||||
-external/translation/
|
||||
+/external/bin/
|
||||
+/external/include/
|
||||
+/external/*-build-stamp
|
||||
+/external/lib/
|
||||
+/external/privoxy/
|
||||
+/external/test.c
|
||||
+/external/test.h.gch
|
||||
+/external/translation/
|
||||
bin
|
||||
gen
|
||||
native
|
||||
diff --git a/external/Makefile b/external/Makefile
|
||||
index 71b2a73..4be749e 100644
|
||||
--- a/external/Makefile
|
||||
+++ b/external/Makefile
|
||||
@@ -81,17 +81,15 @@ all: assets
|
||||
|
||||
lib/libcrypto.a:
|
||||
cd openssl && \
|
||||
- CC="$(CC)" \
|
||||
./Configure android -DL_ENDIAN && \
|
||||
- ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs
|
||||
+ make CC="$(CC)" ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm /usr build_libs
|
||||
|
||||
lib/libssl.a:
|
||||
cp config.sub openssl
|
||||
cp config.guess openssl
|
||||
cd openssl && \
|
||||
- CC="$(CC)"\
|
||||
./Configure android -DL_ENDIAN && \
|
||||
- ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm/usr make build_libs
|
||||
+ make CC="$(CC)" ANDROID_DEV=$(NDK_BASE)/platforms/android-8/arch-arm /usr build_libs
|
||||
|
||||
openssl-build-stamp: lib/libcrypto.a lib/libssl.a
|
||||
touch openssl-build-stamp
|
||||
@@ -115,6 +113,8 @@ openssl-clean:
|
||||
# libevent
|
||||
|
||||
libevent/Makefile:
|
||||
+ sed -i 's@\(SUBDIRS = . include\) sample test@\1@' libevent/Makefile.am
|
||||
+ sed -i 's@\(AC_OUTPUT(Makefile include/Makefile\) test/Makefile sample/Makefile)@\1)@' libevent/configure.in
|
||||
cd libevent && ./autogen.sh
|
||||
cp config.sub libevent
|
||||
cp config.guess libevent
|
||||
@@ -125,7 +125,7 @@ libevent/Makefile:
|
||||
--disable-shared
|
||||
|
||||
libevent-build-stamp: libevent/Makefile
|
||||
- $(MAKE) -C libevent
|
||||
+ $(MAKE) -C libevent ./include/event2/event-config.h all-am
|
||||
touch libevent-build-stamp
|
||||
|
||||
libevent: openssl libevent-build-stamp
|
||||
Loading…
Reference in a new issue