From 3e006c7f3cfe2902a473fa176d3130c28ce70127 Mon Sep 17 00:00:00 2001
From: Eric Wasylishen <ewasylishen@gmail.com>
Date: Wed, 10 Aug 2016 15:02:27 -0600
Subject: [PATCH] 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).
---
 metadata/org.sufficientlysecure.viewer.txt | 23 +++++++++-------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/metadata/org.sufficientlysecure.viewer.txt b/metadata/org.sufficientlysecure.viewer.txt
index fb152523c6..826b7c4a0d 100644
--- a/metadata/org.sufficientlysecure.viewer.txt
+++ b/metadata/org.sufficientlysecure.viewer.txt
@@ -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: