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

Merge branch 'master' into 'master'

Browse source 
Document Viewer: fix "scandelete" option so 2.7.5 builds.

mips and x86 are still disabled due to an upstream issue, but they are fixed in the next upstream release (2.7.6).

See merge request !1603
This commit is contained in:
est 2016-08-11 14:49:56 +00:00
parent a6c03f2f25 3e006c7f3c
commit c00ae5219e
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -337,7 +337,6 @@ Build:2.7.4,2747
buildjni=yes
Build:2.7.5,2751
disable=wait for armv7
commit=v2.7.5
subdir=document-viewer
submodules=yes
@ -350,11 +349,10 @@ Build:2.7.5,2751
pushd ../ && \
./init.sh && \
popd
scandelete=document-viewer/jni/mupdf/mupdf/build/debug/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
Build:2.7.5,2752
disable=fix scandelete
commit=v2.7.5
subdir=document-viewer
submodules=yes
@ -369,11 +367,11 @@ Build:2.7.5,2752
popd && \
sed -i -e '/gradleVersion/d' ../build.gradle && \
sed -i -e '/Wrapper/agradleVersion = "2.11"\n' ../build.gradle
scandelete=document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
Build:2.7.5,2753
disable=wait for armv7
disable=wait for 2.7.6
commit=v2.7.5
subdir=document-viewer
submodules=yes
@ -386,11 +384,11 @@ Build:2.7.5,2753
pushd ../ && \
./init.sh && \
popd
scandelete=document-viewer/jni/mupdf/mupdf/build/debug/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
Build:2.7.5,2754
disable=wait for armv7
disable=wait for 2.7.6
commit=v2.7.5
subdir=document-viewer
submodules=yes
@ -403,11 +401,10 @@ Build:2.7.5,2754
pushd ../ && \
./init.sh && \
popd
scandelete=document-viewer/jni/mupdf/mupdf/build/debug/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
Build:2.7.5,2755
disable=wait for armv7
commit=v2.7.5
subdir=document-viewer
submodules=yes
@ -420,11 +417,10 @@ Build:2.7.5,2755
pushd ../ && \
./init.sh && \
popd
scandelete=document-viewer/jni/mupdf/mupdf/build/debug/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
Build:2.7.5,2756
disable=wait for armv7
commit=v2.7.5
subdir=document-viewer
submodules=yes
@ -437,11 +433,10 @@ Build:2.7.5,2756
pushd ../ && \
./init.sh && \
popd
scandelete=document-viewer/jni/mupdf/mupdf/build/debug/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
Build:2.7.5,2757
disable=wait for armv7
commit=v2.7.5
subdir=document-viewer
submodules=yes
@ -454,7 +449,7 @@ Build:2.7.5,2757
pushd ../ && \
./init.sh && \
popd
scandelete=document-viewer/jni/mupdf/mupdf/build/debug/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
scandelete=document-viewer/jni/mupdf/mupdf/build/release/,document-viewer/jni/mupdf/mupdf/thirdparty/curl/tests/data/test*
buildjni=yes
Maintainer Notes: