Thu Oct 15 16:10:24 2020 UTC ()
print/foliate: Updates to 2.5.0

Changes since 2.4.2:

Changes:

  * Improved support for touch screen (#591)
  * OPDS credentials can now be remembered (#569)
  * Various fixes for GNOME 3.38 (#548, #603, #608)
  * Fixed Wiktionary internal links (#577)
  * Added Basque (#579), Korean (#604), and Norwegian (#574, #575) translations


(fox)
diff -r1.15 -r1.16 pkgsrc/print/foliate/Makefile
diff -r1.5 -r1.6 pkgsrc/print/foliate/PLIST
diff -r1.9 -r1.10 pkgsrc/print/foliate/distinfo
diff -r1.3 -r1.4 pkgsrc/print/foliate/patches/patch-src_epubView.js
cvs diff -r1.15 -r1.16 pkgsrc/print/foliate/Makefile (switch to unified diff)

--- pkgsrc/print/foliate/Makefile 2020/08/17 20:19:55 1.15
+++ pkgsrc/print/foliate/Makefile 2020/10/15 16:10:23 1.16
@@ -1,48 +1,47 @@ @@ -1,48 +1,47 @@
1# $NetBSD: Makefile,v 1.15 2020/08/17 20:19:55 leot Exp $ 1# $NetBSD: Makefile,v 1.16 2020/10/15 16:10:23 fox Exp $
2 2
3DISTNAME= foliate-2.4.2 3DISTNAME= foliate-2.5.0
4PKGREVISION= 1 
5CATEGORIES= print 4CATEGORIES= print
6MASTER_SITES= ${MASTER_SITE_GITHUB:=johnfactotum/} 5MASTER_SITES= ${MASTER_SITE_GITHUB:=johnfactotum/}
7EXTRACT_USING= bsdtar 6EXTRACT_USING= bsdtar
8 7
9MAINTAINER= fox@NetBSD.org 8MAINTAINER= fox@NetBSD.org
10COMMENT= Simple and modern GTK eBook viewer 9COMMENT= Simple and modern GTK eBook viewer
11HOMEPAGE= https://johnfactotum.github.io/foliate/ 10HOMEPAGE= https://johnfactotum.github.io/foliate/
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14USE_TOOLS+= pkg-config msgfmt xgettext 13USE_TOOLS+= pkg-config msgfmt xgettext
15 14
16DEPENDS+= gjs>=1.52.0:../../lang/gjs 15DEPENDS+= gjs>=1.52.0:../../lang/gjs
17 16
18SUBST_CLASSES+= pyvers 17SUBST_CLASSES+= pyvers
19SUBST_MESSAGE.pyvers= Substitute the correct python version. 18SUBST_MESSAGE.pyvers= Substitute the correct python version.
20SUBST_STAGE.pyvers= pre-configure 19SUBST_STAGE.pyvers= pre-configure
21SUBST_FILES.pyvers= src/epubView.js 20SUBST_FILES.pyvers= src/epubView.js
22SUBST_VARS.pyvers+= PYVERSSUFFIX 21SUBST_VARS.pyvers+= PYVERSSUFFIX
23 22
24# Fails without GNU msgfmt 23# Fails without GNU msgfmt
25USE_BUILTIN.gettext= no 24USE_BUILTIN.gettext= no
26 25
27REPLACE_PYTHON+= build-aux/meson/postinstall.py 26REPLACE_PYTHON+= build-aux/meson/postinstall.py
28REPLACE_PYTHON+= src/assets/KindleUnpack/*.py 27REPLACE_PYTHON+= src/assets/KindleUnpack/*.py
29 28
30INSTALLATION_DIRS+= libexec/foliate 29INSTALLATION_DIRS+= libexec/foliate
31 30
32pre-install: 31pre-install:
33 ${RM} -f ${WRKSRC}/src/assets/KindleUnpack/*.orig 32 ${RM} -f ${WRKSRC}/src/assets/KindleUnpack/*.orig
34 33
35post-install: 34post-install:
36 ${MV} ${DESTDIR}${PREFIX}/bin/com.github.johnfactotum.Foliate \ 35 ${MV} ${DESTDIR}${PREFIX}/bin/com.github.johnfactotum.Foliate \
37 ${DESTDIR}${PREFIX}/libexec/foliate/com.github.johnfactotum.Foliate 36 ${DESTDIR}${PREFIX}/libexec/foliate/com.github.johnfactotum.Foliate
38 ${LN} -s -f ${DESTDIR}${PREFIX}/libexec/foliate/com.github.johnfactotum.Foliate \ 37 ${LN} -s -f ${DESTDIR}${PREFIX}/libexec/foliate/com.github.johnfactotum.Foliate \
39 ${DESTDIR}${PREFIX}/bin/foliate 38 ${DESTDIR}${PREFIX}/bin/foliate
40 39
41.include "../../devel/meson/build.mk" 40.include "../../devel/meson/build.mk"
42.include "../../devel/glib2/buildlink3.mk" 41.include "../../devel/glib2/buildlink3.mk"
43.include "../../devel/glib2/schemas.mk" 42.include "../../devel/glib2/schemas.mk"
44.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 43.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
45.include "../../lang/python/application.mk" 44.include "../../lang/python/application.mk"
46BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=2.24.0 45BUILDLINK_API_DEPENDS.webkit-gtk+= webkit-gtk>=2.24.0
47.include "../../www/webkit-gtk/buildlink3.mk" 46.include "../../www/webkit-gtk/buildlink3.mk"
48.include "../../mk/bsd.pkg.mk" 47.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/print/foliate/PLIST (switch to unified diff)

--- pkgsrc/print/foliate/PLIST 2020/06/21 22:35:42 1.5
+++ pkgsrc/print/foliate/PLIST 2020/10/15 16:10:23 1.6
@@ -1,64 +1,67 @@ @@ -1,64 +1,67 @@
1@comment $NetBSD: PLIST,v 1.5 2020/06/21 22:35:42 fox Exp $ 1@comment $NetBSD: PLIST,v 1.6 2020/10/15 16:10:23 fox Exp $
2bin/foliate 2bin/foliate
3libexec/foliate/com.github.johnfactotum.Foliate 3libexec/foliate/com.github.johnfactotum.Foliate
4share/applications/com.github.johnfactotum.Foliate.desktop 4share/applications/com.github.johnfactotum.Foliate.desktop
5share/com.github.johnfactotum.Foliate/assets/KindleUnpack/__init__.py 5share/com.github.johnfactotum.Foliate/assets/KindleUnpack/__init__.py
6share/com.github.johnfactotum.Foliate/assets/KindleUnpack/compatibility_utils.py 6share/com.github.johnfactotum.Foliate/assets/KindleUnpack/compatibility_utils.py
7share/com.github.johnfactotum.Foliate/assets/KindleUnpack/kindleunpack.py 7share/com.github.johnfactotum.Foliate/assets/KindleUnpack/kindleunpack.py
8share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_cover.py 8share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_cover.py
9share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_dict.py 9share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_dict.py
10share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_header.py 10share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_header.py
11share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_html.py 11share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_html.py
12share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_index.py 12share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_index.py
13share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_k8proc.py 13share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_k8proc.py
14share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_k8resc.py 14share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_k8resc.py
15share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_nav.py 15share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_nav.py
16share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_ncx.py 16share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_ncx.py
17share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_opf.py 17share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_opf.py
18share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_pagemap.py 18share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_pagemap.py
19share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_sectioner.py 19share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_sectioner.py
20share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_split.py 20share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_split.py
21share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_uncompress.py 21share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_uncompress.py
22share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_utils.py 22share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_utils.py
23share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobiml2xhtml.py 23share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobiml2xhtml.py
24share/com.github.johnfactotum.Foliate/assets/KindleUnpack/unipath.py 24share/com.github.johnfactotum.Foliate/assets/KindleUnpack/unipath.py
25share/com.github.johnfactotum.Foliate/assets/KindleUnpack/unpack_structure.py 25share/com.github.johnfactotum.Foliate/assets/KindleUnpack/unpack_structure.py
26share/com.github.johnfactotum.Foliate/assets/client.html 26share/com.github.johnfactotum.Foliate/assets/client.html
27share/com.github.johnfactotum.Foliate/assets/epub-viewer-cb.html 27share/com.github.johnfactotum.Foliate/assets/epub-viewer-cb.html
28share/com.github.johnfactotum.Foliate/assets/epub-viewer-nocsp.html 28share/com.github.johnfactotum.Foliate/assets/epub-viewer-nocsp.html
29share/com.github.johnfactotum.Foliate/assets/epub-viewer.css 29share/com.github.johnfactotum.Foliate/assets/epub-viewer.css
30share/com.github.johnfactotum.Foliate/assets/epub-viewer.html 30share/com.github.johnfactotum.Foliate/assets/epub-viewer.html
31share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/LICENSE 31share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/LICENSE
32share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/README.md 32share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/README.md
33share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/wasm-gen/libarchive.js 33share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/wasm-gen/libarchive.js
34share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/wasm-gen/libarchive.wasm 34share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/wasm-gen/libarchive.wasm
35share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/worker-bundle.js 35share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/dist/worker-bundle.js
36share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/package.json 36share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/package.json
37share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/compressed-file.js 37share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/compressed-file.js
38share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/libarchive.js 38share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/libarchive.js
39share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/archive-reader.js 39share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/archive-reader.js
40share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-gen/libarchive.js 40share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-gen/libarchive.js
41share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-gen/libarchive.wasm 41share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-gen/libarchive.wasm
42share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-module.js 42share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/wasm-module.js
43share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/worker.js 43share/com.github.johnfactotum.Foliate/assets/libarchivejs/libarchivejs-1.3.0/src/webworker/worker.js
44share/com.github.johnfactotum.Foliate/assets/libarchivejs/main.js 44share/com.github.johnfactotum.Foliate/assets/libarchivejs/main.js
45share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.data.gresource 45share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.data.gresource
46share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.src.gresource 46share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.src.gresource
47share/glib-2.0/schemas/com.github.johnfactotum.Foliate.gschema.xml 47share/glib-2.0/schemas/com.github.johnfactotum.Foliate.gschema.xml
48share/icons/hicolor/scalable/apps/com.github.johnfactotum.Foliate.svg 48share/icons/hicolor/scalable/apps/com.github.johnfactotum.Foliate.svg
49share/icons/hicolor/symbolic/apps/com.github.johnfactotum.Foliate-symbolic.svg 49share/icons/hicolor/symbolic/apps/com.github.johnfactotum.Foliate-symbolic.svg
50share/locale/cs_CS/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 50share/locale/cs_CS/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
51share/locale/de_DE/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 51share/locale/de_DE/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
52share/locale/es/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 52share/locale/es/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 53share/locale/eu/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
53share/locale/fr_FR/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 54share/locale/fr_FR/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
54share/locale/id_ID/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 55share/locale/id_ID/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
55share/locale/ie/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 56share/locale/ie/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
56share/locale/it/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 57share/locale/it/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 58share/locale/nb/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
57share/locale/nl/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 59share/locale/nl/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
 60share/locale/nn/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
58share/locale/pt_BR/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 61share/locale/pt_BR/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
59share/locale/ru_RU/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 62share/locale/ru_RU/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
60share/locale/sv/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 63share/locale/sv/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
61share/locale/uk/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 64share/locale/uk/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
62share/locale/zh_CN/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 65share/locale/zh_CN/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
63share/locale/zh_TW/LC_MESSAGES/com.github.johnfactotum.Foliate.mo 66share/locale/zh_TW/LC_MESSAGES/com.github.johnfactotum.Foliate.mo
64share/metainfo/com.github.johnfactotum.Foliate.appdata.xml 67share/metainfo/com.github.johnfactotum.Foliate.appdata.xml
cvs diff -r1.9 -r1.10 pkgsrc/print/foliate/distinfo (switch to unified diff)

--- pkgsrc/print/foliate/distinfo 2020/07/07 01:28:05 1.9
+++ pkgsrc/print/foliate/distinfo 2020/10/15 16:10:23 1.10
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.9 2020/07/07 01:28:05 fox Exp $ 1$NetBSD: distinfo,v 1.10 2020/10/15 16:10:23 fox Exp $
2 2
3SHA1 (foliate-2.4.2.tar.gz) = c4edc48badf1e9236aa0d15acd92db54783733ef 3SHA1 (foliate-2.5.0.tar.gz) = d998e782a94b34a6a5dded27363ef12b4adcb793
4RMD160 (foliate-2.4.2.tar.gz) = 2945c61108d490a1c9de3ad566fbcb5d484dac6e 4RMD160 (foliate-2.5.0.tar.gz) = bfe033acda318c81f0e66939b7aa1cbd43ce0a4a
5SHA512 (foliate-2.4.2.tar.gz) = 6dda76c9bd3f9f3273bafdd65463adfcab84d9c81ca89c2fd1cda4c5d7618d84610e11c75936c5df2bb118caa3f3e1e77ded506da670263e5af5b0ad92a97a07 5SHA512 (foliate-2.5.0.tar.gz) = 3eb3ecff36a105f6d9ba7e019312bef81e34f62f61310eaf3460c7aea41585fc9b410d08f9e4fd03fe60629b1ebb6f9f6a4c900e898ac712b104c615dc3737c8
6Size (foliate-2.4.2.tar.gz) = 4638211 bytes 6Size (foliate-2.5.0.tar.gz) = 4716094 bytes
7SHA1 (patch-src_assets_KindleUnpack_kindleunpack.py) = 2b558fe842669982aec6087e9ce1c72f1fc52315 7SHA1 (patch-src_assets_KindleUnpack_kindleunpack.py) = 2b558fe842669982aec6087e9ce1c72f1fc52315
8SHA1 (patch-src_epubView.js) = 6942875328b558f131f4c2046e4f7beb57999997 8SHA1 (patch-src_epubView.js) = de7ab2f79d0d7b6eb379686b6091f6f7bfda95e2
cvs diff -r1.3 -r1.4 pkgsrc/print/foliate/patches/patch-src_epubView.js (switch to unified diff)

--- pkgsrc/print/foliate/patches/patch-src_epubView.js 2020/07/03 12:18:12 1.3
+++ pkgsrc/print/foliate/patches/patch-src_epubView.js 2020/10/15 16:10:24 1.4
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-src_epubView.js,v 1.3 2020/07/03 12:18:12 fox Exp $ 1$NetBSD: patch-src_epubView.js,v 1.4 2020/10/15 16:10:24 fox Exp $
2 2
3Adds variable to help substitute the correct python version suffix. 3Adds variable to help substitute the correct python version suffix.
4 4
5--- src/epubView.js.orig 2020-07-02 07:05:56.000000000 +0000 5--- src/epubView.js.orig 2020-10-15 00:52:44.000000000 +0000
6+++ src/epubView.js 6+++ src/epubView.js
7@@ -25,7 +25,7 @@ const { 7@@ -26,7 +26,7 @@ const {
8 mimetypes, mimetypeIs, execCommand, recursivelyDeleteDir 8 debounce
9 } = imports.utils 9 } = imports.utils
10  10
11-const python = GLib.find_program_in_path('python') || GLib.find_program_in_path('python3') 11-const python = GLib.find_program_in_path('python') || GLib.find_program_in_path('python3')
12+const python = GLib.find_program_in_path('python@PYVERSSUFFIX@') 12+const python = GLib.find_program_in_path('python@PYVERSSUFFIX@')
13 const kindleUnpack = pkg.pkgdatadir + '/assets/KindleUnpack/kindleunpack.py' 13 const kindleUnpack = pkg.pkgdatadir + '/assets/KindleUnpack/kindleunpack.py'
14  14
15 const settings = new Gio.Settings({ schema_id: pkg.name + '.view' }) 15 const settings = new Gio.Settings({ schema_id: pkg.name + '.view' })