print/foliate: Updates to 2.2.0

- Updates a patch.

Changes since 2.1.1:

Library:

  * A library view showing recent books and reading progress (#119)
  * Search books by metadata
  * E-book discovery with OPDS (#6, #253)

New supported formats:

  * FictionBook (.fb2, .fb2.zip) (#128)
  * Comic book archive (.cbr, .cbz, .cbt, .cb7) (#254)
  * Plain text (.txt) (#226)
  * Unpacked EPUB files

Layout:

  * Option to set maximum page width (#192)
  * The "Automatic" layout will now show four columns when the page width is
    wide (#257)

Image viewer:

  * Improved image viewer, with new shortcuts and the ability to rotate (#299)
    and invert images
  * Option to disable image viewer, or to open images on double, middle, or
    right click (#315)

Text-to-speech:

  * Improved text-to-speech configuration UI
  * Ability to set text-to-speech voice based on book language (#134)

Annotations

  * Import annotations from JSON
  * Search in annotations
  * Annotations are now sorted in the same order as they appear in the book
    (#318)

Security:

  * "Allow Unsafe Content" now only enables JavaScript; external content will no
    longer be loaded. This is an important security fix. If you are running an
    old version of Foliate and cannot upgrade, you should disable "Allow Unsafe
    Content".
  * WebKit processes are now sandboxed

Other featues and fixes:

  * Improved support for vertical and right-to-left books
  * Support for StarDict dictionaries (#302) (requires new optional dependency
    sdcv)
  * Fixed current location not preserved when resizing (#152, #204)
  * Fixed auto-hiding header bar under some themes (#316)
  * Command-line options for showing version and adding books to library
  * Option to clear or disable cache
  * When an HTML page contains invalid self-closing anchor tags, it is now
    parsed as XHTML (#275, #288)

Technical changes:

  * Foliate now stores file locations in
    ~/.local/share/com.github.johnfactotum.Foliate/library/uri-store.json, and
    saves book covers to ~/.cache/com.github.johnfactotum.Foliate. Both can be
    disabled.
  * New optional dependency tracker (gir1.2-tracker-2.0 on Debian based
    distributions), which can be used to get file locations.
  * New optional dependency libhandy (gir1.2-handy-0.0). It's not absolutely
    required, but installing it would make the experience better on larger as
    well as smaller screens.
  * To open remote files, Foliate now optionally depends on libsoup
    (gir1.2-soup-2.4).

Foliate now bundles two additional libraries:

  * libarchivejs, which is MIT licensed. It is a WASM port of the popular
    libarchive C library.
  * crypto-js, which is MIT licensed. The MD5 module is used to generate
    identifiers for files that don't have unique identifiers.

4 files changed, 31 insertions, 19 deletions

diff --git a/print/foliate/Makefile b/print/foliate/Makefile
index de510df47ed..661c7817c89 100644
--- a/print/foliate/Makefile
+++ b/print/foliate/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/04/12 08:29:08 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/05/30 00:01:58 fox Exp $
 
-DISTNAME=	foliate-2.1.1
-PKGREVISION=	1
+DISTNAME=	foliate-2.2.0
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_GITHUB:=johnfactotum/}
 EXTRACT_USING=	bsdtar
diff --git a/print/foliate/PLIST b/print/foliate/PLIST
index b06ced7ef23..9ddf54b6a30 100644
--- a/print/foliate/PLIST
+++ b/print/foliate/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2020/04/08 23:22:48 fox Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/05/30 00:01:58 fox Exp $
 bin/foliate
 libexec/foliate/com.github.johnfactotum.Foliate
 share/applications/com.github.johnfactotum.Foliate.desktop
@@ -24,20 +24,32 @@ share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_utils.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobiml2xhtml.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/unipath.py
 share/com.github.johnfactotum.Foliate/assets/KindleUnpack/unpack_structure.py
+share/com.github.johnfactotum.Foliate/assets/client.html
+share/com.github.johnfactotum.Foliate/assets/epub-viewer-cb.html
 share/com.github.johnfactotum.Foliate/assets/epub-viewer-nocsp.html
 share/com.github.johnfactotum.Foliate/assets/epub-viewer.css
 share/com.github.johnfactotum.Foliate/assets/epub-viewer.html
-share/com.github.johnfactotum.Foliate/assets/epub-viewer.js
-share/com.github.johnfactotum.Foliate/assets/epub.js
-share/com.github.johnfactotum.Foliate/assets/jszip.min.js
-share/com.github.johnfactotum.Foliate/assets/lookup.html
-share/com.github.johnfactotum.Foliate/assets/utils.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/LICENSE
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/README.md
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/wasm-gen/libarchive.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/wasm-gen/libarchive.wasm
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/worker-bundle.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/package.json
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/compressed-file.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/libarchive.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/archive-reader.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-gen/libarchive.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-gen/libarchive.wasm
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-module.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/worker.js
+share/com.github.johnfactotum.Foliate/assets/libarchivejs/main.js
 share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.data.gresource
 share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.src.gresource
 share/glib-2.0/schemas/com.github.johnfactotum.Foliate.gschema.xml
 share/icons/hicolor/scalable/apps/com.github.johnfactotum.Foliate.svg
 share/icons/hicolor/symbolic/apps/com.github.johnfactotum.Foliate-symbolic.svg
 share/locale/cs_CS/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
+share/locale/de_DE/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/es/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/fr_FR/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/id_ID/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
@@ -46,5 +58,6 @@ share/locale/nl/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/pt_BR/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/ru_RU/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/sv/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
+share/locale/zh_CN/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/locale/zh_TW/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 share/metainfo/com.github.johnfactotum.Foliate.appdata.xml
diff --git a/print/foliate/distinfo b/print/foliate/distinfo
index 240f38212f8..0902dde96b8 100644
--- a/print/foliate/distinfo
+++ b/print/foliate/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2020/04/09 12:40:20 fox Exp $
+$NetBSD: distinfo,v 1.5 2020/05/30 00:01:58 fox Exp $
 
-SHA1 (foliate-2.1.1.tar.gz) = 38a18901948ed1d31bd7df46ce7f414a15188356
-RMD160 (foliate-2.1.1.tar.gz) = c4de4a13e35833ce303f42e161a17ec3e0b2e026
-SHA512 (foliate-2.1.1.tar.gz) = 164ba01bc7a786fa4b8998af4efc8e03bfc583219615f0622bd0a45bedb5fcb096e2ea22eb1daa076af2a208b87ac684882e1ca457dc4e454b7f6ce08fb3caaa
-Size (foliate-2.1.1.tar.gz) = 3123638 bytes
+SHA1 (foliate-2.2.0.tar.gz) = bdc5e2c277c35ca750727a25338e4e172b8f1d88
+RMD160 (foliate-2.2.0.tar.gz) = 046fcc7ff42954f275822ba076237bc0e9f58340
+SHA512 (foliate-2.2.0.tar.gz) = 08e26e4e1291ddae55d394ab8eec294afab1be3b06c7f351efc3093c185e8ab55fd3c6897d635a4bebbb5c2db5312cc48f9fe136204bbfade3df55f122c93018
+Size (foliate-2.2.0.tar.gz) = 4293578 bytes
 SHA1 (patch-src_assets_KindleUnpack_kindleunpack.py) = 2b558fe842669982aec6087e9ce1c72f1fc52315
-SHA1 (patch-src_epubView.js) = 894a196410894d80ff60ab0338003f327276aa9e
+SHA1 (patch-src_epubView.js) = aa03a4fe853540818e841afd4db9b43cfa67fd99
diff --git a/print/foliate/patches/patch-src_epubView.js b/print/foliate/patches/patch-src_epubView.js
index b911faf1b5a..68d7b19fa21 100644
--- a/print/foliate/patches/patch-src_epubView.js
+++ b/print/foliate/patches/patch-src_epubView.js
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_epubView.js,v 1.1 2020/04/06 14:15:47 fox Exp $
+$NetBSD: patch-src_epubView.js,v 1.2 2020/05/30 00:01:58 fox Exp $
 
 Adds variable to help substitute the correct python version suffix.
 
 --- src/epubView.js.orig	2020-04-06 13:02:45.032535873 +0000
 +++ src/epubView.js
-@@ -21,7 +21,7 @@ const {
-     mimetypes, execCommand, recursivelyDeleteDir
- } = imports.utils
+@@ -36,7 +36,7 @@ const {
+     mimetypes.kindleAlias,
+ ]
  
 -const python = GLib.find_program_in_path('python') || GLib.find_program_in_path('python3')
 +const python = GLib.find_program_in_path('python@PYVERSSUFFIX@')