Merge branch 'master' into 'master'
Tremotesf: update native dependencies and NDK, fix license See merge request fdroid/fdroiddata!4133
This commit is contained in:
commit
c0d70bff35
|
@ -1,5 +1,5 @@
|
||||||
Categories:Internet
|
Categories:Internet
|
||||||
License:GPL-3.0-only
|
License:GPL-3.0-or-later
|
||||||
Web Site:
|
Web Site:
|
||||||
Source Code:https://github.com/equeim/tremotesf-android
|
Source Code:https://github.com/equeim/tremotesf-android
|
||||||
Issue Tracker:https://github.com/equeim/tremotesf-android/issues
|
Issue Tracker:https://github.com/equeim/tremotesf-android/issues
|
||||||
|
@ -185,14 +185,14 @@ Build:1.8.5,23
|
||||||
sudo=apt-get update || apt-get update && \
|
sudo=apt-get update || apt-get update && \
|
||||||
apt-get install -y g++
|
apt-get install -y g++
|
||||||
gradle=fdroid
|
gradle=fdroid
|
||||||
srclibs=OpenSSL@OpenSSL_1_1_1,QtBase@v5.11.2
|
srclibs=OpenSSL@OpenSSL_1_1_1a,QtBase@v5.12.0
|
||||||
prebuild=sed -i -e '/splits/,+7d' build.gradle && \
|
prebuild=sed -i -e '/splits/,+7d' build.gradle && \
|
||||||
sed -i -e 's/android:extractNativeLibs=\"false\"/android:extractNativeLibs=\"true\"/' src/main/AndroidManifest.xml && \
|
sed -i -e 's/android:extractNativeLibs=\"false\"/android:extractNativeLibs=\"true\"/' src/main/AndroidManifest.xml && \
|
||||||
cp -a $$OpenSSL$$ ../3rdparty/openssl/openssl && \
|
cp -a $$OpenSSL$$ ../3rdparty/openssl/openssl && \
|
||||||
cp -a $$QtBase$$ ../3rdparty/qt/qtbase
|
cp -a $$QtBase$$ ../3rdparty/qt/qtbase
|
||||||
scandelete=3rdparty
|
scandelete=3rdparty
|
||||||
build=ANDROID_SDK_ROOT="$$SDK$$" ANDROID_NDK_ROOT="$$NDK$$" ../build-native.sh -j $(nproc)
|
build=ANDROID_SDK_ROOT="$$SDK$$" ANDROID_NDK_ROOT="$$NDK$$" ../build-native.sh -j $(nproc)
|
||||||
ndk=r17b
|
ndk=r18b
|
||||||
|
|
||||||
Auto Update Mode:Version %v
|
Auto Update Mode:Version %v
|
||||||
Update Check Mode:Tags
|
Update Check Mode:Tags
|
||||||
|
|
Loading…
Reference in a new issue