From 67dd6e4ff88d9f5da78bdb9bb35eb17f4b4fa5c5 Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Tue, 13 Jun 2017 08:34:17 +0300
Subject: [PATCH 1/2] MuPDF: fix 1.11

---
 metadata/com.artifex.mupdfdemo.txt | 37 +++++++++++-------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/metadata/com.artifex.mupdfdemo.txt b/metadata/com.artifex.mupdfdemo.txt
index f850ea8b08..a149368075 100644
--- a/metadata/com.artifex.mupdfdemo.txt
+++ b/metadata/com.artifex.mupdfdemo.txt
@@ -313,43 +313,34 @@ Build:1.10,103
     ndk=r11c
 
 Build:1.11,111
-    disable=wait for x86
     commit=1.11
     submodules=yes
+    output=bin/MuPDF-release-unsigned.apk
     forceversion=yes
     forcevercode=yes
-    prebuild=pushd libmupdf && \
-        make generate && \
-        popd && \
-        make release APP_ABI=armeabi-v7a
-    buildjni=yes
-    ndk=r11c
+    rm=libmupdf/thirdparty/curl/tests
+    build=make release APP_ABI=armeabi-v7a
+    ndk=r14b
 
 Build:1.11,112
-    disable=needs some work
     commit=1.11
     submodules=yes
+    output=bin/MuPDF-release-unsigned.apk
     forceversion=yes
     forcevercode=yes
-    prebuild=pushd libmupdf && \
-        make generate && \
-        popd && \
-        make release APP_ABI=x86
-    buildjni=yes
-    ndk=r11c
+    rm=libmupdf/thirdparty/curl/tests
+    build=make release APP_ABI=x86
+    ndk=r14b
 
 Build:1.11,113
-    disable=wait for x86
     commit=1.11
     submodules=yes
+    output=bin/MuPDF-release-unsigned.apk
     forceversion=yes
     forcevercode=yes
-    prebuild=pushd libmupdf && \
-        make generate && \
-        popd && \
-        make release APP_ABI=mips
-    buildjni=yes
-    ndk=r11c
+    rm=libmupdf/thirdparty/curl/tests
+    build=make release APP_ABI=mips
+    ndk=r14b
 
 Maintainer Notes:
 armeabi = baseversion + 0, e.g. mupdf-1.5-android-50-armeabi.apk
@@ -377,5 +368,5 @@ Split Android and iOS viewers into separate projects:
 
 Auto Update Mode:None
 Update Check Mode:None
-Current Version:1.10
-Current Version Code:103
+Current Version:1.11
+Current Version Code:113

From 265ed859ab86757370143796cadc32da76cef54a Mon Sep 17 00:00:00 2001
From: relan <email@hidden>
Date: Tue, 13 Jun 2017 08:54:00 +0300
Subject: [PATCH 2/2] MuPDF: update links and maintainer notes

---
 metadata/com.artifex.mupdfdemo.txt | 40 ++++++++++++++----------------
 1 file changed, 18 insertions(+), 22 deletions(-)

diff --git a/metadata/com.artifex.mupdfdemo.txt b/metadata/com.artifex.mupdfdemo.txt
index a149368075..6426da4210 100644
--- a/metadata/com.artifex.mupdfdemo.txt
+++ b/metadata/com.artifex.mupdfdemo.txt
@@ -1,9 +1,9 @@
 Categories:Reading
 License:AGPL-3.0+
-Web Site:http://mupdf.com
-Source Code:http://git.ghostscript.com/?p=mupdf.git;a=summary
-Issue Tracker:http://bugs.ghostscript.com
-Changelog:http://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=HEAD
+Web Site:https://mupdf.com
+Source Code:https://git.ghostscript.com/?p=mupdf-android-viewer-old.git;a=summary
+Issue Tracker:https://bugs.ghostscript.com
+Changelog:https://git.ghostscript.com/?p=mupdf.git;a=blob_plain;f=CHANGES;hb=HEAD
 
 Auto Name:MuPDF
 Summary:Lightweight document viewer
@@ -14,7 +14,7 @@ documents.
 .
 
 Repo Type:git
-Repo:http://git.ghostscript.com/mupdf-android-viewer-old.git
+Repo:https://git.ghostscript.com/mupdf-android-viewer-old.git
 
 Build:1.2,2
     commit=1.2
@@ -343,27 +343,23 @@ Build:1.11,113
     ndk=r14b
 
 Maintainer Notes:
-armeabi = baseversion + 0, e.g. mupdf-1.5-android-50-armeabi.apk
-armv7 = baseversion + 1, e.g. mupdf-1.5-android-51-armv7a.apk
-x86 = baseversion + 2, e.g. mupdf-1.5-android-52-x86.apk
-mips= baseversion + 3, e.g. mupdf-1.5-android-53-mips.apk
-
-The basename "bears no resemblance to the app version", however 1.4
-used 40 and 1.5 used 50. This would make 1.6 start with 60 -- or
-even a 16xx scheme.
+The version code "bears no resemblance to the version name", however it
+follows this pattern:
+* MINOR + "1" for armeabi-v7a
+* MINOR + "2" for x86
+* MINOR + "3" for mips
+E.g. MuPDF 1.11 for x86 has version code 112 ("11" + "2").
 
 Documents:
-http://www.mupdf.com/docs/how-to-build-mupdf-for-android
-http://mupdf.com/downloads/
-http://twiki.ghostscript.com/do/view/MuPDF/AndroidReleases
-http://git.ghostscript.com/?p=mupdf.git;a=blob;f=platform/android/jni/Application.mk;h=60909b6e9989b79231a6f3a7a04f371039185dbf;hb=HEAD
+* https://www.mupdf.com/docs/how-to-build-mupdf-for-android
+* https://mupdf.com/downloads/
+* https://twiki.ghostscript.com/do/view/MuPDF/AndroidReleases
 
-Versions:
 Split Android and iOS viewers into separate projects:
- * mupdf-viewer-ios.git has the iOS viewer.
- * mupdf-viewer-android-old.git has the Android viewer.
- * mupdf-viewer-android-nui.git has a new advanced Android viewer.
- * mupdf-viewer-android-mini.git has a new minimalist Android viewer.
+* mupdf-viewer-ios.git has the iOS viewer.
+* mupdf-viewer-android-old.git has the Android viewer.
+* mupdf-viewer-android-nui.git has a new advanced Android viewer.
+* mupdf-viewer-android-mini.git has a new minimalist Android viewer.
 .
 
 Auto Update Mode:None