Merge commit 'refs/merge-requests/519' of gitorious.org:f-droid/fdroiddata

metadata/com.willhauck.linconnectclient.txt

@@ -27,6 +27,12 @@ Build:2.13,7
     target=android-19
     srclibs=1:Changelog-cketti@v1.2.0
 
+Build:2.20,220
+    commit=66e3aa62
+    subdir=LinConnectClient
+    target=android-19
+    srclibs=1:Changelog-cketti@v1.2.0
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest
 Current Version:2.20

metadata/de.blau.android.txt

@@ -76,6 +76,13 @@ Build:0.9.4r698,27
     srclibs=1:ActionBarSherlock@4.4.0
     prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
 
+Build:0.9.4r741,28
+    commit=0.9/741
+    target=android-19
+    extlibs=android/android-support-v4.jar
+    srclibs=1:ActionBarSherlock@4.4.0
+    prebuild=cp libs/android-support-v4.jar $$ActionBarSherlock$$/libs/
+
 Auto Update Mode:None
 Update Check Mode:RepoManifest/0.9
 Current Version:0.9.4r741

metadata/org.telegram.messenger.txt

@@ -42,6 +42,15 @@ Build:1.3.26,177
         gradle nativeLibsToJar
     buildjni=no
 
+Build:1.4.9,212
+    commit=v1.4.9a
+    subdir=TMessagesProj
+    gradle=yes
+    patch=jni_includes.patch
+    build=ndk-build -j4 && \
+        gradle nativeLibsToJar
+    buildjni=no
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:1.4.9

metadata/org.telegram.messenger/jni_includes.patch

@@ -0,0 +1,23 @@
+diff --git a/TMessagesProj/jni/Android.mk b/TMessagesProj/jni/Android.mk
+index 520e05f..57a8162 100755
+--- a/TMessagesProj/jni/Android.mk
++++ b/TMessagesProj/jni/Android.mk
+@@ -155,12 +155,12 @@ LOCAL_SRC_FILES     += \
+ ./opus/opusfile/stream.c
+ 
+ LOCAL_C_INCLUDES    := \
+-./opus/include \
+-./opus/silk \
+-./opus/silk/fixed \
+-./opus/celt \
+-./opus/ \
+-./opus/opusfile
++$(LOCAL_PATH)/opus/include \
++$(LOCAL_PATH)/opus/silk \
++$(LOCAL_PATH)/opus/silk/fixed \
++$(LOCAL_PATH)/opus/celt \
++$(LOCAL_PATH)/opus/ \
++$(LOCAL_PATH)/opus/opusfile
+ 
+ LOCAL_SRC_FILES     += \
+ ./aes_core.c \

srclibs/Changelog-cketti.txt

@@ -2,4 +2,4 @@ Repo Type:git
 Repo:https://github.com/cketti/ckChangeLog
 
 Subdir:library,ckChangeLog/src/main
-Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo 'target=android-19' > project.properties
+Prepare:[ -f project.properties ] || echo 'source.dir=java' > ant.properties && echo 'target=android-19' > project.properties && echo "android.library=true" >> project.properties