From af60a68fdc806cb20f7c44d80a96685b6b8dbc63 Mon Sep 17 00:00:00 2001 From: fox Date: Mon, 6 Apr 2020 14:15:47 +0000 Subject: print/foliate: Updates to 2.0.0 Changes since 1.5.3: Interface: * A redesigned interface that works better for smaller screens (#176) * Improved fullscreen mode with an overlaid headerbar (#4) * The headerbar and the progress bar now auto-hide, for a distraction-free reading experience * Various location information, as well as a clock, can now be displayed in the footer (#175, #233) * A new location popover (Ctrl + L) that shows reading time estimates and allows skipping to locations (#155) * E-reader style navigation: go to the previous or next page by tapping on the left or right part of the view; tap on the middle to toggle header bar and progress bar * Annotations, bookmarks, and find results now show chapter titles (#162) * When looking up words in dictionaries, the query can now be edited (#156) * New shortcut for viewing metadata (Ctrl + I) and preferences (Ctrl + ,) * A new traditional menubar, which may be displayed depending on the desktop environment * Option to use a traditional titlebar and menubar instead of a headerbar (experimental) Reading: * Continuous scrolling layout * Option to show decorative shadows that mimic the appearance of a real book * Ability to zoom in and zoom out (#117) * Improved image viewer with "save as" option * Open copies of a book in new windows (Ctrl + N) * Reload book (Ctrl + R) * New built-in themes: Gray, Solarized, Gruvbox, Nord Text selection: * Ability to select text across pages * Find selected text in book * Speak selected text or from the selected location (#141) Annotations: * Spellcheck notes (requires new optional dependency "gspell") * Export annotations to Markdown (#180) * Options to use custom colors for highlights For publishers and developers: * Support for Apple Books theme attribute, which allows books to detect themes without JavaScript (#178) * WebKit's developer tools can be enabled Breaking changes: * The settings schemas has been reorganized * The format for custom themes has changed * Locations are now 1024 characters in size Bug fixes: * Fixed not restoring exact last location * Fixed navigation not working with scrolled layout * Fixed font size not changing when the book uses absolute-size keywords (#173) * Fixed text cut off at margin edge (#177) * Fixed unable to open books with "#" or "?" in the file name --- print/foliate/Makefile | 7 ++- print/foliate/PLIST | 67 +++++++++++++++-------------- print/foliate/distinfo | 12 +++--- print/foliate/patches/patch-src_epubView.js | 15 +++++++ print/foliate/patches/patch-src_main.js | 15 ------- 5 files changed, 59 insertions(+), 57 deletions(-) create mode 100644 print/foliate/patches/patch-src_epubView.js delete mode 100644 print/foliate/patches/patch-src_main.js (limited to 'print/foliate') diff --git a/print/foliate/Makefile b/print/foliate/Makefile index e209bb1a897..e407717aba0 100644 --- a/print/foliate/Makefile +++ b/print/foliate/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2020/03/10 22:10:51 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2020/04/06 14:15:47 fox Exp $ -DISTNAME= foliate-1.5.3 -PKGREVISION= 3 +DISTNAME= foliate-2.0.0 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_GITHUB:=johnfactotum/} EXTRACT_USING= bsdtar @@ -18,7 +17,7 @@ DEPENDS+= gjs>=1.52.0:../../lang/gjs SUBST_CLASSES+= pyvers SUBST_MESSAGE.pyvers= Substitute the correct python version. SUBST_STAGE.pyvers= pre-configure -SUBST_FILES.pyvers= src/main.js +SUBST_FILES.pyvers= src/epubView.js SUBST_VARS.pyvers+= PYVERSSUFFIX # Fails without GNU msgfmt diff --git a/print/foliate/PLIST b/print/foliate/PLIST index a8fd6ff450e..14289d03d96 100644 --- a/print/foliate/PLIST +++ b/print/foliate/PLIST @@ -1,37 +1,39 @@ -@comment $NetBSD: PLIST,v 1.1 2019/10/12 13:45:20 fox Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/04/06 14:15:47 fox Exp $ bin/foliate libexec/foliate/com.github.johnfactotum.Foliate share/applications/com.github.johnfactotum.Foliate.desktop -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/__init__.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/compatibility_utils.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/kindleunpack.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_cover.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_dict.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_header.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_html.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_index.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_k8proc.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_k8resc.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_nav.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_ncx.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_opf.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_pagemap.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_sectioner.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_split.py -share/com.github.johnfactotum.Foliate/assets/KindleUnpack/mobi_uncompress.py -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/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/viewer-nocsp.html -share/com.github.johnfactotum.Foliate/assets/viewer.css -share/com.github.johnfactotum.Foliate/assets/viewer.html -share/com.github.johnfactotum.Foliate/assets/viewer.js -share/com.github.johnfactotum.Foliate/com.github.johnfactotum.Foliate.src.gresource +share/foliate/assets/.eslintrc.json +share/foliate/assets/KindleUnpack/__init__.py +share/foliate/assets/KindleUnpack/compatibility_utils.py +share/foliate/assets/KindleUnpack/kindleunpack.py +share/foliate/assets/KindleUnpack/mobi_cover.py +share/foliate/assets/KindleUnpack/mobi_dict.py +share/foliate/assets/KindleUnpack/mobi_header.py +share/foliate/assets/KindleUnpack/mobi_html.py +share/foliate/assets/KindleUnpack/mobi_index.py +share/foliate/assets/KindleUnpack/mobi_k8proc.py +share/foliate/assets/KindleUnpack/mobi_k8resc.py +share/foliate/assets/KindleUnpack/mobi_nav.py +share/foliate/assets/KindleUnpack/mobi_ncx.py +share/foliate/assets/KindleUnpack/mobi_opf.py +share/foliate/assets/KindleUnpack/mobi_pagemap.py +share/foliate/assets/KindleUnpack/mobi_sectioner.py +share/foliate/assets/KindleUnpack/mobi_split.py +share/foliate/assets/KindleUnpack/mobi_uncompress.py +share/foliate/assets/KindleUnpack/mobi_utils.py +share/foliate/assets/KindleUnpack/mobiml2xhtml.py +share/foliate/assets/KindleUnpack/unipath.py +share/foliate/assets/KindleUnpack/unpack_structure.py +share/foliate/assets/epub-viewer-nocsp.html +share/foliate/assets/epub-viewer.css +share/foliate/assets/epub-viewer.html +share/foliate/assets/epub-viewer.js +share/foliate/assets/epub.js +share/foliate/assets/jszip.min.js +share/foliate/assets/lookup.html +share/foliate/assets/utils.js +share/foliate/com.github.johnfactotum.Foliate.data.gresource +share/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 @@ -40,8 +42,9 @@ 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 share/locale/it/LC_MESSAGES/com.github.johnfactotum.Foliate.mo -share/locale/nl_NL/LC_MESSAGES/com.github.johnfactotum.Foliate.mo +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_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 be319196798..86e7a84908a 100644 --- a/print/foliate/distinfo +++ b/print/foliate/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.1 2019/10/12 13:45:20 fox Exp $ +$NetBSD: distinfo,v 1.2 2020/04/06 14:15:47 fox Exp $ -SHA1 (foliate-1.5.3.tar.gz) = 04303d725550409259417ba563f2e363a13c8b3f -RMD160 (foliate-1.5.3.tar.gz) = 77c0e8bfb0f641bb2ca90b5b06278ebd66d61579 -SHA512 (foliate-1.5.3.tar.gz) = 806640ab78794208d344145bad22c668cf17454194707f06caacc368d7f440bfdce6b3801cf8a9320d10b2a441fe4ad43e87a869107c3ed5c0af48e958638c7b -Size (foliate-1.5.3.tar.gz) = 1486573 bytes +SHA1 (foliate-2.0.0.tar.gz) = 3db1ce649536a2ac6544fbcf9650b05761be6d55 +RMD160 (foliate-2.0.0.tar.gz) = 149f864a819b47aad96fc1c02954d1238f4c6721 +SHA512 (foliate-2.0.0.tar.gz) = 7700abb9b7579750f37e18531367cd080a919a382347e0ebe77b0f59616b3482a96571b49d8d3788a6879b8a6d78d08eace7eeeb6865ce482c2cf58a5c5ba8be +Size (foliate-2.0.0.tar.gz) = 3098652 bytes SHA1 (patch-src_assets_KindleUnpack_kindleunpack.py) = 2b558fe842669982aec6087e9ce1c72f1fc52315 -SHA1 (patch-src_main.js) = 0d5f5be182af898bbe64d25a71f05fdf00a626d5 +SHA1 (patch-src_epubView.js) = 894a196410894d80ff60ab0338003f327276aa9e diff --git a/print/foliate/patches/patch-src_epubView.js b/print/foliate/patches/patch-src_epubView.js new file mode 100644 index 00000000000..b911faf1b5a --- /dev/null +++ b/print/foliate/patches/patch-src_epubView.js @@ -0,0 +1,15 @@ +$NetBSD: patch-src_epubView.js,v 1.1 2020/04/06 14:15:47 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 + +-const python = GLib.find_program_in_path('python') || GLib.find_program_in_path('python3') ++const python = GLib.find_program_in_path('python@PYVERSSUFFIX@') + const kindleUnpack = pkg.pkgdatadir + '/assets/KindleUnpack/kindleunpack.py' + + const settings = new Gio.Settings({ schema_id: pkg.name + '.view' }) diff --git a/print/foliate/patches/patch-src_main.js b/print/foliate/patches/patch-src_main.js deleted file mode 100644 index 113b7ce8e45..00000000000 --- a/print/foliate/patches/patch-src_main.js +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-src_main.js,v 1.1 2019/10/12 13:45:20 fox Exp $ - -Adds variable to help substitute the correct python version suffix. - ---- src/main.js.orig 2019-10-07 20:50:20.174655390 +0000 -+++ src/main.js -@@ -1796,7 +1796,7 @@ class BookViewerWindow { - } - open(fileName, realFileName, inputType = 'epub') { - if (kindleExts.some(x => fileName.endsWith(x))) { -- const python = GLib.find_program_in_path('python') || GLib.find_program_in_path('python3') -+ const python = GLib.find_program_in_path('python@PYVERSSUFFIX@') - const kindleUnpack = pkg.pkgdatadir + '/assets/KindleUnpack/kindleunpack.py' - - const dir = GLib.dir_make_tmp(null) -- cgit v1.2.3