missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into 'master'

Browse source 
Document Viewer: attempt to fix failing build of 2.7.6

Upstream forgot to update gradleVersion in build.gradle, which seems to be causing the build to fail: https://f-droid.org/wiki/index.php?title=org.sufficientlysecure.viewer/lastbuild_2767&redirect=no

Quick hack with sed. I fixed this upstream, so the sed hack can be removed next release.

See merge request !1609
This commit is contained in:
Boris Kraut 2016-08-14 22:11:52 +00:00
parent e85815f789 3477b56be7
commit 36cc9be1b9
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
metadata/org.sufficientlysecure.viewer.txt
View file

@ -469,7 +469,8 @@ Build:2.7.6,2761
echo "APP_ABI := armeabi" > jni/Application.mk && \
pushd ../ && \
./init.sh && \
popd
popd && \
sed -i -e "s/gradleVersion = '2\.2\.1'/gradleVersion = '2.10'/" ../build.gradle
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
@ -486,8 +487,7 @@ Build:2.7.6,2762
pushd ../ && \
./init.sh && \
popd && \
sed -i -e '/gradleVersion/d' ../build.gradle && \
sed -i -e '/Wrapper/agradleVersion = "2.11"\n' ../build.gradle
sed -i -e "s/gradleVersion = '2\.2\.1'/gradleVersion = '2.10'/" ../build.gradle
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
@ -503,7 +503,8 @@ Build:2.7.6,2763
echo "APP_ABI := x86" > jni/Application.mk && \
pushd ../ && \
./init.sh && \
popd
popd && \
sed -i -e "s/gradleVersion = '2\.2\.1'/gradleVersion = '2.10'/" ../build.gradle
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
@ -519,7 +520,8 @@ Build:2.7.6,2764
echo "APP_ABI := mips" > jni/Application.mk && \
pushd ../ && \
./init.sh && \
popd
popd && \
sed -i -e "s/gradleVersion = '2\.2\.1'/gradleVersion = '2.10'/" ../build.gradle
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
@ -535,7 +537,8 @@ Build:2.7.6,2765
echo "APP_ABI := arm64-v8a" > jni/Application.mk && \
pushd ../ && \
./init.sh && \
popd
popd && \
sed -i -e "s/gradleVersion = '2\.2\.1'/gradleVersion = '2.10'/" ../build.gradle
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
@ -551,7 +554,8 @@ Build:2.7.6,2766
echo "APP_ABI := x86_64" > jni/Application.mk && \
pushd ../ && \
./init.sh && \
popd
popd && \
sed -i -e "s/gradleVersion = '2\.2\.1'/gradleVersion = '2.10'/" ../build.gradle
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
@ -567,7 +571,8 @@ Build:2.7.6,2767
echo "APP_ABI := mips64" > jni/Application.mk && \
pushd ../ && \
./init.sh && \
popd
popd && \
sed -i -e "s/gradleVersion = '2\.2\.1'/gradleVersion = '2.10'/" ../build.gradle
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes