From 3477b56be7b12b5745fbbb3616a9766c650d72a2 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sat, 13 Aug 2016 17:59:25 -0600 Subject: [PATCH] Document Viewer: attempt to fix failing build of 2.7.6 Upstream forgot to update gradleVersion in build.gradle. --- metadata/org.sufficientlysecure.viewer.txt | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/metadata/org.sufficientlysecure.viewer.txt b/metadata/org.sufficientlysecure.viewer.txt index 1fae1aae49..2daa50bec9 100644 --- a/metadata/org.sufficientlysecure.viewer.txt +++ b/metadata/org.sufficientlysecure.viewer.txt @@ -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